Sync for the release.

svn path=/trunk/; revision=11530

1 files changed, 7153 insertions, 3656 deletions

diff --git a/po/uk.po b/po/uk.po
index ec6674beee..622fbcf916 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-04-28 02:04-0400\n"
+"POT-Creation-Date: 2001-07-31 14:52-0400\n"
 "PO-Revision-Date: 2000-04-04 15:25+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,11 +13,20 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#, fuzzy
+msgid "Factory to import VCard files into Evolution."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+msgid "Imports VCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3605
 msgid "Card: "
 msgstr "Картка: "
 
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3607
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +34,7 @@ msgstr ""
 "\n"
 "╤м'я: "
 
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3608
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,31 +42,31 @@ msgstr ""
 "\n"
 "  Преф╕кс:    "
 
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3609
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3610
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3611
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3612
 msgid ""
 "\n"
 "  Suffix:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3626
 msgid ""
 "\n"
 "Birth Date: "
@@ -65,7 +74,7 @@ msgstr ""
 "\n"
 "Дата народження: "
 
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3637
 msgid ""
 "\n"
 "Address:"
@@ -73,7 +82,7 @@ msgstr ""
 "\n"
 "Адреса:"
 
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3639
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -81,13 +90,13 @@ msgstr ""
 "\n"
 "  Поштова скринька: "
 
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3640
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3641
 msgid ""
 "\n"
 "  Street:      "
@@ -95,7 +104,7 @@ msgstr ""
 "\n"
 "  Вулиця:      "
 
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3642
 msgid ""
 "\n"
 "  City:        "
@@ -103,7 +112,7 @@ msgstr ""
 "\n"
 "  М╕сто:       "
 
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3643
 msgid ""
 "\n"
 "  Region:      "
@@ -111,7 +120,7 @@ msgstr ""
 "\n"
 "  Ре╜╕он:      "
 
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3644
 msgid ""
 "\n"
 "  Postal Code: "
@@ -119,7 +128,7 @@ msgstr ""
 "\n"
 "  ╤ндекс:      "
 
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3645
 msgid ""
 "\n"
 "  Country:     "
@@ -127,13 +136,13 @@ msgstr ""
 "\n"
 "  Кра╖на:      "
 
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3658
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3670
 msgid ""
 "\n"
 "Telephones:\n"
@@ -141,7 +150,7 @@ msgstr ""
 "\n"
 "Телефони:\n"
 
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3673
 msgid ""
 "\n"
 "Telephone:"
@@ -149,7 +158,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3697
 msgid ""
 "\n"
 "E-mail:\n"
@@ -157,7 +166,7 @@ msgstr ""
 "\n"
 "Електронна пошта:\n"
 
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3700
 msgid ""
 "\n"
 "E-mail:"
@@ -165,7 +174,7 @@ msgstr ""
 "\n"
 "Електронна адреса: "
 
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "Mailer: "
@@ -173,7 +182,7 @@ msgstr ""
 "\n"
 "Поштова програма: "
 
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3725
 msgid ""
 "\n"
 "Time Zone: "
@@ -181,7 +190,7 @@ msgstr ""
 "\n"
 "Часовий пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3733
 msgid ""
 "\n"
 "Geo Location: "
@@ -189,7 +198,7 @@ msgstr ""
 "\n"
 "Розташування: "
 
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3737
 msgid ""
 "\n"
 "Business Role: "
@@ -197,7 +206,7 @@ msgstr ""
 "\n"
 "Помада: "
 
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "Org: "
@@ -205,7 +214,7 @@ msgstr ""
 "\n"
 "Орган╕зац╕я: "
 
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  Name:  "
@@ -213,31 +222,31 @@ msgstr ""
 "\n"
 "  ╤м'я:  "
 
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3754
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3758
 msgid ""
 "\n"
 "Categories: "
@@ -245,7 +254,7 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3759
 msgid ""
 "\n"
 "Comment: "
@@ -263,13 +272,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3772
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3775
 msgid ""
 "\n"
 "Public Key: "
@@ -277,27 +286,25 @@ msgstr ""
 "\n"
 "Публ╕чний ключ: "
 
-#: addressbook/backend/ebook/e-destination.c:232
-msgid "???"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
-msgid "Factory to import GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4037
+#, fuzzy
+msgid "Multiple VCards"
+msgstr "Надрукувати пов╕домлення"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
-msgid "Imports GnomeCard files into Evolution."
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:4045
+#, fuzzy, c-format
+msgid "VCard for %s"
+msgstr "Введ╕ть пароль для %s"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
 #: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:42
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
+#: addressbook/gui/component/addressbook-factory.c:46
+#: calendar/conduits/calendar/calendar-conduit.c:1204
+#: calendar/conduits/todo/todo-conduit.c:1018
+#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -310,14 +317,14 @@ msgid "EBook not loaded\n"
 msgstr ""
 
 #: addressbook/conduit/address-conduit.c:654
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:545
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:592
 msgid "Could not start wombat server"
 msgstr "Не вдалося запустити сервер Wombat"
 
 #: addressbook/conduit/address-conduit.c:655
-#: calendar/conduits/calendar/calendar-conduit.c:732
-#: calendar/conduits/todo/todo-conduit.c:546
+#: calendar/conduits/calendar/calendar-conduit.c:779
+#: calendar/conduits/todo/todo-conduit.c:593
 msgid "Could not start wombat"
 msgstr "Не вдалось запустити Wombat"
 
@@ -326,723 +333,851 @@ msgstr "Не вдалось запустити Wombat"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A Bonobo control for an address popup."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "A Bonobo control for displaying an address."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Канал адресно╖ книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+msgid "Evolution component for handling contacts."
+msgstr "Компонент Evolution для обробки контакт╕в."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Addressbook Minicard control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+msgid "Factory for the Addressbook's address displayer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+msgid "Factory for the Addressbook's address popup"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Клацн╕ть тут щоб викликати адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:148
+msgid "LDAP Server"
+msgstr "Сервер LDAP"
+
+#: addressbook/gui/component/addressbook-config.c:150
+msgid "File"
+msgstr "Файл"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "Unknown addressbook type"
+msgstr "Нев╕домий тип адресно╖ книги"
+
+#: addressbook/gui/component/addressbook-config.c:163
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:302
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:68
+msgid "Password"
+msgstr "Пароль"
+
+#: addressbook/gui/component/addressbook-config.c:168
+msgid "Unknown auth type"
+msgstr "Нев╕домий тип авторизац╕╖"
+
+#: addressbook/gui/component/addressbook-config.c:177
+#, fuzzy
+msgid "Base"
+msgstr "Вставити"
+
+#: addressbook/gui/component/addressbook-config.c:179
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:181
+#, fuzzy
+msgid "Subtree"
+msgstr "Джерело"
+
+#: addressbook/gui/component/addressbook-config.c:184
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:349
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:350
+msgid "FIXME Bind DN Help text here"
+msgstr ""
+
+#. Remember the password?
+#: addressbook/gui/component/addressbook-config.c:352
+#: mail/mail-config.glade.h:80 mail/mail-mt.c:439
+msgid "Remember this password"
+msgstr "Запам'ятати цей пароль"
+
+#: addressbook/gui/component/addressbook-config.c:403
+#: mail/mail-config.glade.h:44
+msgid "Host:"
+msgstr "Комп'ютер:"
+
+#: addressbook/gui/component/addressbook-config.c:404
+msgid "FIXME Host help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:406
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:407
+msgid "FIXME Root DN help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:411
+msgid "Port:"
+msgstr "Порт:"
+
+#: addressbook/gui/component/addressbook-config.c:412
+msgid "FIXME Port help text here."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:432
+msgid "Search Scope:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:479
+msgid "Authentication:"
+msgstr "Аутенф╕кац╕я:"
+
+#: addressbook/gui/component/addressbook-config.c:501
+msgid "Advanced LDAP Options"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:522
+#: mail/mail-config.glade.h:69
+msgid "Path:"
+msgstr "Шлях:"
+
+#: addressbook/gui/component/addressbook-config.c:523
+msgid "FIXME Path Help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:528
+msgid "Create path if it doesn't exist."
+msgstr "Створити шлях, якщо його не ╕сну╓."
+
+#: addressbook/gui/component/addressbook-config.c:663
+msgid "Edit Addressbook"
+msgstr "Виправити адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:665
+msgid "Add Addressbook"
+msgstr "Додати адресну книгу"
+
+#: addressbook/gui/component/addressbook-config.c:683
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:691
+#: mail/mail-config.glade.h:58 my-evolution/e-summary-preferences.c:881
+msgid "Name:"
+msgstr "╤м'я:"
+
+#: addressbook/gui/component/addressbook-config.c:692
+msgid "FIXME Name help text here"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:694
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Опис:"
+
+#: addressbook/gui/component/addressbook-config.c:695
+msgid "FIXME Description help text here"
+msgstr ""
+
 #: addressbook/gui/component/addressbook-config.glade.h:1
-#: calendar/gui/e-meeting-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:7
-msgid "Add"
+msgid "Addressbook Sources"
+msgstr "Джерело адресно╖ книги"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+#, fuzzy
+msgid "De_lete"
+msgstr "Стерти"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+msgid "Name"
+msgstr "╤м'я:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
+#: mail/mail-config.glade.h:108
+msgid "_Add"
 msgstr "Додати"
 
-#: addressbook/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: mail/mail-config.glade.h:110 ui/evolution-mail-messagedisplay.xml.h:9
+#: ui/evolution-message-composer.xml.h:48
+#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
+#: ui/evolution.xml.h:46
+msgid "_Edit"
+msgstr "Редагування"
+
+#: addressbook/gui/component/addressbook-storage.c:118
+msgid "Other Contacts"
+msgstr "╤нш╕ контакти"
+
+#: addressbook/gui/component/addressbook.c:345
+#, c-format
+msgid "Enter password for %s"
+msgstr "Введ╕ть пароль для %s"
+
+#: addressbook/gui/component/addressbook.c:373
+msgid "Unable to open addressbook"
+msgstr "Не вдалося в╕дкрити адресну книгу"
+
+#: addressbook/gui/component/addressbook.c:380
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:385
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it.  If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:393
+msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:554
+msgid "Any field contains"
+msgstr "Будь-яке поле м╕стить"
+
+#: addressbook/gui/component/addressbook.c:555
+msgid "Name contains"
+msgstr "╤м'я м╕стить"
+
+#: addressbook/gui/component/addressbook.c:556
+msgid "Email contains"
+msgstr "Електронна адреса м╕стить"
+
+#: addressbook/gui/component/addressbook.c:557
+#, fuzzy
+msgid "Category contains"
+msgstr "╤м'я м╕стить"
+
+#: addressbook/gui/component/addressbook.c:707
+msgid "The URI that the Folder Browser will display"
+msgstr "URI теки, що буде в╕дображено переглядачем"
+
+#: addressbook/gui/component/e-address-popup.c:466
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/e-contact-editor.c:1536
+msgid "Primary Email"
+msgstr "Первинна е-пошта"
+
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1537
+#: addressbook/gui/widgets/e-addressbook-view.c:728
+msgid "Email 2"
+msgstr "Е-пошта 2"
+
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1538
+#: addressbook/gui/widgets/e-addressbook-view.c:729
+msgid "Email 3"
+msgstr "Е-пошта 3"
+
+#: addressbook/gui/component/e-address-popup.c:579
+#, fuzzy
+msgid "Select an Action"
+msgstr "Вибрати файл"
+
+#: addressbook/gui/component/e-address-popup.c:585
+#, fuzzy, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Створити новий контакт"
+
+#: addressbook/gui/component/e-address-popup.c:597
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/component/e-address-popup.c:859
+#, fuzzy
+msgid "Querying Addressbook..."
+msgstr "Виправити адресну книгу"
+
+#: addressbook/gui/component/e-address-popup.c:916
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:274
+msgid "Edit Contact Info"
+msgstr "Виправлення контактно╖ ╕нформац╕╖"
+
+#: addressbook/gui/component/e-address-popup.c:946
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:341
+msgid "Add to Contacts"
+msgstr "Додати до контакт╕в"
+
+#: addressbook/gui/component/e-address-popup.c:989
+#, fuzzy
+msgid "Merge E-Mail Address"
+msgstr "Електронна адреса:"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Заборонити запити"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Дозволити запити (небезпечно!)"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#, fuzzy
+msgid "Evolution's addressbook name selection interface."
+msgstr "Канал адресно╖ книги Evolution"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:156
+#: addressbook/gui/component/select-names/e-select-names.c:630
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: my-evolution/e-summary-preferences.c:1168
+#: my-evolution/e-summary-preferences.c:1218
+#: my-evolution/e-summary-preferences.c:1279 shell/e-shortcuts-view.c:272
+#: shell/e-shortcuts-view.c:481
+msgid "Remove"
+msgstr "Видалити"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+msgid "Remove All"
+msgstr "Видалити все"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#, fuzzy
+msgid "Send HTML Mail?"
+msgstr "Sendmail"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:327
+#, fuzzy
+msgid "Unnamed Contact"
+msgstr "╤нш╕ контакти"
+
+#: addressbook/gui/component/select-names/e-select-names.c:403
+msgid "Unable to get local storage.  This should never happen."
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
+msgid "Message Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Select Names"
+msgstr "Вибрати назви"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
+#, fuzzy
+msgid "Select name from _folder:"
+msgstr "Вибер╕ть назву з списку:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+#, fuzzy
+msgid "_Category:"
+msgstr "Категор╕я:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:5
+#: mail/mail-search-dialogue.c:113
+msgid "_Search"
+msgstr "Пошук"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "B_usiness"
 msgstr "Робота"
 
-#: addressbook/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Business _Fax"
 msgstr "Робочий факс:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:5
-msgid "C_ontacts..."
-msgstr "Зв'язки..."
-
-#: addressbook/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
-#: calendar/gui/event-editor-dialog.glade.h:5
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Contact Editor"
 msgstr "Редактор контакт╕в"
 
-#: addressbook/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor.c:135
 msgid "Details"
 msgstr "Подробиц╕"
 
-#: addressbook/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "File As:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:10
-#: executive-summary/component/executive-summary-config.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "New phone type"
 msgstr "Новий тип телефона"
 
-#: addressbook/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "No_tes:"
 msgstr "Нотатки:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#, fuzzy
+msgid "Organi_zation:"
+msgstr "Ор╕╓нтац╕я:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 msgid "Phone Types"
 msgstr "Типи телефон╕в"
 
-#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Primary Email"
-msgstr "Первинна е-пошта"
-
-#: addressbook/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Wants to receive _HTML mail"
 msgstr "Хоче отримувати листи в HTML"
 
-#: addressbook/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Web page address:"
 msgstr "Адреса стор╕нки WWW:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:74
-msgid "_Add"
-msgstr "Додати"
-
-#: addressbook/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "_Address..."
 msgstr "Адреса..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "_Assistant's name:"
 msgstr "╤м'я пом╕чника:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "_Birthday:"
 msgstr "Дата народження:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:21
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "_Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/contact-editor.glade.h:22
-msgid "_Company:"
-msgstr "Компан╕я:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/task-page.glade.h:20
+msgid "_Contacts..."
+msgstr "Контакти..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/folder-browser.c:625 mail/mail-config.glade.h:75
-#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
-#: ui/evolution-task-editor-dialog.xml.h:69
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:1447
+#: calendar/gui/dialogs/recurrence-page.glade.h:12 mail/folder-browser.c:1306
+#: mail/mail-config.glade.h:109 ui/evolution-mail-message.xml.h:87
+#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Department:"
 msgstr "В╕дд╕л:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Full Name..."
 msgstr "Повне ╕м'я..."
 
-#: addressbook/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Job title:"
 msgstr "Посада:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Manager's Name:"
 msgstr "╤м'я кер╕вника:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Nickname:"
 msgstr "Пр╕звисько:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Office:"
 msgstr "Оф╕с:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Profession:"
 msgstr "Профес╕я:"
 
-#: addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_This is the mailing address"
 msgstr "Це поштова адреса"
 
-#: addressbook/contact-editor/e-contact-editor.c:603
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Стерти контакт?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:721
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
-#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/contact-editor/e-contact-editor.c:1494
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 msgid "Assistant"
 msgstr "Пом╕чник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/contact-editor/e-contact-editor.c:1310
+#: addressbook/gui/contact-editor/e-contact-editor.c:1495
+#: addressbook/gui/contact-editor/e-contact-editor.c:1562
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/gui/contact-editor/e-contact-editor.c:1496
 msgid "Business 2"
 msgstr "Робоча 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
-#: addressbook/gui/widgets/e-addressbook-view.c:656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1497
+#: addressbook/gui/widgets/e-addressbook-view.c:716
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/gui/contact-editor/e-contact-editor.c:1498
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/gui/contact-editor/e-contact-editor.c:1499
 msgid "Car"
 msgstr "Авто"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/gui/contact-editor/e-contact-editor.c:1500
 msgid "Company"
 msgstr "Компан╕я"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
-#: addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:1501
+#: addressbook/gui/contact-editor/e-contact-editor.c:1563
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/gui/contact-editor/e-contact-editor.c:1502
 msgid "Home 2"
 msgstr "Домашня 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
-#: addressbook/gui/widgets/e-addressbook-view.c:657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1503
+#: addressbook/gui/widgets/e-addressbook-view.c:717
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
-#: addressbook/gui/widgets/e-addressbook-view.c:660
+#: addressbook/gui/contact-editor/e-contact-editor.c:1504
+#: addressbook/gui/widgets/e-addressbook-view.c:720
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1253
+#: addressbook/gui/contact-editor/e-contact-editor.c:1505
 msgid "Mobile"
 msgstr "Моб╕льний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1254
-#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: addressbook/gui/contact-editor/e-contact-editor.c:1506
+#: addressbook/gui/contact-editor/e-contact-editor.c:1564
+#: mail/mail-config.glade.h:64
 msgid "Other"
 msgstr "╤нша"
 
-#: addressbook/contact-editor/e-contact-editor.c:1255
-#: addressbook/gui/widgets/e-addressbook-view.c:662
+#: addressbook/gui/contact-editor/e-contact-editor.c:1507
+#: addressbook/gui/widgets/e-addressbook-view.c:722
 msgid "Other Fax"
 msgstr "╤нший факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1256
-#: addressbook/gui/widgets/e-addressbook-view.c:663
+#: addressbook/gui/contact-editor/e-contact-editor.c:1508
+#: addressbook/gui/widgets/e-addressbook-view.c:723
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1257
+#: addressbook/gui/contact-editor/e-contact-editor.c:1509
 msgid "Primary"
 msgstr "Первинний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1258
-#: addressbook/gui/widgets/e-addressbook-view.c:664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1510
+#: addressbook/gui/widgets/e-addressbook-view.c:724
 msgid "Radio"
 msgstr "Рад╕о"
 
-#: addressbook/contact-editor/e-contact-editor.c:1259
-#: addressbook/gui/widgets/e-addressbook-view.c:665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1511
+#: addressbook/gui/widgets/e-addressbook-view.c:725
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1260
+#: addressbook/gui/contact-editor/e-contact-editor.c:1512
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:668
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/gui/widgets/e-addressbook-view.c:669
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "Стерти контакт?"
-
-#: addressbook/contact-editor/e-contact-quick-add.c:233
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:260
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:235
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:262
 msgid "Edit Full"
 msgstr "Виправлення повного ╕мен╕"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:276
-#: addressbook/gui/widgets/e-addressbook-view.c:643
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:288
+#: addressbook/gui/widgets/e-addressbook-view.c:703
 msgid "Full Name"
 msgstr "Повне ╕м'я"
 
-#: addressbook/contact-editor/e-contact-quick-add.c:282
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "E-mail"
 msgstr "Е-пошта"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Адреса _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Перев╕рка адреси"
 
-#: addressbook/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Кра╖на:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Ф╕нлянд╕я"
 
-#: addressbook/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "США"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "Адреса:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "М╕сто:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "А/С:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: addressbook/gui/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "Штат/область:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: addressbook/gui/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "╤ндекс:"
 
-#: addressbook/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Перев╕рити повне ╕м'я"
 
-#: addressbook/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Dr."
 msgstr "Доктор"
 
-#: addressbook/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Esq."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-#: addressbook/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-#: addressbook/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-#: addressbook/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Молодший"
 
-#: addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 #, fuzzy
 msgid "Miss"
 msgstr "╕сну╓"
 
-#: addressbook/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "╤м'я:"
 
-#: addressbook/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_Last:"
 msgstr "Пр╕звище:"
 
-#: addressbook/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "По-батьков╕:"
 
-#: addressbook/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
 msgstr "Титул:"
 
-#: addressbook/gui/component/addressbook.c:241
-msgid "As _Minicards"
-msgstr "Як _Minicards"
-
-#: addressbook/gui/component/addressbook.c:247
-#: ui/evolution-addressbook.xml.h:1
-msgid "As _Table"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:399
-#, c-format
-msgid "Enter password for %s"
-msgstr "Введ╕ть пароль для %s"
-
-#: addressbook/gui/component/addressbook.c:427
-msgid "Unable to open addressbook"
-msgstr "Не вдалося в╕дкрити адресну книгу"
-
-#: addressbook/gui/component/addressbook.c:432
-msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in.  If you've entered a URI, check the URI for\n"
-"correctness and reenter.  If not, you probably have\n"
-"attempted to access an LDAP server.  If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "Показати все"
-
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "Додатково..."
-
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
-msgid "Any field contains"
-msgstr "Будь-яке поле м╕стить"
-
-#: addressbook/gui/component/addressbook.c:588
-msgid "Name contains"
-msgstr "╤м'я м╕стить"
-
-#: addressbook/gui/component/addressbook.c:589
-msgid "Email contains"
-msgstr "Електронна адреса м╕стить"
-
-#: addressbook/gui/component/addressbook.c:732
-msgid "The URI that the Folder Browser will display"
-msgstr "URI теки, що буде в╕дображено переглядачем"
-
-#: addressbook/gui/component/addressbook-config.c:148
-msgid "LDAP Server"
-msgstr "Сервер LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:150
-msgid "File"
-msgstr "Файл"
-
-#: addressbook/gui/component/addressbook-config.c:153
-msgid "Unknown addressbook type"
-msgstr "Нев╕домий тип адресно╖ книги"
-
-#: addressbook/gui/component/addressbook-config.c:163
-msgid "None (anonymous mode)"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:165
-#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:291
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
-msgid "Password"
-msgstr "Пароль"
-
-#: addressbook/gui/component/addressbook-config.c:167
-msgid "SASL"
-msgstr "SASL"
-
-#: addressbook/gui/component/addressbook-config.c:170
-msgid "Unknown auth type"
-msgstr "Нев╕домий тип авторизац╕╖"
-
-#: addressbook/gui/component/addressbook-config.c:179
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #, fuzzy
-msgid "Base"
-msgstr "Вставити"
-
-#: addressbook/gui/component/addressbook-config.c:181
-msgid "One"
-msgstr ""
+msgid "List _name:"
+msgstr "Назва файлу:"
 
-#: addressbook/gui/component/addressbook-config.c:183
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
 #, fuzzy
-msgid "Subtree"
-msgstr "Джерело"
-
-#: addressbook/gui/component/addressbook-config.c:186
-msgid "Unknown scope type"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:353
-msgid "Bind DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:354
-msgid "FIXME Bind DN Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:356
-#: mail/mail-config.glade.h:50
-msgid "Remember this password"
-msgstr "Запам'ятати цей пароль"
-
-#: addressbook/gui/component/addressbook-config.c:406
-#: mail/mail-config.glade.h:28
-msgid "Host:"
-msgstr "Комп'ютер:"
-
-#: addressbook/gui/component/addressbook-config.c:407
-msgid "FIXME Host help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:409
-msgid "Port:"
-msgstr "Порт:"
-
-#: addressbook/gui/component/addressbook-config.c:410
-msgid "FIXME Port help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:414
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:415
-msgid "FIXME Root DN help text here."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:435
-msgid "Search Scope:"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:489
-msgid "Authentication:"
-msgstr "Аутенф╕кац╕я:"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#: mail/mail-config.glade.h:44
-msgid "Path:"
-msgstr "Шлях:"
-
-#: addressbook/gui/component/addressbook-config.c:508
-msgid "FIXME Path Help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:513
-msgid "Create path if it doesn't exist."
-msgstr "Створити шлях, якщо його не ╕сну╓."
-
-#: addressbook/gui/component/addressbook-config.c:647
-msgid "Edit Addressbook"
-msgstr "Виправити адресну книгу"
-
-#: addressbook/gui/component/addressbook-config.c:649
-msgid "Add Addressbook"
-msgstr "Додати адресну книгу"
-
-#: addressbook/gui/component/addressbook-config.c:665
-msgid ""
-"Select the kind of addressbook you have, and enter the relevant information "
-"about it."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:671
-#: mail/mail-config.glade.h:35
-msgid "Name:"
-msgstr "╤м'я:"
-
-#: addressbook/gui/component/addressbook-config.c:672
-msgid "FIXME Name help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:674
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-msgid "Description:"
-msgstr "Опис:"
-
-#: addressbook/gui/component/addressbook-config.c:675
-msgid "FIXME Description help text here"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.glade.h:2
-msgid "Addressbook Sources"
-msgstr "Джерело адресно╖ книги"
-
-#: addressbook/gui/component/addressbook-config.glade.h:3
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
-#: calendar/gui/e-meeting-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
-#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
-#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:18
-msgid "Delete"
-msgstr "Стерти"
-
-#: addressbook/gui/component/addressbook-config.glade.h:4
-#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Виправити"
-
-#: addressbook/gui/component/addressbook-config.glade.h:5
-msgid "Name"
-msgstr "╤м'я:"
-
-#: addressbook/gui/component/addressbook-config.glade.h:6
-msgid "URI"
-msgstr "URI"
-
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "╤нш╕ контакти"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Disable Queries"
-msgstr "Заборонити запити"
-
-#: addressbook/gui/component/e-address-widget.c:365
-msgid "Enable Queries (Dangerous!)"
-msgstr "Дозволити запити (небезпечно!)"
-
-#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:210
-msgid "Edit Contact Info"
-msgstr "Виправлення контактно╖ ╕нформац╕╖"
-
-#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:269
-msgid "Add to Contacts"
-msgstr "Додати до контакт╕в"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for an address popup."
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A Bonobo control for displaying an address."
-msgstr ""
+msgid "Members"
+msgstr "Нагадування"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
-msgid "A sample Bonobo control which displays an addressbook."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
-msgid "Control that displays an Evolution addressbook minicard."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+msgid "_Hide addresses when sending mail to this list"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook minicard viewer"
-msgstr "Канал адресно╖ книги Evolution"
+msgid "_Remove"
+msgstr "Видалити"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
-msgid "Evolution component for handling contacts."
-msgstr "Компонент Evolution для обробки контакт╕в."
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "contact-list-editor"
+msgstr "Редактор контакт╕в"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#. Construct the app
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:228
 #, fuzzy
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "Contact List Editor"
+msgstr "Редактор контакт╕в"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
-msgid "Factory for the Addressbook's address displayer"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
+msgid "Add Anyway"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-msgid "Factory for the Addressbook's address popup"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+msgid "Duplicate Contact Detected"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
 #, fuzzy
-msgid "Factory for the Evolution addressbook component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "New Contact:"
+msgstr "Новий контакт"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
 #, fuzzy
-msgid "Factory for the sample Addressbook control"
-msgstr "Клацн╕ть тут щоб викликати адресну книгу"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:131
-#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
-#: filter/filter-rule.c:549 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
-msgid "Remove"
-msgstr "Видалити"
+msgid "Original Contact:"
+msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:146
-msgid "Remove All"
-msgstr "Видалити все"
+#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:5
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 #, fuzzy
-msgid "Evolution's addressbook name selection interface."
-msgstr "Канал адресно╖ книги Evolution"
+msgid "Changed Contact:"
+msgstr "╤нш╕ контакти"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
-msgid "Find..."
-msgstr "Шукати..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Вибрати назви"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Select name from:"
-msgstr "Вибер╕ть назву з списку:"
+#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:6
+msgid "_Change Anyway"
+msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:258
 msgid "Search"
 msgstr "Пошук"
 
@@ -1154,159 +1289,255 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:513
-#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
+#: addressbook/gui/widgets/e-addressbook-view.c:541
+#: addressbook/gui/widgets/e-addressbook-view.c:601
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
+#: addressbook/gui/widgets/e-addressbook-view.c:602
 msgid "Send contact to other"
 msgstr "В╕д╕слати контакт ╕ншому"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
+#: addressbook/gui/widgets/e-addressbook-view.c:603
 msgid "Send message to contact"
 msgstr "В╕д╕слати пов╕домлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/message-browser.c:200
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
-#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
+#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: ui/evolution-addressbook.xml.h:15 ui/evolution-comp-editor.xml.h:8
+#: ui/evolution-mail-message.xml.h:63 ui/evolution-tasks.xml.h:10
+#: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+#: addressbook/gui/widgets/e-addressbook-view.c:605
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:641
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+#: addressbook/gui/widgets/e-addressbook-view.c:606 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:11 mail/mail-accounts.c:267
+#: mail/mail-config.glade.h:28 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Стерти"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#: addressbook/gui/widgets/e-minicard.c:451
+#, fuzzy
+msgid "Error modifying card"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:34
+#, fuzzy
+msgid "Success"
+msgstr "Джерела"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:35
+#: camel/providers/imap/camel-imap-command.c:336 shell/e-storage.c:497
+msgid "Unknown error"
+msgstr "Нев╕дома помилка"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#, fuzzy
+msgid "Repository offline"
+msgstr "Перенесення"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:491
+msgid "Permission denied"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:38
+#, fuzzy
+msgid "Card not found"
+msgstr "Файлу не знайдено"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:39
+msgid "Card ID already exists"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-util.c:40
+#, fuzzy
+msgid "Protocol not supported"
+msgstr "Операц╕я не п╕дтриму╓ться"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:41
+#, fuzzy
+msgid "Canceled"
+msgstr "В╕дм╕нено"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:42
+#, fuzzy
+msgid "Other error"
+msgstr "Помилка вводу/виводу"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:59
+#, fuzzy
+msgid "Error adding card"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:68
+#, fuzzy
+msgid "Error modifying list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#, fuzzy
+msgid "Error removing list"
+msgstr "Помилка завантаження %s"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#, fuzzy
+msgid "Error removing card"
+msgstr "Помилка зчитування файлу пошти: %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:701
 msgid "* Click here to add a contact *"
 msgstr "* Клацн╕ть тут щоб додати контакт *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:642
+#: addressbook/gui/widgets/e-addressbook-view.c:702
 #, fuzzy
 msgid "File As"
 msgstr "Файл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:644
+#: addressbook/gui/widgets/e-addressbook-view.c:704
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:645
+#: addressbook/gui/widgets/e-addressbook-view.c:705
 msgid "Primary Phone"
 msgstr "Первинний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:646
+#: addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Assistant Phone"
 msgstr "Телефлн пом╕чника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:647
+#: addressbook/gui/widgets/e-addressbook-view.c:707
 msgid "Business Phone"
 msgstr "Робочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:648
+#: addressbook/gui/widgets/e-addressbook-view.c:708
 msgid "Callback Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:649
+#: addressbook/gui/widgets/e-addressbook-view.c:709
 msgid "Company Phone"
 msgstr "Телефон компан╕╖"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:650
+#: addressbook/gui/widgets/e-addressbook-view.c:710
 msgid "Home Phone"
 msgstr "Домашн╕й телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:651
+#: addressbook/gui/widgets/e-addressbook-view.c:711
 msgid "Organization"
 msgstr "Орган╕зац╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:652
+#: addressbook/gui/widgets/e-addressbook-view.c:712
 msgid "Business Address"
 msgstr "Робоча адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:653
+#: addressbook/gui/widgets/e-addressbook-view.c:713
 msgid "Home Address"
 msgstr "Домашня адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:654
+#: addressbook/gui/widgets/e-addressbook-view.c:714
 msgid "Mobile Phone"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:655
+#: addressbook/gui/widgets/e-addressbook-view.c:715
 msgid "Car Phone"
 msgstr "Автомоб╕льний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:658
+#: addressbook/gui/widgets/e-addressbook-view.c:718
 msgid "Business Phone 2"
 msgstr "Робочий телеофн 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:659
+#: addressbook/gui/widgets/e-addressbook-view.c:719
 msgid "Home Phone 2"
 msgstr "Домашн╕й телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:661
+#: addressbook/gui/widgets/e-addressbook-view.c:721
 msgid "Other Phone"
 msgstr "╤нший телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:666
+#: addressbook/gui/widgets/e-addressbook-view.c:726
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:667
+#: addressbook/gui/widgets/e-addressbook-view.c:727
 msgid "Other Address"
 msgstr "╤нша адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:670
+#: addressbook/gui/widgets/e-addressbook-view.c:730
 msgid "Web Site"
 msgstr "Сайт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:671
+#: addressbook/gui/widgets/e-addressbook-view.c:731
 msgid "Department"
 msgstr "В╕дд╕л"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:672
+#: addressbook/gui/widgets/e-addressbook-view.c:732
 msgid "Office"
 msgstr "Оф╕с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:733
 #, fuzzy
 msgid "Title"
 msgstr "Титул:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:734
 msgid "Profession"
 msgstr "Профес╕я"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:675
+#: addressbook/gui/widgets/e-addressbook-view.c:735
 msgid "Manager"
 msgstr "Кер╕вник"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:677
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Nickname"
 msgstr "Пр╕звисько"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:678
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #, fuzzy
 msgid "Spouse"
 msgstr "Джерело"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:679
+#: addressbook/gui/widgets/e-addressbook-view.c:739
 msgid "Note"
 msgstr "Прим╕тки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#, fuzzy
+msgid "Done."
+msgstr "Нема╓"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1115
+#, fuzzy
+msgid "Removing cards..."
+msgstr "Завантаження календаря..."
+
+#: addressbook/gui/widgets/e-minicard-control.c:283
 msgid "Save in addressbook"
 msgstr "Зберегти у адресн╕й книз╕"
 
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:151
 msgid ""
 "\n"
 "\n"
@@ -1345,7 +1576,8 @@ msgid "Dimensions:"
 msgstr "Розм╕ри:"
 
 #: addressbook/printing/e-contact-print.glade.h:7
-msgid "Font..."
+#, fuzzy
+msgid "F_ont..."
 msgstr "Шрифт..."
 
 #: addressbook/printing/e-contact-print.glade.h:8
@@ -1405,7 +1637,6 @@ msgid "Margins"
 msgstr "Поля"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "К╕льк╕сть стовпчик╕в:"
 
@@ -1486,40 +1717,67 @@ msgid "Width:"
 msgstr "Ширина:"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-msgid "label26"
-msgstr "label26"
+#, fuzzy
+msgid "_Font..."
+msgstr "Шрифт..."
 
-#: calendar/conduits/calendar/calendar-conduit.c:687
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:548
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:786
-#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:839
+#: calendar/conduits/calendar/calendar-conduit.c:842
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:653
+#: calendar/conduits/todo/todo-conduit.c:656
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "Сон"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Гаразд"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Канал календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Calendar Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the calendar iTip view control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the sample Calendar control"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to centralize calendar component editor dialogs"
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
@@ -1529,141 +1787,254 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:56
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:151
+#, c-format
+msgid "Notification about your appointment starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:155
+#, c-format
+msgid "Notification about your appointment starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:160
+#, c-format
+msgid "Notification about your appointment ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:164
+#, fuzzy
+msgid "Notification about your appointment"
+msgstr "початок зустр╕ч╕"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:171
+#, c-format
+msgid "Notification about your task starting on %s and ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:175
+#, c-format
+msgid "Notification about your task starting on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:180
+#, c-format
+msgid "Notification about your task ending on %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:184
+#, fuzzy
+msgid "Notification about your task"
+msgstr "Показати ╕нформац╕ю про Evolution"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:266
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#: ui/evolution-comp-editor.xml.h:1
+#, fuzzy
+msgid "C_lose"
+msgstr "Закрити"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
+#, fuzzy
+msgid "Snoo_ze"
+msgstr "Сон"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+msgid "Snooze time (minutes)"
+msgstr "Час сну (в хвилинах)"
+
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#, fuzzy
+msgid "_Edit appointment"
+msgstr "Виправити зустр╕ч"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:487
+msgid "No description available."
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:700
+#: calendar/gui/alarm-notify/alarm-queue.c:999
+#: calendar/gui/alarm-notify/alarm-queue.c:1055
+msgid "Reminder of your appointment at "
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:991
+msgid "Snooze"
+msgstr "Сон"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:1004
+#: calendar/gui/alarm-notify/alarm-queue.c:1059
+msgid "Ok"
+msgstr "Гаразд"
+
+#: calendar/gui/alarm-notify/notify-main.c:58
 #, c-format
 msgid ""
 "It is %s.  The Unix time is %ld right now.  We just thought you may like to "
 "know."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
 msgid "Could not initialize GNOME"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:108
+#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:70
+#, fuzzy
+msgid "Could not initialize gnome-vfs"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:115
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: calendar/gui/calendar-commands.c:266
-msgid "File not found"
-msgstr "Файлу не знайдено"
+#: calendar/gui/calendar-commands.c:402
+#, fuzzy
+msgid "%A %d %B %Y"
+msgstr "%A, %d %B %Y"
 
-#: calendar/gui/calendar-commands.c:290
-msgid "Open calendar"
-msgstr "В╕дкрити календар"
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. %b = abbreviated month name. Don't use any other specifiers.
+#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1344 calendar/gui/e-week-view-main-item.c:334
+msgid "%a %d %b"
+msgstr "%a %d %b"
+
+#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
+#: calendar/gui/calendar-commands.c:417
+#, fuzzy
+msgid "%a %d %b %Y"
+msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:332
-msgid "Save calendar"
-msgstr "Зберегти календар"
+#: calendar/gui/calendar-commands.c:425
+msgid "%B"
+msgstr ""
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:432
+#: calendar/gui/calendar-commands.c:434 widgets/misc/e-calendar-item.c:1068
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: calendar/gui/calendar-commands.c:468
+#: calendar/gui/calendar-commands.c:586
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:391 calendar/gui/calendar-model.c:997
+#: calendar/gui/e-calendar-table.c:307
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:394 calendar/gui/calendar-model.c:999
+#: calendar/gui/e-calendar-table.c:308
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/calendar-model.c:397 calendar/gui/calendar-model.c:1001
+#: calendar/gui/e-calendar-table.c:309
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:400 calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/meeting-page.c:576
+#: calendar/gui/dialogs/meeting-page.c:611
+#: calendar/gui/dialogs/meeting-page.c:676
+#: calendar/gui/dialogs/meeting-page.c:1226
+#: calendar/gui/dialogs/meeting-page.c:1242
+#: camel/providers/smtp/camel-smtp-transport.c:223
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:457
+#: calendar/gui/calendar-model.c:497
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:459
+#: calendar/gui/calendar-model.c:499
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1183
+#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:625
 msgid "High"
 msgstr "Високий"
 
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
-#: calendar/gui/calendar-model.c:1572
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/calendar-model.c:539 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1708
+#: calendar/gui/dialogs/task-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:624
 msgid "Normal"
 msgstr "Звичайний"
 
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/calendar-model.c:541 calendar/gui/calendar-model.c:1187
+#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:331 mail/message-list.c:623
 msgid "Low"
 msgstr "Низький"
 
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/calendar-model.c:577 calendar/gui/calendar-model.c:1239
+#: calendar/gui/e-calendar-table.c:383
 msgid "Transparent"
 msgstr "Прозорий"
 
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:580 calendar/gui/calendar-model.c:1241
+#: calendar/gui/e-calendar-table.c:382
 msgid "Opaque"
 msgstr "Непрозорий"
 
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/calendar-model.c:734 calendar/gui/calendar-model.c:1293
+#: calendar/gui/dialogs/task-page.glade.h:12
+#: calendar/gui/e-calendar-table.c:403
 msgid "Not Started"
 msgstr "Не розпочато"
 
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/calendar-model.c:737 calendar/gui/calendar-model.c:1295
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:404
 msgid "In Progress"
 msgstr "Викону╓ться"
 
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/calendar-model.c:740 calendar/gui/calendar-model.c:1297
+#: calendar/gui/dialogs/meeting-page.c:648
+#: calendar/gui/dialogs/meeting-page.c:671
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:405
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: calendar/gui/calendar-model.c:743 calendar/gui/calendar-model.c:1299
+#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:406 camel/camel-service.c:544
 #: camel/camel-service.c:580
 msgid "Cancelled"
 msgstr "В╕дм╕нено"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:893 e-util/e-time-utils.c:307
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:896 e-util/e-time-utils.c:316
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:802
+#: calendar/gui/calendar-model.c:901
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1674,23 +2045,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/calendar-model.c:882
+#: calendar/gui/calendar-model.c:981
 msgid ""
 "The classification must be 'Public', 'Private', 'Confidential' or 'None'"
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
-#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
-#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
-#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
-#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
+#: calendar/gui/calendar-model.c:995 calendar/gui/calendar-model.c:1237
+#: calendar/gui/calendar-model.c:1291
+#: calendar/gui/dialogs/e-timezone-dialog.c:202
+#: calendar/gui/dialogs/meeting-page.c:327
+#: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/e-calendar-table.c:306 calendar/gui/e-calendar-table.c:381
+#: mail/mail-account-gui.c:1385 mail/mail-accounts.c:134
+#: mail/mail-accounts.c:388 mail/mail-config.glade.h:61
+#: shell/e-shell-view.c:1405 widgets/misc/e-cell-date-edit.c:240
+#: widgets/misc/e-dateedit.c:437 widgets/misc/e-dateedit.c:1356
+#: widgets/misc/e-dateedit.c:1471
 msgid "None"
 msgstr "Нема╓"
 
-#: calendar/gui/calendar-model.c:970
+#: calendar/gui/calendar-model.c:1087
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1700,119 +2075,295 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1010
+#: calendar/gui/calendar-model.c:1127
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1168
 msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
 msgstr ""
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1064
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:355
+#: calendar/gui/calendar-model.c:1181
+#: calendar/gui/dialogs/task-page.glade.h:18
+#: calendar/gui/e-calendar-table.c:332
 msgid "Undefined"
 msgstr "Невизначено"
 
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1222
 msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1574
+#: calendar/gui/calendar-model.c:1710
 #, fuzzy
 msgid "Recurring"
 msgstr "Повторення"
 
-#: calendar/gui/calendar-model.c:1576
+#: calendar/gui/calendar-model.c:1712
 msgid "Assigned"
 msgstr "Прив'язано"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:620
+#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:1158
+#: calendar/gui/dialogs/meeting-page.c:1254
 msgid "Yes"
 msgstr "Так"
 
-#: calendar/gui/calendar-model.c:1582
+#: calendar/gui/calendar-model.c:1718 calendar/gui/dialogs/meeting-page.c:632
+#: calendar/gui/dialogs/meeting-page.c:1255
 msgid "No"
 msgstr "Н╕"
 
-#: calendar/gui/calendar-summary.c:198
+#: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 #, fuzzy
-msgid "%A, %e %B %Y"
-msgstr "%A, %d %B %Y"
+msgid "Day View"
+msgstr "Картка: "
 
-#: calendar/gui/calendar-summary.c:207
-msgid "Appointments"
-msgstr "Зустр╕ч╕"
+#: calendar/gui/calendar-view-factory.c:152 views/calendar/galview.xml.h:4
+#, fuzzy
+msgid "Work Week View"
+msgstr "Робочий тиждень"
 
-#: calendar/gui/calendar-summary.c:245 calendar/gui/calendar-summary.c:251
-msgid "%I:%M%p"
-msgstr "%I:%M%p"
+#: calendar/gui/calendar-view-factory.c:155 views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "Week View"
+msgstr "Тиждень"
 
-#: calendar/gui/calendar-summary.c:275 calendar/gui/print.c:948
-#: views/tasks/galview.xml.h:1
-msgid "Tasks"
-msgstr "Завдання"
+#: calendar/gui/calendar-view-factory.c:158 views/calendar/galview.xml.h:2
+#, fuzzy
+msgid "Month View"
+msgstr "М╕сяць"
 
-#: calendar/gui/calendar-summary.c:443
-msgid "<b>Error loading calendar</b>"
-msgstr "<b>Помилка завантаження календаря</b>"
+#: calendar/gui/control-factory.c:128
+msgid "The URI that the calendar will display"
+msgstr "URI, який в╕добразить календар"
 
-#: calendar/gui/calendar-summary.c:455
-msgid "<b>Error loading calendar:<br>Method not supported"
-msgstr "<b>Помилка завантаження календаря:<br>Метод не п╕дтриму╓ться"
+#: calendar/gui/dialogs/alarm-options.c:354
+#, fuzzy
+msgid "Audio Alarm Options"
+msgstr "Звуков╕ си╜нали"
 
-#: calendar/gui/calendar-summary.c:622
+#: calendar/gui/dialogs/alarm-options.c:363
 #, fuzzy
-msgid "Display"
-msgstr "День"
+msgid "Message Alarm Options"
+msgstr "Адресати пов╕домлення"
 
-#: calendar/gui/calendar-summary.c:627
-msgid "Show appointments"
-msgstr "Показати зустр╕ч╕"
+#: calendar/gui/dialogs/alarm-options.c:372
+#, fuzzy
+msgid "Mail Alarm Options"
+msgstr "Параметри в╕дображення"
 
-#: calendar/gui/calendar-summary.c:635
-msgid "Show tasks"
-msgstr "Показати завдання"
+#: calendar/gui/dialogs/alarm-options.c:381
+msgid "Program Alarm Options"
+msgstr ""
 
-#: calendar/gui/calendar-summary.c:690
-msgid "Things to do"
+#: calendar/gui/dialogs/alarm-options.c:390
+msgid "Unknown Alarm Options"
 msgstr ""
 
-#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
-msgid "Loading Calendar"
-msgstr "Завантаження календаря"
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+msgid "Alarm Repeat"
+msgstr ""
 
-#: calendar/gui/control-factory.c:126
-msgid "The URI that the calendar will display"
-msgstr "URI, який в╕добразить календар"
+#: calendar/gui/dialogs/alarm-options.glade.h:2
+msgid "FIXME: mail alarm options"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:189
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:3
+#, fuzzy
+msgid "Message to Display"
+msgstr "Заголовок пов╕домлення"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Play sound:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:196
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: calendar/gui/dialogs/alarm-options.glade.h:5
+msgid "Repeat the alarm"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:207
-msgid "No summary available."
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+#, fuzzy
+msgid "Run program:"
+msgstr "Запустити програму"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:7
+msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
-#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
-msgid "Close"
-msgstr "Закрити"
+#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:83
+#, fuzzy
+msgid "days"
+msgstr "Т╕ло"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:2
-msgid "Edit appointment"
-msgstr "Виправити зустр╕ч"
+#: calendar/gui/dialogs/alarm-options.glade.h:9
+msgid "extra times every"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:4
-msgid "Snooze time (minutes)"
-msgstr "Час сну (в хвилинах)"
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
+msgid "hours"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:85
+msgid "minutes"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:284
+#, fuzzy, c-format
+msgid "%d days"
+msgstr "Т╕ло"
+
+#: calendar/gui/dialogs/alarm-page.c:286
+#, fuzzy
+msgid "1 day"
+msgstr " 1 день"
+
+#: calendar/gui/dialogs/alarm-page.c:289
+#, fuzzy, c-format
+msgid "%d weeks"
+msgstr "Тиждень"
+
+#: calendar/gui/dialogs/alarm-page.c:291
+#, fuzzy
+msgid "1 week"
+msgstr "Показати 1 тиждень"
+
+#: calendar/gui/dialogs/alarm-page.c:294
+#, fuzzy, c-format
+msgid "%d hours"
+msgstr "24 години"
+
+#: calendar/gui/dialogs/alarm-page.c:296
+#, fuzzy
+msgid "1 hour"
+msgstr " 1 година"
+
+#: calendar/gui/dialogs/alarm-page.c:299
+#, fuzzy, c-format
+msgid "%d minutes"
+msgstr " %d хвилин"
+
+#: calendar/gui/dialogs/alarm-page.c:301
+#, fuzzy
+msgid "1 minute"
+msgstr "10 хвилин"
+
+#: calendar/gui/dialogs/alarm-page.c:304
+#, fuzzy, c-format
+msgid "%d seconds"
+msgstr "В╕д╕слати"
+
+#: calendar/gui/dialogs/alarm-page.c:306
+#, fuzzy
+msgid "1 second"
+msgstr " 1 секунда"
+
+#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.glade.h:4
+msgid "Play a sound"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.c:335
+#: calendar/gui/dialogs/alarm-page.glade.h:3
+#, fuzzy
+msgid "Display a message"
+msgstr "Поштову пов╕домлення"
+
+#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an email"
+msgstr "В╕д╕слати пошту"
+
+#: calendar/gui/dialogs/alarm-page.c:343
+#: calendar/gui/dialogs/alarm-page.glade.h:6
+msgid "Run a program"
+msgstr "Запустити програму"
+
+#: calendar/gui/dialogs/alarm-page.c:361
+#, fuzzy
+msgid "before start of appointment"
+msgstr " перед початком зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:364
+#, fuzzy
+msgid "after start of appointment"
+msgstr " п╕сля початку зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:374
+#, fuzzy
+msgid "before end of appointment"
+msgstr " перед к╕нцем зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.c:377
+#, fuzzy
+msgid "after end of appointment"
+msgstr " п╕сля к╕нця зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "Basics"
+msgstr "Вставити"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-itip-control.c:298
+#, fuzzy
+msgid "Date/Time:"
+msgstr "Дата й час"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+msgid "Reminders"
+msgstr "Нагадування"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-itip-control.c:287 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Зведення:"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:11
+#, fuzzy
+msgid "_Options..."
+msgstr "Параметри"
+
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "п╕сля"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:6
+msgid "before"
+msgstr "перед"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#, fuzzy
+msgid "day(s)"
+msgstr "Т╕ло"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:15
+msgid "end of appointment"
+msgstr "к╕нець зустр╕ч╕"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+#, fuzzy
+msgid "hour(s)"
+msgstr "година"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:111
+#, fuzzy
+msgid "minute(s)"
+msgstr "хвилина"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:18
+msgid "start of appointment"
+msgstr "початок зустр╕ч╕"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
@@ -1843,36 +2394,36 @@ msgid "60 minutes"
 msgstr "60 хвилин"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Alarms timeout after"
+msgid "Beep when alarm windows appear."
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "Audio Alarms"
-msgstr "Звуков╕ си╜нали"
+#: my-evolution/my-evolution.glade.h:5 shell/e-shortcuts.c:985
+msgid "Calendar"
+msgstr "Календар"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "Beep when alarm windows appear."
-msgstr ""
+msgid "Calendar Preferences"
+msgstr "Параметри календаря"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ui/evolution-calendar.xml.h:3
-msgid "Calendar"
-msgstr "Календар"
+msgid "Color for overdue tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
+msgid "Color for tasks due today"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "Colors"
-msgstr "Кольори"
+msgid "Colors for Tasks"
+msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "Compress weekends"
+msgid "Compress weekends in month view"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Date navigator options"
+msgid "Date Navigator"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
@@ -1881,595 +2432,1094 @@ msgid "Defaults"
 msgstr "Подробиц╕"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Display options"
-msgstr "Параметри в╕дображення"
+#: mail/mail-config.glade.h:30
+#, fuzzy
+msgid "Display"
+msgstr "День"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:162
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Enable snoozing for"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "К╕нець дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "First day of week:"
 msgstr "Перший день тижня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Fri"
 msgstr "Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/recurrence-page.c:969
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Highlight"
-msgstr "П╕дсв╕тка"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Items Due Today"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Items Due Today:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Items Not Yet Due"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Items Not Yet Due:"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Mon"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Monday"
 msgstr "Понед╕лок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "Overdue Items"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+msgid "Notification Options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Overdue Items:"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+msgid "Overdue tasks"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: mail/mail-config.glade.h:45
-msgid "Pick a color"
-msgstr "Виб╕р кольору"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:165
-msgid "Priority"
-msgstr "Пр╕оритет"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Remind me of all appointments"
 msgstr "Нагадувати про вс╕ зустр╕ч╕"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:21
-msgid "Reminders"
-msgstr "Нагадування"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Sat"
 msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/recurrence-page.c:970
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show"
-msgstr "Показати"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Show appointment end times"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#, fuzzy
+msgid "Show appointment end times in week and month views"
 msgstr "Показати час завершення зустр╕чей"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Show week numbers"
 msgstr "Показати номера тижн╕в"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Start of day:"
 msgstr "Початок дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 msgid "Sun"
 msgstr "Ндл"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/recurrence-page.c:971
 msgid "Sunday"
 msgstr "Нед╕ля"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "TaskPad"
-msgstr "Панель завдань"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#, fuzzy
+msgid "Task List"
+msgstr "Завдання"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+msgid "Tasks due today"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Thu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/recurrence-page.c:968
 msgid "Thursday"
 msgstr "Четвер"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Time Until Due"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "Time"
+msgstr "Титул:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Time divisions:"
 msgstr "Розд╕лювач╕ часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Time format:"
 msgstr "Формат часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Time zone:"
+msgstr ""
+"\n"
+"Часовий пояс: "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Tuesday"
 msgstr "В╕второк"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Visual Alarms"
-msgstr "В╕зуальн╕ си╜нали"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/recurrence-page.c:967
 msgid "Wednesday"
 msgstr "Середа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "Work week"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#, fuzzy
+msgid "Work Week"
 msgstr "Робочий тиждень"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:78
+#: calendar/gui/dialogs/cancel-comp.c:52
+msgid "The meeting status has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/cancel-comp.c:58
 #, fuzzy
-msgid "seconds."
-msgstr "В╕д╕слати"
+msgid "Are you sure you want to cancel and delete this meeting?"
+msgstr "Ви впевнен╕, що хочете стерти завдання"
+
+#: calendar/gui/dialogs/cancel-comp.c:63
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this task?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: calendar/gui/dialogs/cancel-comp.c:68
+#, fuzzy
+msgid "Are you sure you want to cancel and delete this journal entry?"
+msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
+
+#: calendar/gui/dialogs/changed-comp.c:60
+msgid "This event has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:64
+msgid "This task has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:68
+msgid "This journal entry has been deleted."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:77
+#, c-format
+msgid "%s  You have made changes. Forget those changes and close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:79
+#, c-format
+msgid "%s  You have made no changes, close the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:84
+msgid "This event has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:88
+msgid "This task has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:92
+msgid "This journal entry has been changed."
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:101
+#, c-format
+msgid "%s  You have made changes. Forget those changes and update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/changed-comp.c:103
+#, c-format
+msgid "%s  You have made no changes, update the editor?"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:154
+#: calendar/gui/e-itip-control.c:627 calendar/gui/print.c:2116
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:158
+#: calendar/gui/e-itip-control.c:631 calendar/gui/print.c:2120
+#, fuzzy
+msgid " (Completed "
+msgstr "Завершено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:160
+#: calendar/gui/e-itip-control.c:633 calendar/gui/print.c:2122
+#, fuzzy
+msgid "Completed "
+msgstr "Завершено"
+
+#: calendar/gui/dialogs/comp-editor-util.c:165
+#: calendar/gui/e-itip-control.c:638 calendar/gui/print.c:2127
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:167
+#: calendar/gui/e-itip-control.c:640 calendar/gui/print.c:2129
+msgid "Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor.c:449
+msgid "Edit Appointment"
+msgstr "Виправити зустр╕ч"
+
+#: calendar/gui/dialogs/comp-editor.c:454
+#, c-format
+msgid "Appointment - %s"
+msgstr "Зустр╕ч - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:457
+#, c-format
+msgid "Task - %s"
+msgstr "Завдання - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:460
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальний запис - %s"
+
+#: calendar/gui/dialogs/comp-editor.c:474
+msgid "No summary"
+msgstr "Нема╓ зведення"
+
+#: calendar/gui/dialogs/comp-editor.c:806 mail/mail-callbacks.c:1497
+#: mail/mail-display.c:98
+msgid "Overwrite file?"
+msgstr "Переписати файл?"
+
+#: calendar/gui/dialogs/comp-editor.c:810 mail/mail-callbacks.c:1501
+#: mail/mail-display.c:102
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
+"Переписати його?"
+
+#: calendar/gui/dialogs/comp-editor.c:873 ui/evolution-comp-editor.xml.h:14
+#: widgets/misc/e-filter-bar.h:101
+#, fuzzy
+msgid "Save As..."
+msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/delete-comp.c:70
+#: calendar/gui/dialogs/comp-editor.c:1026
+msgid "Unable to obtain current version!"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:84
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:73
+#: calendar/gui/dialogs/delete-comp.c:87
 msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "Ви впевнен╕, що хочете стерти цю неназвану зустр╕ч?"
 
-#: calendar/gui/dialogs/delete-comp.c:79
+#: calendar/gui/dialogs/delete-comp.c:93
 #, c-format
 msgid "Are you sure you want to delete the task `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:82
+#: calendar/gui/dialogs/delete-comp.c:96
 msgid "Are you sure you want to delete this untitled task?"
 msgstr "Ви впевнен╕, що хочете стерти це неназване завдання?"
 
-#: calendar/gui/dialogs/delete-comp.c:88
+#: calendar/gui/dialogs/delete-comp.c:102
 #, c-format
 msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:91
+#: calendar/gui/dialogs/delete-comp.c:105
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Ви впевнен╕, що хочете стерти цей неназваний запис в журнал╕?"
 
-#: calendar/gui/dialogs/save-comp.c:51
-msgid "Do you want to save changes?"
-msgstr "Ви хочете зм╕нити зм╕ни?"
+#: calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d appointments?"
+msgstr "Ви впевнен╕, що хочете стерти зустр╕ч \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "Виправити завдання"
+#: calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d tasks?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "Нема╓ зведення"
+#: calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy, c-format
+msgid "Are you sure you want to delete %d journal entries?"
+msgstr "Ви впевнен╕, що хочете стерти запис в журнал╕ \"%s\"?"
 
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "Зустр╕ч - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:1
+#, fuzzy
+msgid "Select a Time Zone"
+msgstr "Вибрати файл"
 
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "Завдання - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "Selection:"
+msgstr "Розд╕ли:"
 
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальний запис - %s"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "Time Zones"
+msgstr ""
+"\n"
+"Часовий пояс: "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#, no-c-format
-msgid "% Comp_lete:"
-msgstr "% завершення:"
+#: calendar/gui/dialogs/e-timezone-dialog.glade.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+" Use the right mouse button to zoom out."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:158
-#: calendar/gui/event-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/event-editor.c:154
+msgid "Appointment"
+msgstr "Зустр╕ч"
+
+#: calendar/gui/dialogs/event-editor.c:159
+msgid "Reminder"
+msgstr "Нагадування"
+
+#: calendar/gui/dialogs/event-editor.c:164
+msgid "Recurrence"
+msgstr "Повторення"
+
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:248
+#, fuzzy
+msgid "Meeting"
+msgstr "Скасувати зустр╕ч"
+
+#: calendar/gui/dialogs/event-page.glade.h:1
+msgid "A_ll day event"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Date & Time"
 msgstr "Дата й час"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Date Completed:"
-msgstr "Дата виконання:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:13
 msgid "Pri_vate"
 msgstr "Особисте"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Progress"
-msgstr "Поступ"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:15
 msgid "Pu_blic"
 msgstr "Публ╕чне"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "Sta_rt Date:"
-msgstr "Час початку:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:17
 msgid "Su_mmary:"
 msgstr "Зведення:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Task"
-msgstr "Завдання"
+#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:19
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/event-page.glade.h:10
+msgid "_End time:"
+msgstr "Час завершення:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "_Confidential"
+#: calendar/gui/dialogs/event-page.glade.h:11
+msgid "_Start time:"
+msgstr "Дата початку:"
+
+#: calendar/gui/dialogs/meeting-page.c:551
+#: calendar/gui/dialogs/meeting-page.c:568
+#: calendar/gui/dialogs/meeting-page.c:1154
+#: calendar/gui/dialogs/meeting-page.c:1222
+msgid "Individual"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "_Contacts..."
-msgstr "Контакти..."
+#: calendar/gui/dialogs/meeting-page.c:553
+#: calendar/gui/dialogs/meeting-page.c:570
+#: calendar/gui/dialogs/meeting-page.c:1223
+#, fuzzy
+msgid "Group"
+msgstr "Назва групи:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/meeting-page.c:555
+#: calendar/gui/dialogs/meeting-page.c:572
+#: calendar/gui/dialogs/meeting-page.c:1224
 #, fuzzy
-msgid "_Due Date:"
-msgstr "В╕дд╕л:"
+msgid "Resource"
+msgstr "Джерело паперу:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Priority:"
-msgstr "Пр╕оритет:"
+#: calendar/gui/dialogs/meeting-page.c:557
+#: calendar/gui/dialogs/meeting-page.c:574
+#: calendar/gui/dialogs/meeting-page.c:1225
+msgid "Room"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "_Status:"
-msgstr "Стан:"
+#: calendar/gui/dialogs/meeting-page.c:586
+#: calendar/gui/dialogs/meeting-page.c:603
+#: calendar/gui/dialogs/meeting-page.c:1238
+msgid "Chair"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:157
-msgid "Categories"
-msgstr "Категор╕╖"
+#: calendar/gui/dialogs/meeting-page.c:588
+#: calendar/gui/dialogs/meeting-page.c:605
+#: calendar/gui/dialogs/meeting-page.c:1156
+#: calendar/gui/dialogs/meeting-page.c:1239
+#, fuzzy
+msgid "Required Participant"
+msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/e-calendar-table.c:159
-msgid "Completion Date"
+#: calendar/gui/dialogs/meeting-page.c:590
+#: calendar/gui/dialogs/meeting-page.c:607
+#: calendar/gui/dialogs/meeting-page.c:1240
+msgid "Optional Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:592
+#: calendar/gui/dialogs/meeting-page.c:609
+#: calendar/gui/dialogs/meeting-page.c:1241
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:638
+#: calendar/gui/dialogs/meeting-page.c:661
+#: calendar/gui/dialogs/meeting-page.c:1164
+#: calendar/gui/dialogs/meeting-page.c:1267
+#, fuzzy
+msgid "Needs Action"
+msgstr "Додати д╕ю"
+
+#: calendar/gui/dialogs/meeting-page.c:640
+#: calendar/gui/dialogs/meeting-page.c:663
+#: calendar/gui/dialogs/meeting-page.c:1268
+msgid "Accepted"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:642
+#: calendar/gui/dialogs/meeting-page.c:665
+#: calendar/gui/dialogs/meeting-page.c:1269
+#, fuzzy
+msgid "Declined"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/meeting-page.c:644
+#: calendar/gui/dialogs/meeting-page.c:667
+#: calendar/gui/dialogs/meeting-page.c:1270
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:646
+#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:1271
+#, fuzzy
+msgid "Delegated"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:673
+#, fuzzy
+msgid "In Process"
+msgstr "Викону╓ться"
+
+#: calendar/gui/dialogs/meeting-page.c:712
+msgid "That person is already attending the meeting!"
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:763
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Автомоб╕льний телефон"
+
+#: calendar/gui/dialogs/meeting-page.c:765
+#: calendar/gui/dialogs/meeting-page.c:813
+#: calendar/gui/dialogs/meeting-page.c:933
+#, fuzzy
+msgid "Required Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:767
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Optional Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:769
+#: calendar/gui/dialogs/meeting-page.c:813
+#, fuzzy
+msgid "Non-Participants"
+msgstr "Потр╕бн╕ люди"
+
+#: calendar/gui/dialogs/meeting-page.c:891
+#, fuzzy
+msgid "Sent By:"
+msgstr "В╕д╕слано"
+
+#: calendar/gui/dialogs/meeting-page.c:1442
+#, fuzzy
+msgid "_Delegate To..."
+msgstr "Стерти..."
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#, fuzzy
+msgid "Attendee"
+msgstr "Весь супров╕д"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#, fuzzy
+msgid "Common Name"
 msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.c:160
-msgid "End Date"
-msgstr "Дата к╕нця"
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#, fuzzy
+msgid "Delegated From"
+msgstr "Стерто"
 
-#: calendar/gui/e-calendar-table.c:161
-msgid "Start Date"
-msgstr "Дата початку"
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#, fuzzy
+msgid "Delegated To"
+msgstr "Стерто"
 
-#: calendar/gui/e-calendar-table.c:163
-msgid "Geographical Position"
-msgstr "Географ╕чне положення"
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#, fuzzy
+msgid "Language"
+msgstr "Кер╕вник"
 
-#: calendar/gui/e-calendar-table.c:164
-msgid "Percent complete"
-msgstr "В╕дсоток виконання"
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+msgid "Member"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:166
-msgid "Summary"
-msgstr "Зведення"
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+msgid "RSVP"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:167
-msgid "Transparency"
-msgstr "Прозор╕сть"
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#, fuzzy
+msgid "Role"
+msgstr "Моб╕льний"
 
-#: calendar/gui/e-calendar-table.c:168
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:13 filter/libfilter-i18n.h:49
+#: mail/message-list.etspec.h:8
+msgid "Status"
+msgstr "Стан"
 
-#: calendar/gui/e-calendar-table.c:169
-msgid "Alarms"
-msgstr "Си╜нали"
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:102
+#: shell/glade/e-active-connection-dialog.glade.h:5
+#, fuzzy
+msgid "Type"
+msgstr "Тип:"
 
-#: calendar/gui/e-calendar-table.c:170
-msgid "Click here to add a task"
-msgstr "Клацн╕ть тут щоб додати завдання"
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "_Change Organizer"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "_Invite Others"
+msgstr "Запросити ╕нших..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
+#, fuzzy
+msgid "_Other Organizer"
+msgstr "Орган╕затор:"
+
+#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
+#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+msgid "%a %b %d %Y"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:584
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.c:938
+#, fuzzy
+msgid "on"
+msgstr "Пнд"
+
+#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+msgid "day"
+msgstr "день"
+
+#: calendar/gui/dialogs/recurrence-page.c:1094
+#, fuzzy
+msgid "on the"
+msgstr "м╕сяць"
+
+#: calendar/gui/dialogs/recurrence-page.c:1102
+msgid "th"
+msgstr " "
+
+#: calendar/gui/dialogs/recurrence-page.c:1274
+#, fuzzy
+msgid "occurrences"
+msgstr "Джерела"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:2
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "Без повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Кожен"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+msgid "Exceptions"
+msgstr "Виключення"
 
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/dialogs/recurrence-page.glade.h:6
+msgid "No recurrence"
+msgstr "Без повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
+msgid "Preview"
+msgstr "Перегляд"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "Recurrence Rule"
+msgstr "Правило повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
+msgid "Simple recurrence"
+msgstr "Просте повторення"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
+#, fuzzy
+msgid "_Modify"
+msgstr "Зм╕нити"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:15
+msgid "for"
+msgstr "в"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:16
+msgid "forever"
+msgstr "завжди"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "month(s)"
+msgstr "м╕сяць"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
+msgid "until"
+msgstr ""
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#, fuzzy
+msgid "week(s)"
+msgstr "Тиждень"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
+msgid "year(s)"
+msgstr "р╕к"
+
+#: calendar/gui/dialogs/save-comp.c:51
+msgid "Do you want to save changes?"
+msgstr "Ви хочете зм╕нити зм╕ни?"
+
+#: calendar/gui/dialogs/send-comp.c:56
+msgid "The meeting information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:61
+msgid "The task information has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/send-comp.c:66
+msgid "The journal entry has changed. Send an updated version?"
+msgstr ""
+
+#: calendar/gui/dialogs/task-details-page.glade.h:2
+msgid "Date Completed:"
+msgstr "Дата виконання:"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#, fuzzy
+msgid "Delegated From:"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+#, fuzzy
+msgid "Delegated To:"
+msgstr "Стерто"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#, fuzzy
+msgid "No one"
+msgstr "Нема╓"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: my-evolution/e-summary-preferences.c:889
+msgid "URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/task-editor.c:130
+msgid "Task"
+msgstr "Завдання"
+
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, no-c-format
+msgid "% Comp_lete:"
+msgstr "% завершення:"
+
+#: calendar/gui/dialogs/task-page.glade.h:14
+msgid "Progress"
+msgstr "Поступ"
+
+#: calendar/gui/dialogs/task-page.glade.h:16
+msgid "Sta_rt Date:"
+msgstr "Час початку:"
+
+#: calendar/gui/dialogs/task-page.glade.h:21
+#, fuzzy
+msgid "_Due Date:"
+msgstr "В╕дд╕л:"
+
+#: calendar/gui/dialogs/task-page.glade.h:22
+msgid "_Priority:"
+msgstr "Пр╕оритет:"
+
+#: calendar/gui/dialogs/task-page.glade.h:23
+msgid "_Status:"
+msgstr "Стан:"
+
+#: calendar/gui/e-calendar-table.c:351
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:352
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:353
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:354
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:355
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:356
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:357
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:358
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:359
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:360
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:384
+#: calendar/gui/e-calendar-table.c:361
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:551
-msgid "Mark Complete"
-msgstr "Позначити як виконане"
+#: calendar/gui/e-calendar-table.c:848 calendar/gui/e-day-view.c:3327
+#: calendar/gui/e-week-view.c:3164 mail/folder-browser.c:1271
+msgid "_Open"
+msgstr "В╕дкрити"
 
-#: calendar/gui/e-calendar-table.c:552
-msgid "Mark the task complete"
-msgstr "Позначити завдання як виконане"
+#: calendar/gui/e-calendar-table.c:852 calendar/gui/e-day-view.c:3336
+#: calendar/gui/e-week-view.c:3173 ui/evolution-addressbook.xml.h:1
+#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+msgid "C_ut"
+msgstr "Вир╕зати"
 
-#: calendar/gui/e-calendar-table.c:557
-msgid "Edit this task..."
-msgstr "Виправити це завдання..."
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3338
+#: calendar/gui/e-week-view.c:3175 ui/evolution-addressbook.xml.h:25
+#: ui/evolution-calendar.xml.h:31 ui/evolution-tasks.xml.h:14
+msgid "_Copy"
+msgstr "Скоп╕ювати"
 
-#: calendar/gui/e-calendar-table.c:558
-msgid "Edit the task"
-msgstr "Виправити завдання"
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3313
+#: calendar/gui/e-day-view.c:3340 calendar/gui/e-week-view.c:3151
+#: calendar/gui/e-week-view.c:3177 ui/evolution-addressbook.xml.h:26
+#: ui/evolution-calendar.xml.h:34 ui/evolution-tasks.xml.h:16
+msgid "_Paste"
+msgstr "Вставити"
 
-#: calendar/gui/e-calendar-table.c:560
-#: ui/evolution-task-editor-dialog.xml.h:19
-msgid "Delete this task"
+#: calendar/gui/e-calendar-table.c:861
+#, fuzzy
+msgid "_Mark as Complete"
+msgstr "Позначити як виконане"
+
+#: calendar/gui/e-calendar-table.c:863
+#, fuzzy
+msgid "_Delete this Task"
 msgstr "Стерти це завдання"
 
-#: calendar/gui/e-calendar-table.c:561
-msgid "Delete the task"
+#: calendar/gui/e-calendar-table.c:866
+#, fuzzy
+msgid "_Mark Tasks as Complete"
+msgstr "Позначити як виконане"
+
+#: calendar/gui/e-calendar-table.c:868
+#, fuzzy
+msgid "_Delete Selected Tasks"
 msgstr "Стерти завдання"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "дп"
+#: calendar/gui/e-calendar-table.c:1137
+msgid "Click here to add a task"
+msgstr "Клацн╕ть тут щоб додати завдання"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "пп"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, fuzzy, no-c-format
+msgid "% Complete"
+msgstr "% завершення:"
+
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Alarms"
+msgstr "Си╜нали"
+
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Категор╕╖"
+
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
+#: camel/camel-filter-driver.c:815
+#, fuzzy
+msgid "Complete"
+msgstr "% завершення:"
+
+#: calendar/gui/e-calendar-table.etspec.h:7
+msgid "Completion Date"
+msgstr "Дата завершення"
+
+#: calendar/gui/e-calendar-table.etspec.h:8
+msgid "Due Date"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.etspec.h:9
+msgid "End Date"
+msgstr "Дата к╕нця"
+
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "Geographical Position"
+msgstr "Географ╕чне положення"
+
+#: calendar/gui/e-calendar-table.etspec.h:11
+msgid "Priority"
+msgstr "Пр╕оритет"
+
+#: calendar/gui/e-calendar-table.etspec.h:12
+msgid "Start Date"
+msgstr "Дата початку"
+
+#: calendar/gui/e-calendar-table.etspec.h:14
+msgid "Summary"
+msgstr "Зведення"
+
+#: calendar/gui/e-calendar-table.etspec.h:15
+#, fuzzy
+msgid "Task sort"
+msgstr "Завдання"
+
+#: calendar/gui/e-calendar-table.etspec.h:16
+msgid "Transparency"
+msgstr "Прозор╕сть"
+
+#: calendar/gui/e-calendar-table.etspec.h:18
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1330
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
-#: calendar/gui/e-week-view-main-item.c:334
-msgid "%a %d %b"
-msgstr "%a %d %b"
-
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1357
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
-msgid "New Appointment"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:576 calendar/gui/e-week-view.c:309
+#: calendar/gui/print.c:759
+msgid "am"
+msgstr "дп"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:579 calendar/gui/e-week-view.c:312
+#: calendar/gui/print.c:761
+msgid "pm"
+msgstr "пп"
+
+#: calendar/gui/e-day-view.c:3306
+#, fuzzy
+msgid "New _Appointment"
 msgstr "Нова зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
-msgid "New All Day Event"
+#: calendar/gui/e-day-view.c:3308 calendar/gui/e-week-view.c:3146
+#, fuzzy
+msgid "New All Day _Event"
 msgstr "Нова щоденна под╕я"
 
-#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+#: calendar/gui/e-day-view.c:3318 calendar/gui/e-week-view.c:3156
+#: ui/evolution-calendar.xml.h:13
 #, fuzzy
-msgid "Go to Today"
+msgid "Go to _Today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+#: calendar/gui/e-day-view.c:3320 calendar/gui/e-week-view.c:3158
 #, fuzzy
-msgid "Go to Date..."
+msgid "_Go to Date..."
 msgstr "К╕нцева дата"
 
-#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "В╕дкрити"
-
-#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
-msgid "Delete this Appointment"
+#: calendar/gui/e-day-view.c:3329 calendar/gui/e-week-view.c:3166
+#, fuzzy
+msgid "_Delete this Appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
-#: ui/evolution-event-editor.xml.h:45
-msgid "Schedule Meeting"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
+#: calendar/gui/e-day-view.c:3348 calendar/gui/e-week-view.c:3191
 #, fuzzy
-msgid "Make this Occurrence Movable"
+msgid "Make this Occurrence _Movable"
 msgstr "Зберегти поточний файл"
 
-#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
+#: calendar/gui/e-day-view.c:3350 calendar/gui/e-week-view.c:3193
 #, fuzzy
-msgid "Delete this Occurrence"
+msgid "Delete this _Occurrence"
 msgstr "Стерти цей елемент"
 
-#: calendar/gui/e-day-view.c:3179
+#: calendar/gui/e-day-view.c:3352 calendar/gui/e-week-view.c:3195
 #, fuzzy
-msgid "Delete all Occurrences"
-msgstr "Стерти контакт"
+msgid "Delete _All Occurrences"
+msgstr "Джерела"
 
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
+#: calendar/gui/e-itip-control.c:694
+msgid "This is an event that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:161
-msgid "I couldn't update your calendar file!\n"
-msgstr "Не вдалося поновити ваш календарний файл!\n"
-
-#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
+#: calendar/gui/e-itip-control.c:697
 #, fuzzy
-msgid "Component successfully updated."
-msgstr "Файли Evolution усп╕шно встановлено."
+msgid "This is a meeting request."
+msgstr "Це поштова адреса"
+
+#: calendar/gui/e-itip-control.c:700
+msgid "This is one or more additions to a current meeting."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:173
-msgid "There was an error loading the calendar file."
+#: calendar/gui/e-itip-control.c:703
+msgid "This is a request for the latest event information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:197
-msgid "I couldn't open your calendar file!\n"
+#: calendar/gui/e-itip-control.c:706
+msgid "This is a reply to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
-msgid "I couldn't load your calendar file!\n"
+#: calendar/gui/e-itip-control.c:709
+msgid "This is an event cancellation."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:470
+#: calendar/gui/e-itip-control.c:712 calendar/gui/e-itip-control.c:752
+#: calendar/gui/e-itip-control.c:780
 #, fuzzy
-msgid "I couldn't read your calendar file!\n"
-msgstr "Не вдалося створити календар в \"%s\""
+msgid "The message is not understandable."
+msgstr "Пов╕домлення %s не знайдено."
 
-#: calendar/gui/e-itip-control.c:483
-msgid "This is a reply from someone who was uninvited!"
+#: calendar/gui/e-itip-control.c:737
+msgid "This is an task that can be added to your calendar."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:499
-#, fuzzy
-msgid "I couldn't update your calendar store."
-msgstr "Не вдалося створити календар в \"%s\""
+#: calendar/gui/e-itip-control.c:740
+msgid "This is a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:540
-msgid "I couldn't delete the calendar component!\n"
+#: calendar/gui/e-itip-control.c:743
+msgid "This is a request for the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:550
-#, fuzzy
-msgid "Component successfully deleted."
-msgstr "Файли Evolution усп╕шно встановлено."
+#: calendar/gui/e-itip-control.c:746
+msgid "This is a reply to a task request."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:694
-#, fuzzy
-msgid "I don't recognize this type of calendar component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+#: calendar/gui/e-itip-control.c:749
+msgid "This is an task cancellation."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:780
-msgid "Add to Calendar"
-msgstr "Додати до календаря"
+#: calendar/gui/e-itip-control.c:771
+msgid "This is freebusy information."
+msgstr ""
 
-#: calendar/gui/e-itip-control.c:814
-msgid " Accept "
+#: calendar/gui/e-itip-control.c:774
+msgid "This is a request for freebusy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:815
-msgid " Decline "
+#: calendar/gui/e-itip-control.c:777
+msgid "This is a reply to a freebusy request."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:834
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Схоже тека непоправно з╕псована."
+
+#: calendar/gui/e-itip-control.c:853
+msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:816
-msgid " Tentative "
+#: calendar/gui/e-itip-control.c:877
+msgid "The information contained in this attachment was not valid"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:860
-msgid "Update Calendar"
-msgstr "Поновити календар"
+#: calendar/gui/e-itip-control.c:989
+msgid "I couldn't update your calendar file!\n"
+msgstr "Не вдалося поновити ваш календарний файл!\n"
 
-#: calendar/gui/e-itip-control.c:883
-msgid "Cancel Meeting"
-msgstr "Скасувати зустр╕ч"
+#: calendar/gui/e-itip-control.c:1015
+#, fuzzy
+msgid "I couldn't remove the item from your calendar file!\n"
+msgstr "Не вдалося створити календар в \"%s\""
 
 #: calendar/gui/e-itip-control.glade.h:2
 #, fuzzy, no-c-format
@@ -2484,26 +3534,22 @@ msgstr ""
 msgid "Calendar Message"
 msgstr "Календарне пов╕домлення"
 
-#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:623
+#: calendar/gui/e-itip-control.glade.h:5
 msgid "Date:"
 msgstr "Дата:"
 
+#: calendar/gui/e-itip-control.glade.h:7
+msgid "Loading Calendar"
+msgstr "Завантаження календаря"
+
 #: calendar/gui/e-itip-control.glade.h:8
 msgid "Loading calendar..."
 msgstr "Завантаження календаря..."
 
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Орган╕затор:"
-
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Серверне пов╕домлення:"
 
-#: calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Зведення:"
-
 #: calendar/gui/e-itip-control.glade.h:12
 msgid "date-end"
 msgstr ""
@@ -2512,452 +3558,50 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-dialog.glade.h:2
-#, fuzzy
-msgid "Attendee"
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:3
-#, fuzzy
-msgid "Attendee address"
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:4
-#, fuzzy
-msgid "Attendees: "
-msgstr "Весь супров╕д"
-
-#: calendar/gui/e-meeting-dialog.glade.h:5
-msgid ""
-"Cancel\n"
-"Meeting"
-msgstr ""
-"Скасувати\n"
-"зустр╕ч"
-
-#: calendar/gui/e-meeting-dialog.glade.h:7
-#, fuzzy
-msgid "Chair"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:10
-#, fuzzy
-msgid "Meeting Invitations"
-msgstr "Час початку з╕брання:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:11
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:12
-msgid "Optional Participant"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:13
-#, fuzzy
-msgid "Organizer: "
-msgstr "Ор╕╓нтац╕я:"
-
-#: calendar/gui/e-meeting-dialog.glade.h:15
-msgid ""
-"Publish\n"
-"Event"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:17
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/e-meeting-dialog.glade.h:18
-#, fuzzy
-msgid ""
-"Request\n"
-"Meeting"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-meeting-dialog.glade.h:20
-#, fuzzy
-msgid "Required Participant"
-msgstr "Потр╕бн╕ люди"
-
-#: calendar/gui/e-meeting-dialog.glade.h:21
-#, fuzzy
-msgid "Role"
-msgstr "Моб╕льний"
-
-#: calendar/gui/e-meeting-dialog.glade.h:22
-#, fuzzy
-msgid ""
-"Schedule\n"
-"Time"
-msgstr "Планування зустр╕ч╕"
-
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
-msgid "Status"
-msgstr "Стан"
-
-#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
-#: calendar/gui/e-tasks.c:502
+#: calendar/gui/e-tasks.c:246 calendar/gui/e-tasks.c:597
+#: calendar/gui/e-tasks.c:629
 msgid "All"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:155
+#: calendar/gui/e-tasks.c:252
 msgid "Category:"
 msgstr "Категор╕я:"
 
-#: calendar/gui/e-tasks.c:298
+#: calendar/gui/e-tasks.c:403
 #, fuzzy, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Не вдалося завантажити календар в \"%s\""
 
-#: calendar/gui/e-tasks.c:310
+#: calendar/gui/e-tasks.c:415
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "Виправити зустр╕ч"
-
-#: calendar/gui/event-editor.c:454
-#, fuzzy
-msgid "on"
-msgstr "Пнд"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "день"
-
-#: calendar/gui/event-editor.c:606
-#, fuzzy
-msgid "on the"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:759
-#, fuzzy
-msgid "occurrences"
-msgstr "Джерела"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1548
-#, fuzzy, c-format
-msgid " %d days"
-msgstr "Т╕ло"
-
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 день"
-
-#: calendar/gui/event-editor.c:1553
-#, fuzzy, c-format
-msgid " %d weeks"
-msgstr "Тиждень"
-
-#: calendar/gui/event-editor.c:1555
-#, fuzzy
-msgid " 1 week"
-msgstr "Показати 1 тиждень"
-
-#: calendar/gui/event-editor.c:1558
-#, fuzzy, c-format
-msgid " %d hours"
-msgstr "24 години"
-
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 година"
-
-#: calendar/gui/event-editor.c:1563
-#, c-format
-msgid " %d minutes"
-msgstr " %d хвилин"
-
-#: calendar/gui/event-editor.c:1565
-#, fuzzy
-msgid " 1 minute"
-msgstr "10 хвилин"
-
-#: calendar/gui/event-editor.c:1568
-#, fuzzy, c-format
-msgid " %d seconds"
-msgstr "В╕д╕слати"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 секунда"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "Показати д╕алог"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "В╕д╕слати пошту"
-
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "Запустити програму"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " перед початком зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " п╕сля початку зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " перед к╕нцем зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " п╕сля к╕нця зустр╕ч╕"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:3
-msgid "Appointment"
-msgstr "Зустр╕ч"
-
-#: calendar/gui/event-editor-dialog.glade.h:4
-msgid "Appointment Basics"
-msgstr "П╕дстави зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:7
-#, fuzzy
-msgid "Custom recurrence"
-msgstr "Без повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Exceptions"
-msgstr "Виключення"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "Modify"
-msgstr "Зм╕нити"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "No recurrence"
-msgstr "Без повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Preview"
-msgstr "Перегляд"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-msgid "Recurrence"
-msgstr "Повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-msgid "Recurrence Rule"
-msgstr "Правило повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-msgid "Reminder"
-msgstr "Нагадування"
-
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
-msgid "Settings..."
-msgstr "Установки..."
-
-#: calendar/gui/event-editor-dialog.glade.h:26
-msgid "Simple recurrence"
-msgstr "Просте повторення"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_End time:"
-msgstr "Час завершення:"
-
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Start time:"
-msgstr "Дата початку:"
-
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Starting date:"
-msgstr "Дата початку:"
-
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
-msgid "after"
-msgstr "п╕сля"
-
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
-msgid "before"
-msgstr "перед"
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-#, fuzzy
-msgid "day(s)"
-msgstr "Т╕ло"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "end of appointment"
-msgstr "к╕нець зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "for"
-msgstr "в"
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "forever"
-msgstr "завжди"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-#, fuzzy
-msgid "hour(s)"
-msgstr "година"
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "label21"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "label55"
-msgstr "label26"
-
-#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
-#, fuzzy
-msgid "minute(s)"
-msgstr "хвилина"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "month(s)"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "start of appointment"
-msgstr "початок зустр╕ч╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "until"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-#, fuzzy
-msgid "week(s)"
-msgstr "Тиждень"
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "year(s)"
-msgstr "р╕к"
-
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "Нова зустр╕ч..."
-
-#: calendar/gui/e-week-view.c:3314
-#, fuzzy
-msgid "Delete All Occurrences"
-msgstr "Джерела"
-
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
+#: my-evolution/e-summary-calendar.c:230
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "Показати все "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "Зведення м╕стить"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "Опис м╕стить"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "Коментар м╕стить"
-
-#: calendar/gui/gnome-cal.c:240
+#: calendar/gui/e-week-view.c:3144 calendar/gui/e-week-view.c:3182
 #, fuzzy
-msgid "Has category"
-msgstr ""
-"\n"
-"Категор╕╖: "
+msgid "New _Appointment..."
+msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/gnome-cal.c:843
+#: calendar/gui/gnome-cal.c:999
 #, fuzzy, c-format
 msgid "Could not open the folder in `%s'"
 msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: calendar/gui/gnome-cal.c:854
+#: calendar/gui/gnome-cal.c:1010
 #, fuzzy, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необх╕дний для завантаження \"%s\", не п╕дтриму╓ться"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
-#, fuzzy
-msgid "Evolution calendar executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#, fuzzy
-msgid "Evolution calendar iTip/iMip viewer"
-msgstr "Канал календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
-msgid "Evolution component for handling the calendar."
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
-#, fuzzy
-msgid "Factory for the Calendar Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution calendar component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the calendar iTip view control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the sample Calendar control"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr ""
@@ -2980,236 +3624,259 @@ msgid "Go To Date"
 msgstr "К╕нцева дата"
 
 #: calendar/gui/goto-dialog.glade.h:6
-#, fuzzy
-msgid "Go To Today"
-msgstr "сьогодн╕"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "July"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "June"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
 msgid "March"
 msgstr "Пошук"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
 msgid "May"
 msgstr "Понед╕лок"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "November"
 msgstr ""
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
 msgid "October"
 msgstr "╤нша"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr ""
 
-#: calendar/gui/print.c:300
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Go To Today"
+msgstr "сьогодн╕"
+
+#: calendar/gui/itip-utils.c:224
+msgid "An organizer must be set."
+msgstr ""
+
+#: calendar/gui/print.c:422
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:422
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:423
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:424
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:303
+#: calendar/gui/print.c:425
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:304
+#: calendar/gui/print.c:426
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:305
+#: calendar/gui/print.c:427
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:306
+#: calendar/gui/print.c:428
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Su"
 msgstr "Ндл"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Mo"
 msgstr "Пнд"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "Tu"
 msgstr "Втр"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:490
 msgid "We"
 msgstr "Срд"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Th"
 msgstr "Чтв"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Fr"
 msgstr "Птн"
 
-#: calendar/gui/print.c:362
+#: calendar/gui/print.c:491
 msgid "Sa"
 msgstr "Сбт"
 
+#: calendar/gui/print.c:1707 my-evolution/e-summary-tasks.c:205
+#: my-evolution/e-summary-tasks.c:221 shell/e-shortcuts.c:986
+#: views/tasks/galview.xml.h:1
+msgid "Tasks"
+msgstr "Завдання"
+
 #. Day
-#: calendar/gui/print.c:1078
-msgid "Current day (%a %b %d %Y)"
+#: calendar/gui/print.c:1815
+#, fuzzy
+msgid "Selected day (%a %b %d %Y)"
 msgstr "Поточний день (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
+#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1093
+#: calendar/gui/print.c:1835
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1104
-#, c-format
-msgid "Current week (%s - %s)"
+#: calendar/gui/print.c:1846
+#, fuzzy, c-format
+msgid "Selected week (%s - %s)"
 msgstr "Поточний тиждень (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1112
-msgid "Current month (%b %Y)"
+#: calendar/gui/print.c:1854
+#, fuzzy
+msgid "Selected month (%b %Y)"
 msgstr "Поточний м╕сяць (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1119
-msgid "Current year (%Y)"
+#: calendar/gui/print.c:1861
+#, fuzzy
+msgid "Selected year (%Y)"
 msgstr "Поточний р╕к (%Y)"
 
-#: calendar/gui/print.c:1156
+#: calendar/gui/print.c:2200
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:57
+#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
+#: mail/mail-callbacks.c:1864 my-evolution/e-summary.c:511
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:10
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/tasks-control.c:108
+#: calendar/gui/print.c:2317
+#, fuzzy
+msgid "Print Item"
+msgstr "Надрукувати цей елемент"
+
+#: calendar/gui/print.c:2398
+msgid "Print Setup"
+msgstr "Параметри друку"
+
+#: calendar/gui/tasks-control.c:126
 #, fuzzy
 msgid "The URI of the tasks folder to display"
 msgstr "URI, який в╕добразить календар"
@@ -3246,90 +3913,109 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
-#: camel/camel-cipher-context.c:169
+#: camel/camel-cipher-context.c:171
 msgid "Signing is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:209
+#: camel/camel-cipher-context.c:211
 msgid "Clearsigning is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:249
+#: camel/camel-cipher-context.c:251
 msgid "Verifying is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:292
+#: camel/camel-cipher-context.c:294
 msgid "Encryption is not supported by this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:334
+#: camel/camel-cipher-context.c:336
 #, fuzzy
 msgid "Decryption is not supported by this cipher"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+#: camel/camel-disco-diary.c:181
+#, c-format
+msgid ""
+"Could not write log entry: %s\n"
+"Further operations on this server will not be replayed when you\n"
+"reconnect to the network."
+msgstr ""
+
+#: camel/camel-disco-diary.c:244
+#, c-format
+msgid ""
+"Could not open `%s':\n"
+"%s\n"
+"Changes made to this folder will not be resynchronized."
+msgstr ""
+
+#: camel/camel-disco-diary.c:278
+msgid "Resynchronizing with server"
+msgstr ""
+
+#: camel/camel-disco-store.c:305
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/camel-filter-driver.c:533 camel/camel-filter-driver.c:542
 #, fuzzy
 msgid "Syncing folders"
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: camel/camel-filter-driver.c:643
+#: camel/camel-filter-driver.c:644
 #, fuzzy
 msgid "Unable to open spool folder"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: camel/camel-filter-driver.c:652
+#: camel/camel-filter-driver.c:653
 #, fuzzy
 msgid "Unable to process spool folder"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: camel/camel-filter-driver.c:666
+#: camel/camel-filter-driver.c:667
 #, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#: camel/camel-filter-driver.c:671 camel/camel-filter-driver.c:684
 #, fuzzy, c-format
-msgid "Failed message %d"
+msgid "Failed on message %d"
 msgstr "Переслане пов╕домлення %s"
 
-#: camel/camel-filter-driver.c:671
+#: camel/camel-filter-driver.c:672
 #, fuzzy
 msgid "Cannot open message"
 msgstr ""
 "Неможливо отримати пов╕домлення: %s\n"
 "  %s"
 
-#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
 #, fuzzy
 msgid "Syncing folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
-#, fuzzy
-msgid "Complete"
-msgstr "% завершення:"
-
-#: camel/camel-filter-driver.c:748
+#: camel/camel-filter-driver.c:766
 #, fuzzy, c-format
 msgid "Getting message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
 #, fuzzy, c-format
 msgid "Failed at message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: camel/camel-filter-driver.c:866
+#: camel/camel-filter-driver.c:892
 #, fuzzy, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-filter-driver.c:871
+#: camel/camel-filter-driver.c:898
 #, fuzzy, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
+#: camel/camel-filter-search.c:451 camel/camel-filter-search.c:458
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка збереження файлу: %s"
@@ -3365,14 +4051,33 @@ msgstr ""
 msgid "Invalid type in body-contains, expecting string"
 msgstr ""
 
+#: camel/camel-lock-client.c:110
+#, fuzzy, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не вдалося створити канал: %s"
+
+#: camel/camel-lock-client.c:123
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/camel-lock-client.c:199 camel/camel-lock-client.c:222
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:212
+#, fuzzy, c-format
+msgid "Could not lock '%s'"
+msgstr "Не вдалося запустити спадко╓мний процес: %s"
+
 #. well, this is really only a programatic error
-#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
-#: camel/camel-movemail.c:185
+#: camel/camel-lock.c:92 camel/camel-lock.c:111
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Не вдалося створити файл блокування для %s: %s"
 
-#: camel/camel-lock.c:151 camel/camel-movemail.c:219
+#: camel/camel-lock.c:151
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
@@ -3387,113 +4092,108 @@ msgstr "Не вдалось зробити блокування за допомогою fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
 
-#: camel/camel-movemail.c:101
+#: camel/camel-movemail.c:108
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:148
+#: camel/camel-movemail.c:122
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Не вдалось в╕дкрити файл пошти %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Не вдалось в╕дкрити тимчасовий файл пошти %s: %s"
 
-#: camel/camel-movemail.c:199
-#, fuzzy, c-format
-msgid "Could not test lock file for %s: %s"
-msgstr "Створити новий календар"
-
-#: camel/camel-movemail.c:245
-#, c-format
-msgid "Error reading mail file: %s"
-msgstr "Помилка зчитування файлу пошти: %s"
-
-#: camel/camel-movemail.c:256
-#, c-format
-msgid "Error writing mail temp file: %s"
-msgstr "Помилка запису пошти у тимчасовий файл: %s"
-
-#: camel/camel-movemail.c:274
+#: camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файл╕ %s: %s"
 
-#: camel/camel-movemail.c:306
+#: camel/camel-movemail.c:189
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не вдалося створити канал: %s"
 
-#: camel/camel-movemail.c:318
+#: camel/camel-movemail.c:201
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Не вдалося запустити спадко╓мний процес: %s"
 
-#: camel/camel-movemail.c:356
+#: camel/camel-movemail.c:239
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:357
+#: camel/camel-movemail.c:240
 msgid "(Unknown error)"
 msgstr "(Нев╕дома помилка)"
 
-#: camel/camel-movemail.c:587
+#: camel/camel-movemail.c:263
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr "Помилка зчитування файлу пошти: %s"
+
+#: camel/camel-movemail.c:274
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "Помилка запису пошти у тимчасовий файл: %s"
+
+#: camel/camel-movemail.c:467 camel/camel-movemail.c:534
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Помилка запису пошти у тимчасовий файл: %s"
 
-#: camel/camel-pgp-context.c:188
+#: camel/camel-pgp-context.c:193
 #, fuzzy, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:196
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr ""
 
-#: camel/camel-pgp-context.c:511
+#: camel/camel-pgp-context.c:518
 msgid "No plaintext to sign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:518 camel/camel-pgp-context.c:690
-#: camel/camel-pgp-context.c:1057 camel/camel-pgp-context.c:1269
+#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
+#: camel/camel-pgp-context.c:1073 camel/camel-pgp-context.c:1288
 msgid "No password provided."
 msgstr "Не вказано паролю."
 
-#: camel/camel-pgp-context.c:524 camel/camel-pgp-context.c:696
-#: camel/camel-pgp-context.c:879 camel/camel-pgp-context.c:1064
-#: camel/camel-pgp-context.c:1276
+#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1080
+#: camel/camel-pgp-context.c:1295
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Неможливо створити канал до GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:683
+#: camel/camel-pgp-context.c:693
 msgid "No plaintext to clearsign."
 msgstr ""
 
-#: camel/camel-pgp-context.c:873
+#: camel/camel-pgp-context.c:886
 msgid "No plaintext to verify."
 msgstr ""
 
-#: camel/camel-pgp-context.c:890
+#: camel/camel-pgp-context.c:903
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Не вдалося створити тимчасовий файл: %s"
 
-#: camel/camel-pgp-context.c:1047
+#: camel/camel-pgp-context.c:1063
 msgid "No plaintext to encrypt."
 msgstr ""
 
-#: camel/camel-pgp-context.c:1073
+#: camel/camel-pgp-context.c:1089
 msgid "No recipients specified"
 msgstr ""
 
-#: camel/camel-pgp-context.c:1261
+#: camel/camel-pgp-context.c:1280
 msgid "No ciphertext to decrypt."
 msgstr ""
 
@@ -3512,39 +4212,39 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: нема╓ ╕н╕ц╕ал╕зац╕╖ в модул╕."
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
 #, fuzzy
 msgid "Connection cancelled"
 msgstr "В╕дм╕нено"
 
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
 msgid "(unknown host)"
 msgstr "(нев╕домий хост)"
 
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
+#: camel/camel-remote-store.c:484
+#: camel/providers/imap/camel-imap-command.c:382
 #, fuzzy
 msgid "Operation cancelled"
 msgstr "В╕дкрити календар"
 
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:489
 #, fuzzy
 msgid "Server unexpectedly disconnected"
 msgstr "Сервер в╕дкинув ╕м'я користувача"
@@ -3643,7 +4343,7 @@ msgid ""
 msgstr "Не вдалося створити канал: %s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:421
+#: camel/providers/imap/camel-imap-store.c:440
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
@@ -3701,20 +4401,20 @@ msgstr ""
 msgid "Host lookup failed: %s: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:295 camel/camel-session.c:364
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:462
+#: camel/camel-session.c:481
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3723,27 +4423,53 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
-#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
+#: camel/camel-smime-context.c:173
+#, fuzzy, c-format
+msgid "Please enter your password for %s"
+msgstr "Введ╕ть пароль NNTP для %s@%s"
+
+#: camel/camel-smime-context.c:203
+msgid "Please indicate the nickname of a certificate to sign with."
+msgstr ""
+
+#: camel/camel-smime-context.c:209
+#, fuzzy, c-format
+msgid "The signature certificate for \"%s\" does not exist."
+msgstr "Цього файлу не ╕сну╓."
+
+#: camel/camel-smime-context.c:249
+#, fuzzy, c-format
+msgid "The encryption certificate for \"%s\" does not exist."
+msgstr "Цього файлу не ╕сну╓."
+
+#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
+#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#, fuzzy, c-format
+msgid "Failed to find certificate for \"%s\"."
+msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
+
+#: camel/camel-smime-context.c:545
+msgid "Failed to find a common bulk algorithm."
+msgstr ""
+
+#: camel/camel-smime-context.c:799
 #, fuzzy
-msgid "Trash"
-msgstr "Завдання"
+msgid "Failed to decode message."
+msgstr "Переслане пов╕домлення %s"
 
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-smime-context.c:844
+msgid "Failed to verify certificates."
+msgstr ""
+
+#: camel/camel-tcp-stream-openssl.c:415
 #, c-format
 msgid ""
-"EMail: %s\n"
-"Common Name: %s\n"
-"Organization Unit: %s\n"
-"Organization: %s\n"
-"Locality: %s\n"
-"State: %s\n"
-"Country: %s"
+"Issuer: %s\n"
+"Subject: %s"
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:420 camel/camel-tcp-stream-ssl.c:364
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -3753,6 +4479,18 @@ msgid ""
 "Do you wish to accept anyway?"
 msgstr ""
 
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+
 #: camel/camel-url.c:289
 #, fuzzy, c-format
 msgid "Could not parse URL `%s'"
@@ -3760,12 +4498,12 @@ msgstr ""
 "Не вдалося в╕дкрити файл \"%s\":\n"
 "%s"
 
-#: camel/camel-vee-folder.c:451
+#: camel/camel-vee-folder.c:452
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Переслати це пов╕домлення"
 
-#: camel/camel-vee-folder.c:546
+#: camel/camel-vee-folder.c:547
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Переслати це пов╕домлення"
@@ -3777,60 +4515,75 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-message-cache.c:130
-#, fuzzy, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Не вдалося створити каталог %s: %s"
-
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/providers/imap/camel-imap-command.c:325
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:335
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
-msgid "Unknown error"
-msgstr "Нев╕дома помилка"
-
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:390
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:582
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:618
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь OK в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:170
+#: camel/providers/imap/camel-imap-folder.c:192
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:211
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:275
+msgid "Folder was destroyed and recreated on server."
+msgstr ""
+
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap/camel-imap-folder.c:437
 #, fuzzy
-msgid "Scanning IMAP folder"
-msgstr "Сканування тек в \"%s\""
+msgid "Scanning for changed messages"
+msgstr "Збереження пов╕домлень"
 
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1499
+#: camel/providers/imap/camel-imap-folder.c:1915
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1641
+#: camel/providers/imap/camel-imap-folder.c:1722
+msgid "Fetching summary information for new messages"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:1647
+#, fuzzy
+msgid "Scanning for new messages"
+msgstr "Збереження пов╕домлень"
+
+#: camel/providers/imap/camel-imap-folder.c:1948
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+#: camel/providers/imap/camel-imap-message-cache.c:155
+#, fuzzy, c-format
+msgid "Could not open cache directory: %s"
+msgstr "Не вдалося створити каталог %s: %s"
+
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:17
 msgid "Checking for new mail"
 msgstr ""
 
@@ -3839,7 +4592,7 @@ msgstr ""
 msgid "Check for new messages in all folders"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:645
 msgid "Folders"
 msgstr "Теки"
 
@@ -3873,28 +4626,28 @@ msgstr "Для зчитування та збереження плшти на серверах IMAP."
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:444
+#: camel/providers/imap/camel-imap-store.c:463
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:454
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/smtp/camel-smtp-transport.c:368
 #, fuzzy, c-format
 msgid "No support for authentication type %s"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:497
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:494
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/smtp/camel-smtp-transport.c:412
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:522
+#: camel/providers/imap/camel-imap-store.c:538
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3902,103 +4655,107 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:869
+#: camel/providers/imap/camel-imap-store.c:827 mail/mail-local.c:326
 #, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "Показати вибрану теки"
-
-#: camel/providers/imap/camel-imap-store.c:883
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "Не вдалося створити каталог %s: %s"
+msgid "No such folder %s"
+msgstr "Нев╕рна тека \"%s\"."
 
-#: camel/providers/imap/camel-imap-store.c:1386
-msgid "You must be working online to complete this operation"
+#: camel/providers/imap/camel-imap-store.c:1035
+msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:39
+#: camel/providers/local/camel-local-provider.c:40
 #, fuzzy
 msgid "MH-format mail directories"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-local-provider.c:40
+#: camel/providers/local/camel-local-provider.c:41
 msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:49
+#: camel/providers/local/camel-local-provider.c:50
 msgid "Standard Unix mailbox file"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:50
+#: camel/providers/local/camel-local-provider.c:51
 msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
 msgid "Qmail maildir-format mail files"
 msgstr ""
 
-#: camel/providers/local/camel-local-provider.c:60
+#: camel/providers/local/camel-local-provider.c:61
 msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-provider.c:70
+msgid "Unix mbox spool-format mail files"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:71
+msgid "For storing local mail in standard Unix spool directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:127
+#: camel/providers/local/camel-spool-store.c:111
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "\"%s\" не ╓ звичайним файлом."
 
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локально╖ пошти %s"
 
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
 #, fuzzy, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
 #, fuzzy, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
 #, fuzzy, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-local-summary.c:404
+#: camel/providers/local/camel-local-summary.c:417
+#: camel/providers/local/camel-spool-summary.c:1153
 msgid "Unable to add message to summary: unknown reason"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:150
-#: camel/providers/local/camel-maildir-folder.c:158
-#: camel/providers/local/camel-maildir-folder.c:169
+#: camel/providers/local/camel-maildir-folder.c:176
 #, fuzzy, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-maildir-folder.c:209
-#: camel/providers/local/camel-maildir-folder.c:217
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/local/camel-mh-folder.c:194
-#: camel/providers/local/camel-mh-folder.c:202
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-mh-folder.c:204
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-spool-folder.c:532
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -4007,19 +4764,20 @@ msgstr ""
 "Неможливо отримати пов╕домлення: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:197
-#: camel/providers/local/camel-mbox-folder.c:319
-#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:322
+#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-spool-folder.c:532
 #, fuzzy
 msgid "No such message"
 msgstr "Переслати це пов╕домлення"
 
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-mh-folder.c:203
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-mh-folder.c:213
 msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-maildir-store.c:103
 #: camel/providers/local/camel-mh-store.c:90
 #, c-format
 msgid ""
@@ -4029,14 +4787,14 @@ msgstr ""
 "Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-maildir-store.c:107
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:97
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не ╕сну╓."
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:114
 #: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid ""
@@ -4046,22 +4804,29 @@ msgstr ""
 "Не вдалося створити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:122
+#: camel/providers/local/camel-maildir-store.c:129
 #, c-format
 msgid "`%s' is not a maildir directory."
 msgstr "\"%s\" не ╓ каталогом Maildir."
 
-#: camel/providers/local/camel-maildir-store.c:151
-#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-maildir-store.c:165
+#: camel/providers/local/camel-maildir-store.c:202
 #: camel/providers/local/camel-mh-store.c:127
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не вдалося стерти теку \"%s\": %s"
 
-#: camel/providers/local/camel-maildir-store.c:152
+#: camel/providers/local/camel-maildir-store.c:166
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
+#: camel/providers/local/camel-maildir-store.c:276
+#, fuzzy, c-format
+msgid "Could not scan folder `%s': %s"
+msgstr ""
+"Не вдалося створити теку \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-maildir-summary.c:405
 #: camel/providers/local/camel-maildir-summary.c:526
 #, fuzzy, c-format
@@ -4069,11 +4834,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
+#: camel/providers/local/camel-spool-folder.c:268
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:203
+#: camel/providers/local/camel-spool-folder.c:409
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
@@ -4083,9 +4850,12 @@ msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:335
-#: camel/providers/local/camel-mbox-folder.c:367
-#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:338
+#: camel/providers/local/camel-mbox-folder.c:370
+#: camel/providers/local/camel-mbox-folder.c:383
+#: camel/providers/local/camel-spool-folder.c:548
+#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:593
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -4094,11 +4864,13 @@ msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:371
+#: camel/providers/local/camel-spool-folder.c:581
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно з╕псована."
 
-#: camel/providers/local/camel-mbox-folder.c:381
+#: camel/providers/local/camel-mbox-folder.c:384
+#: camel/providers/local/camel-spool-folder.c:594
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -4144,11 +4916,13 @@ msgstr "Тека \"%s\" не порожня. Не стерто."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
+#: camel/providers/local/camel-spool-summary.c:379
 #, fuzzy
 msgid "Summarising folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
@@ -4156,23 +4930,29 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:296
+#: camel/providers/local/camel-spool-summary.c:426
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
 #: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:931 mail/mail-ops.c:1516
 #, fuzzy
 msgid "Synchronising folder"
 msgstr "Синхрон╕зац╕я \"%s\""
 
 #: camel/providers/local/camel-mbox-summary.c:507
 #: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
+#: camel/providers/local/camel-spool-summary.c:936
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
@@ -4180,6 +4960,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-summary.c:524
+#: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не вдалося в╕дкрити тимчасову поштову скриньку: %s"
@@ -4188,21 +4969,28 @@ msgstr "Не вдалося в╕дкрити тимчасову поштову скриньку: %s"
 #: camel/providers/local/camel-mbox-summary.c:557
 #: camel/providers/local/camel-mbox-summary.c:746
 #: camel/providers/local/camel-mbox-summary.c:754
+#: camel/providers/local/camel-spool-summary.c:698
+#: camel/providers/local/camel-spool-summary.c:706
+#: camel/providers/local/camel-spool-summary.c:974
+#: camel/providers/local/camel-spool-summary.c:982
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
 #: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Помилка запису в тимчасову пошту скриньку: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:617
+#: camel/providers/local/camel-spool-summary.c:767
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Зб╕й запису в тимчасову поштову скриньку: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:635
 #: camel/providers/local/camel-mbox-summary.c:804
+#: camel/providers/local/camel-spool-summary.c:1032
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
@@ -4217,13 +5005,14 @@ msgstr "Не вдалося закрити тимчасову теку: %s"
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:879
+#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-spool-summary.c:545
+#: camel/providers/local/camel-spool-summary.c:1106
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/local/camel-mh-folder.c:149
-#: camel/providers/local/camel-mh-folder.c:157
+#: camel/providers/local/camel-mh-folder.c:172
 #, fuzzy, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
@@ -4238,39 +5027,92 @@ msgstr "\"%s\" не ╓ каталогом."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
+#: camel/providers/local/camel-spool-folder.c:465
+#, fuzzy, c-format
+msgid "Cannot append message to spool file: %s: %s"
+msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
+
+#: camel/providers/local/camel-spool-store.c:132
+#, fuzzy, c-format
+msgid "Spool `%s' does not exist or is not a regular file"
+msgstr "\"%s\" не ╓ звичайним файлом."
+
+#: camel/providers/local/camel-spool-store.c:159
+#, fuzzy, c-format
+msgid "Folder `%s/%s' does not exist."
+msgstr "Теки \"%s\" не ╕сну╓."
+
+#: camel/providers/local/camel-spool-store.c:176
+msgid "Spool stores do not have an inbox"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:186
+#, fuzzy, c-format
+msgid "Spool mail file %s"
+msgstr "Файл локально╖ пошти %s"
+
+#: camel/providers/local/camel-spool-store.c:222
+msgid "Spool folders cannot be renamed"
+msgstr ""
+
+#: camel/providers/local/camel-spool-store.c:230
+msgid "Spool folders cannot be deleted"
+msgstr ""
+
+#: camel/providers/local/camel-spool-summary.c:784
+#: camel/providers/local/camel-spool-summary.c:793
+#: camel/providers/local/camel-spool-summary.c:802
+#, fuzzy, c-format
+msgid "Could not sync temporary folder %s: %s"
+msgstr "Не вдалось в╕дкрити тимчасовий файл пошти %s: %s"
+
+#: camel/providers/local/camel-spool-summary.c:817
+#, fuzzy, c-format
+msgid "Could not sync spool folder %s: %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-spool-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:865
+#: camel/providers/local/camel-spool-summary.c:877
+#, c-format
+msgid ""
+"Could not sync spool folder %s: %s\n"
+"Folder may be corrupt, copy saved in `%s'"
+msgstr ""
+
 #: camel/providers/nntp/camel-nntp-auth.c:45
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:66
+#: camel/providers/nntp/camel-nntp-auth.c:65
 msgid "Server rejected username"
 msgstr "Сервер в╕дкинув ╕м'я користувача"
 
-#: camel/providers/nntp/camel-nntp-auth.c:72
+#: camel/providers/nntp/camel-nntp-auth.c:71
 msgid "Failed to send username to server"
 msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
 
-#: camel/providers/nntp/camel-nntp-auth.c:81
+#: camel/providers/nntp/camel-nntp-auth.c:80
 msgid "Server rejected username/password"
 msgstr "Сервер в╕дкинув ╕м'я користувача ╕ пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:115
+#: camel/providers/nntp/camel-nntp-folder.c:116
 #, c-format
 msgid "Message %s not found."
 msgstr "Пов╕домлення %s не знайдено."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:46
 msgid "Could not get group list from server."
 msgstr "Не вдалося отримати сп╕сок груп з сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:94
-#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#: camel/providers/nntp/camel-nntp-grouplist.c:99
+#: camel/providers/nntp/camel-nntp-grouplist.c:108
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не вдалося завантажити список груп для %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#: camel/providers/nntp/camel-nntp-grouplist.c:159
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
@@ -4283,24 +5125,24 @@ msgstr "Новини USENET"
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/nntp/camel-nntp-store.c:231
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr "Не вдалося в╕дкрити каталог сервера новин: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:286
+#: camel/providers/nntp/camel-nntp-store.c:297
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/nntp/camel-nntp-store.c:304
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:325
-#: camel/providers/nntp/camel-nntp-store.c:488
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:496
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
@@ -4354,7 +5196,7 @@ msgstr "Не видаляти пов╕домлення з сервера"
 msgid "Delete after %s day(s)"
 msgstr "Стерти завдання"
 
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:67
 msgid "POP"
 msgstr "POP"
 
@@ -4382,59 +5224,59 @@ msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
 #, fuzzy, c-format
 msgid "Could not connect to server: %s"
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нев╕рна тека \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:89
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -4487,7 +5329,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достачання пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:82
 msgid "SMTP"
 msgstr ""
 
@@ -4495,127 +5337,127 @@ msgstr ""
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:180
 #, fuzzy
 msgid "Help message"
 msgstr "Надрукувати пов╕домлення"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:182
 #, fuzzy
 msgid "Service ready"
 msgstr "Прибрати"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:212
 #, fuzzy
 msgid "A password transition is needed"
 msgstr "Не вказано паролю."
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:218
 #, fuzzy
 msgid "Temporary authentication failure"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:220
 #, fuzzy
 msgid "Authentication required"
 msgstr "╤дентиф╕кац╕я не вимага╓ться"
 
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:397
 #, fuzzy, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "Введ╕ть пароль NNTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4623,312 +5465,237 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:536
 #, c-format
 msgid "SMTP server %s"
 msgstr "Сервер SMTP %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:538
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Достачання пошти SMTP через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:563
 msgid "Cannot send message: sender address not defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не визначена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:570
 msgid "Cannot send message: sender address not valid."
 msgstr "Неможливо в╕д╕слати пов╕домлення: адреса в╕дправника не в╕рна."
 
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:575 mail/mail-ops.c:582
+#, fuzzy
+msgid "Sending message"
+msgstr "Стерти це пов╕домлення негайно"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
 msgid "Cannot send message: no recipients defined."
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:666
+msgid "SMTP Greeting"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:688
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:708
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Помилка в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:736
 #: camel/providers/smtp/camel-smtp-transport.c:748
+#, fuzzy
+msgid "SMTP Authentication"
+msgstr "Автенф╕кац╕я"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#: camel/providers/smtp/camel-smtp-transport.c:773
 #, fuzzy, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:782
+#, fuzzy
+msgid "AUTH request failed."
+msgstr "Перевищено час оч╕кування в╕дпов╕д╕ на HELO: %s: не фатально"
+
+#: camel/providers/smtp/camel-smtp-transport.c:829
 #, fuzzy
 msgid "Bad authentication response from server.\n"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:857
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:876
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:901
 #, fuzzy, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:920
 #, fuzzy, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Створити новий календар"
 
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:970
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:987
+#: camel/providers/smtp/camel-smtp-transport.c:1005
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:1024
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1048
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1067
 #, fuzzy, c-format
 msgid "RSET response error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1090
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1109
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:97
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт╕в"
 
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:132
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:421
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Долучити файл"
-
-#: composer/e-msg-composer-attachment-bar.c:469
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:500
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:501
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
-#, fuzzy
-msgid "Attachment"
-msgstr "долучення"
-
-#: composer/e-msg-composer-attachment.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Властивост╕ долучення"
 
-#: composer/e-msg-composer-attachment.glade.h:4
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-attachment.glade.h:5
-#, fuzzy
-msgid "Inline attachment"
-msgstr "долучення"
-
-#: composer/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: composer/e-msg-composer-attachment.glade.h:7
-#, fuzzy
-msgid "Send as:"
-msgstr "В╕д╕слати \"%s\""
-
-#: composer/e-msg-composer.c:529
-#, c-format
-msgid ""
-"Could not open signature file %s:\n"
-"%s"
-msgstr ""
-"Не вдалося в╕дкрити файл п╕дпису %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:699
-msgid "Save as..."
-msgstr "Зберегти як..."
-
-#: composer/e-msg-composer.c:710
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Помилка збереження файлу: %s"
-
-#: composer/e-msg-composer.c:730
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Помилка завантаження файлу: %s"
-
-#: composer/e-msg-composer.c:802
-msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
-msgstr ""
-
-#: composer/e-msg-composer.c:860 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:206
-msgid "Evolution"
-msgstr "Evolution"
-
-#: composer/e-msg-composer.c:866
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: composer/e-msg-composer.c:891
-msgid "Open file"
-msgstr "В╕дкрити файл"
-
-#: composer/e-msg-composer.c:1017
-msgid "That file does not exist."
-msgstr "Цього файлу не ╕сну╓."
-
-#: composer/e-msg-composer.c:1027
-msgid "That is not a regular file."
-msgstr "Це не звичайний файл."
-
-#: composer/e-msg-composer.c:1037
-msgid "That file exists but is not readable."
-msgstr ""
-
-#: composer/e-msg-composer.c:1047
-msgid "That file appeared accesible but open(2) failed."
-msgstr ""
-
-#: composer/e-msg-composer.c:1069
-msgid ""
-"The file is very large (more than 100K).\n"
-"Are you sure you wish to insert it?"
+#: composer/e-msg-composer-attachment.glade.h:5
+#: composer/e-msg-composer-select-file.c:135
+msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer.c:1090
-msgid "An error occurred while reading the file."
-msgstr "Сталася помилка п╕д час зчитування файлу."
-
-#: composer/e-msg-composer.c:1391 composer/e-msg-composer.c:1734
-msgid "Compose a message"
-msgstr "П╕дготувати пов╕домлення"
-
-#: composer/e-msg-composer.c:1825
-msgid "Could not create composer window."
-msgstr "Не вдалось створити в╕кно конструктора."
-
-#: composer/e-msg-composer-hdrs.c:323
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+#: composer/e-msg-composer-hdrs.c:359
 msgid "From:"
 msgstr "В╕д:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+#: composer/e-msg-composer-hdrs.c:365
 msgid "Reply-To:"
 msgstr "В╕дпов╕дати на:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+#: composer/e-msg-composer-hdrs.c:376
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+#: composer/e-msg-composer-hdrs.c:390
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:386
+#: composer/e-msg-composer-hdrs.c:391
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:395
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:398
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:399
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -4936,349 +5703,285 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/evolution-composer.c:355
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-
-#: composer/evolution-composer.c:370
-#, fuzzy
-msgid "Cannot initialize Evolution's composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: data/evolution.desktop.in.h:2
-#, fuzzy
-msgid "The Evolution groupware suite"
-msgstr "Evolution - %s"
-
-#: data/evolution.keys.in.h:1
-#, fuzzy
-msgid "address card"
-msgstr "Адреса"
-
-#: data/evolution.keys.in.h:2
-#, fuzzy
-msgid "calendar information"
-msgstr "Нема╓ ╕нформац╕╖"
-
-#. strptime format for a date.
-#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
-#. strptime format for a time of day, in 12-hour format.
-#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
-msgid "%I:%M:%S %p%n"
-msgstr "%I:%M:%S %p%n"
-
-#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
-msgid "%H:%M:%S%n"
-msgstr "%H:%M:%S%n"
-
-#. strptime format for time of day, without seconds, 12-hour format.
-#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
-msgid "%I:%M %p%n"
-msgstr "%I:%M %p%n"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
-msgid "%H:%M%n"
-msgstr "%H:%M%n"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:269
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr ""
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:274
-#, fuzzy
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%d/%m/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:283
-#, fuzzy
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
-#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:315
-#, fuzzy
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S%n"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
-#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:323
-#, fuzzy
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p%n"
-
-#: executive-summary/component/component-factory.c:152
-#, fuzzy
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+#: composer/e-msg-composer-select-file.c:228
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Долучити файл"
 
-#: executive-summary/component/e-summary.c:924
+#: composer/e-msg-composer.c:670
 #, fuzzy, c-format
 msgid ""
-"Cannot open the HTML file:\n"
+"Could not open file %s:\n"
 "%s"
 msgstr ""
-"Неможливо в╕дкрити файл %s:\n"
+"Не вдалося в╕дкрити файл \"%s\":\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:938
+#: composer/e-msg-composer.c:683
 #, fuzzy, c-format
 msgid ""
-"Error reading data:\n"
+"Error while reading file %s:\n"
 "%s"
-msgstr "Помилка зчитування файлу пошти: %s"
+msgstr "Помилка завантаження файлу: %s"
 
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
+#: composer/e-msg-composer.c:873
+msgid "Save as..."
+msgstr "Зберегти як..."
 
-#: executive-summary/component/e-summary-callbacks.c:290
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
+#: composer/e-msg-composer.c:882
+#, fuzzy
+msgid "Warning!"
+msgstr "Попередження"
 
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
+#: composer/e-msg-composer.c:884
+msgid "File exists, overwrite?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:70
+#: composer/e-msg-composer.c:906
 #, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr ""
-
-#: executive-summary/component/e-summary-url.c:71
-#, fuzzy, c-format
-msgid "Send an email to %s"
-msgstr "Отримання пошти з %s"
+msgid "Error saving file: %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:72
+#: composer/e-msg-composer.c:926
 #, c-format
-msgid "Change the view to %s"
-msgstr ""
+msgid "Error loading file: %s"
+msgstr "Помилка завантаження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
+#: composer/e-msg-composer.c:997
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:75
-#, fuzzy, c-format
-msgid "Close %s"
-msgstr "Закрити"
-
-#: executive-summary/component/e-summary-url.c:76
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
-msgid "Move %s to the left"
-msgstr "Перенести в теку"
+msgid "Error accessing file: %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
+#: composer/e-msg-composer.c:1055
+msgid "Unable to retrieve message from editor"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:78
+#: composer/e-msg-composer.c:1061
 #, fuzzy, c-format
-msgid "Move %s into the previous row"
-msgstr "Перейти до попереднього елементу"
+msgid ""
+"Unable to seek on file: %s\n"
+"%s"
+msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: executive-summary/component/e-summary-url.c:79
+#: composer/e-msg-composer.c:1067
 #, fuzzy, c-format
-msgid "Move %s into the next row"
-msgstr "Перейти до наступного елементу"
+msgid ""
+"Unable to truncate file: %s\n"
+"%s"
+msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: executive-summary/component/e-summary-url.c:80
+#: composer/e-msg-composer.c:1076
 #, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Конф╕╜урувати теку"
+msgid ""
+"Error autosaving message: %s\n"
+" %s"
+msgstr "Помилка збереження файлу: %s"
 
-#: executive-summary/component/executive-summary-config.glade.h:1
-msgid "Appearance"
+#: composer/e-msg-composer.c:1173
+msgid ""
+"Evolution has found unsaved files from a previous session.\n"
+"Would you like to attempt recovery?"
 msgstr ""
 
-#: executive-summary/component/executive-summary-config.glade.h:2
-msgid "Background:"
+#: composer/e-msg-composer.c:1321
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
 msgstr ""
 
-#: executive-summary/component/main.c:62
+#: composer/e-msg-composer.c:1328 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:215
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:1351
+msgid "Open file"
+msgstr "В╕дкрити файл"
+
+#: composer/e-msg-composer.c:1500
+#, fuzzy
+msgid "Insert File"
+msgstr "Вставити текстовий файл..."
+
+#: composer/e-msg-composer.c:1861 composer/e-msg-composer.c:2257
+msgid "Compose a message"
+msgstr "П╕дготувати пов╕домлення"
+
+#: composer/e-msg-composer.c:2351
+msgid "Could not create composer window."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: composer/evolution-composer.c:359
 msgid ""
-"Executive summary component could not initialize Bonobo.\n"
-"If there was a warning message about the RootPOA, it probably means\n"
-"you compiled Bonobo against GOAD instead of OAF."
+"Could not create composer window, because you have not yet\n"
+"configured any identities in the mail component."
 msgstr ""
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr ""
+#: composer/evolution-composer.c:374
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#: data/evolution.desktop.in.h:2
 #, fuzzy
-msgid "Factory for the Evolution executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "The Evolution groupware suite"
+msgstr "Evolution - %s"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
-msgid "Factory for the RDF summary."
-msgstr ""
+#: data/evolution.keys.in.h:1
+#, fuzzy
+msgid "address card"
+msgstr "Адреса"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+#: data/evolution.keys.in.h:2
 #, fuzzy
-msgid "RDF Summary"
-msgstr "Нед╕ля"
+msgid "calendar information"
+msgstr "Нема╓ ╕нформац╕╖"
+
+#. strptime format for a date.
+#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
+#: e-util/e-time-utils.c:239
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1480
+msgid "%m/%d/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+#. strptime format for a time of day, in 12-hour format.
+#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:264
+#: e-util/e-time-utils.c:352
 #, fuzzy
-msgid "Factory for the test bonobo component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#. strptime format for a time of day, in 24-hour format.
+#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:267
+#: e-util/e-time-utils.c:344
 #, fuzzy
-msgid "Factory for the test component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S%n"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
-msgid "Test bonobo service"
-msgstr ""
+#. strptime format for time of day, without seconds, 12-hour format.
+#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:271
+#: e-util/e-time-utils.c:349 widgets/misc/e-dateedit.c:1288
+#: widgets/misc/e-dateedit.c:1515
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
 
-#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
-msgid "Test service"
-msgstr ""
+#. strptime format for time of day, without seconds 24-hour format.
+#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:274
+#: e-util/e-time-utils.c:341 widgets/misc/e-dateedit.c:1285
+#: widgets/misc/e-dateedit.c:1512
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-#: widgets/misc/e-messagebox.c:166
+#: e-util/e-time-utils.c:240
 #, fuzzy
-msgid "Error"
-msgstr "Без помилок"
+msgid "%d/%m/%Y"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:768
-msgid "Update automatically"
-msgstr ""
+#: e-util/e-time-utils.c:241
+#, fuzzy
+msgid "%Y/%m/%d"
+msgstr "%d/%m/%Y"
 
-#: executive-summary/test-service/rdf-summary.c:778
-msgid "Update now"
-msgstr ""
+#: e-util/e-time-utils.c:242
+#, fuzzy, c-format
+msgid "%x"
+msgstr "x"
 
-#: executive-summary/test-service/rdf-summary.c:788
-msgid "Update every "
+#. strftime format of a weekday and a date.
+#: e-util/e-time-utils.c:298
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+msgid "%a %m/%d/%Y"
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:796
-#: filter/filter-datespec.c:83
-msgid "minutes"
-msgstr ""
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:303
+#, fuzzy
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%d/%m/%Y"
 
-#: filter/filter-datespec.c:78
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:312
+#, fuzzy
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%I:%M %p"
+
+#: filter/filter-datespec.c:80
 msgid "year"
 msgstr "р╕к"
 
-#: filter/filter-datespec.c:78
+#: filter/filter-datespec.c:80
 #, fuzzy
 msgid "years"
 msgstr "Заголовок"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 msgid "month"
 msgstr "м╕сяць"
 
-#: filter/filter-datespec.c:79
+#: filter/filter-datespec.c:81
 #, fuzzy
 msgid "months"
 msgstr "Шрифти"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 msgid "week"
 msgstr "тиждень"
 
-#: filter/filter-datespec.c:80
+#: filter/filter-datespec.c:82
 #, fuzzy
 msgid "weeks"
 msgstr "Тиждень"
 
-#: filter/filter-datespec.c:81
-#, fuzzy
-msgid "days"
-msgstr "Т╕ло"
-
-#: filter/filter-datespec.c:82
+#: filter/filter-datespec.c:84
 msgid "hour"
 msgstr "година"
 
-#: filter/filter-datespec.c:82
-msgid "hours"
-msgstr ""
-
-#: filter/filter-datespec.c:83
+#: filter/filter-datespec.c:85
 msgid "minute"
 msgstr "хвилина"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 msgid "second"
 msgstr "секунда"
 
-#: filter/filter-datespec.c:84
+#: filter/filter-datespec.c:86
 #, fuzzy
 msgid "seconds"
 msgstr "В╕д╕слати"
 
-#: filter/filter-datespec.c:199
+#: filter/filter-datespec.c:194
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:201
+#: filter/filter-datespec.c:196
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:276
+#: filter/filter-datespec.c:271
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:299
+#: filter/filter-datespec.c:294
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:339
+#: filter/filter-datespec.c:334
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -5286,28 +5989,36 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:374
+#: filter/filter-datespec.c:369
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:375
+#: filter/filter-datespec.c:370
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:433
+#: filter/filter-datespec.c:428
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:550 filter/filter-datespec.c:710
+#: filter/filter-datespec.c:546 filter/filter-datespec.c:712
 msgid "now"
 msgstr "зараз"
 
-#: filter/filter-datespec.c:707
+#: filter/filter-datespec.c:575
+msgid " ago"
+msgstr ""
+
+#: filter/filter-datespec.c:621
+msgid "ago"
+msgstr ""
+
+#: filter/filter-datespec.c:709
 msgid "<click here to select a date>"
 msgstr "<клацн╕ть тут для вибору дати>"
 
@@ -5330,8 +6041,8 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:225 filter/vfolder-rule.c:285
-#: mail/mail-account-gui.c:682
+#: filter/filter-folder.c:225 filter/vfolder-rule.c:319
+#: mail/mail-account-gui.c:781
 msgid "Select Folder"
 msgstr "Виб╕р теки"
 
@@ -5343,6 +6054,66 @@ msgstr "Введ╕ть URI теки"
 msgid "<click here to select a folder>"
 msgstr "<клацн╕ть тут для вибору теки>"
 
+#: filter/filter-input.c:193
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Помилка у ре╜улярному вираз╕ \"%s\":\n"
+"%s"
+
+#: filter/filter-part.c:488
+msgid "Test"
+msgstr "Тест"
+
+#: filter/filter-rule.c:626
+msgid "Rule name: "
+msgstr "Назва правила: "
+
+#: filter/filter-rule.c:630
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:648
+msgid "If"
+msgstr "Якщо"
+
+#: filter/filter-rule.c:666
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:670
+msgid "if all criteria are met"
+msgstr "якщо вс╕ в╕дпов╕до╓ вс╕м критер╕ям"
+
+#: filter/filter-rule.c:675
+msgid "if any criteria are met"
+msgstr "якщо в╕дпов╕да╓ будь-якому критер╕ю"
+
+#: filter/filter-rule.c:686
+msgid "Add criterion"
+msgstr "Додати критер╕й"
+
+#: filter/filter-rule.c:771
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:771
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:8
+#: my-evolution/e-summary-preferences.c:1161
+#: my-evolution/e-summary-preferences.c:1209
+#: my-evolution/e-summary-preferences.c:1271
+msgid "Add"
+msgstr "Додати"
+
+#: filter/filter.glade.h:3 mail/mail-config.glade.h:34
+msgid "Edit"
+msgstr "Виправити"
+
 #: filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Редагування в╕льтр╕в"
@@ -5386,58 +6157,10 @@ msgstr ""
 msgid "with all local folders"
 msgstr "Створити нову теку"
 
-#: filter/filter-input.c:193
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Помилка у ре╜улярному вираз╕ \"%s\":\n"
-"%s"
-
-#: filter/filter-part.c:488
-msgid "Test"
-msgstr "Тест"
-
-#: filter/filter-rule.c:626
-msgid "Rule name: "
-msgstr "Назва правила: "
-
-#: filter/filter-rule.c:630
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:646
-msgid "If"
-msgstr "Якщо"
-
-#: filter/filter-rule.c:664
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:668
-msgid "if all criteria are met"
-msgstr "якщо вс╕ в╕дпов╕до╓ вс╕м критер╕ям"
-
-#: filter/filter-rule.c:673
-msgid "if any criteria are met"
-msgstr "якщо в╕дпов╕да╓ будь-якому критер╕ю"
-
-#: filter/filter-rule.c:684
-msgid "Add criterion"
-msgstr "Додати критер╕й"
-
-#: filter/filter-rule.c:770
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:770
-msgid "outgoing"
-msgstr ""
-
 #: filter/libfilter-i18n.h:3
-msgid "Assign Colour"
-msgstr ""
+#, fuzzy
+msgid "Assign Color"
+msgstr "Прив'язано"
 
 #: filter/libfilter-i18n.h:4
 msgid "Assign Score"
@@ -5515,95 +6238,96 @@ msgid "Expression"
 msgstr "Вираз"
 
 #: filter/libfilter-i18n.h:24
-msgid "Forward to Address"
-msgstr "Переслати на адресу"
-
-#: filter/libfilter-i18n.h:25
 msgid "Important"
 msgstr "Важливо"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:25
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:26
 msgid "is greater than"
 msgstr "б╕льше"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:27
 msgid "is less than"
 msgstr "менше"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:28
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:29
 #, fuzzy
 msgid "Mailing list"
 msgstr "Список розсилки %s"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:30
 msgid "Message Body"
 msgstr "Т╕ло пов╕домлення"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:31
 msgid "Message Header"
 msgstr "Заголовок пов╕домлення"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:32
 msgid "Message was received"
 msgstr "Пов╕домлення було отримано"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:33
 msgid "Message was sent"
 msgstr "Пов╕домлення було в╕д╕слано"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:34
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:35
 #, fuzzy
 msgid "on or after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:36
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:37
 msgid "Read"
 msgstr "Прочитано"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:38
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:39
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Replied to"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
+#: mail/message-list.etspec.h:5
 #, fuzzy
 msgid "Score"
 msgstr "Моб╕льний"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1091
 msgid "Sender"
 msgstr "В╕дправник"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "Set Status"
 msgstr "Стан:"
 
+#: filter/libfilter-i18n.h:44
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Розм╕р"
+
 #: filter/libfilter-i18n.h:45
 msgid "sounds like"
 msgstr "схоже на"
@@ -5625,7 +6349,8 @@ msgstr "почина╓ться на"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:875
+#: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Тема"
 
@@ -5657,201 +6382,280 @@ msgstr "Виправлення повного ╕мен╕"
 msgid "Score Rules"
 msgstr "Моб╕льний"
 
-#: mail/component-factory.c:329
+#: filter/vfolder-rule.c:198
+msgid "Oops.  You need to to specify at least one folder as a source."
+msgstr ""
+
+#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
+#: importers/netscape-importer.c:814 importers/pine-importer.c:627
+#: shell/e-shell-importer.c:651 shell/importer/import.glade.h:4
+#: shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "╤мпорт"
+
+#: importers/elm-importer.c:475 importers/netscape-importer.c:819
+#: importers/pine-importer.c:632 my-evolution/my-evolution.glade.h:11
+#, fuzzy
+msgid "Mail"
+msgstr "Е-пошта"
+
+#: importers/elm-importer.c:498
+msgid ""
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/elm-importer.c:527
+#, fuzzy
+msgid "Elm mail"
+msgstr "Е-пошта"
+
+#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#, fuzzy
+msgid "Addressbook"
+msgstr "Додати адресну книгу"
+
+#: importers/evolution-gnomecard-importer.c:253
+msgid ""
+"Evolution has found GnomeCard files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/netscape-importer.c:824
+#, fuzzy
+msgid "Settings"
+msgstr "Установки..."
+
+#: importers/netscape-importer.c:849
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:663
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+
+#: importers/pine-importer.c:691
+#, fuzzy
+msgid "Pine mail"
+msgstr "Первинна е-пошта"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#, fuzzy
+msgid "Evolution mail composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#, fuzzy
+msgid "Evolution mail executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+msgid "Evolution mail folder display component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#, fuzzy
+msgid "Evolution mail folder factory component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Factory for the Mail Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Mail configuration interface"
+msgstr "Конф╕╜урац╕я пошти"
+
+#: mail/component-factory.c:111
+msgid "This folder cannot contain messages."
+msgstr ""
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Properties..."
+msgstr "Властивост╕..."
+
+#: mail/component-factory.c:337
+#, fuzzy
+msgid "Change this folder's properties"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
+
+#: mail/component-factory.c:757
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:402
+#: mail/component-factory.c:894
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:253
+#: mail/folder-browser-ui.c:254
+#, fuzzy, c-format
+msgid "Properties for \"%s\""
+msgstr "Властивост╕"
+
+#: mail/folder-browser-ui.c:256
+msgid "Properties"
+msgstr "Властивост╕"
+
+#: mail/folder-browser.c:231 mail/mail-display.c:278
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Неможливо створити тимчасовий каталог: %s"
+
+#: mail/folder-browser.c:893
 #, fuzzy
 msgid "Store search as vFolder"
 msgstr "Виб╕р теки"
 
-#: mail/folder-browser.c:561 ui/evolution-mail.xml.h:91
+#: mail/folder-browser.c:1238
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "В╕ртуальна тека теми"
 
-#: mail/folder-browser.c:564 ui/evolution-mail.xml.h:89
+#: mail/folder-browser.c:1241
 msgid "VFolder on Se_nder"
 msgstr "В╕ртуальна тека в╕дправника"
 
-#: mail/folder-browser.c:567 ui/evolution-mail.xml.h:90
+#: mail/folder-browser.c:1244
 msgid "VFolder on _Recipients"
 msgstr "В╕ртуальна тека отримувач╕в"
 
-#: mail/folder-browser.c:570 ui/evolution-mail.xml.h:88
+#: mail/folder-browser.c:1247
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:576
+#: mail/folder-browser.c:1253
 msgid "Filter on Sub_ject"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:579
+#: mail/folder-browser.c:1256
 msgid "Filter on Sen_der"
 msgstr "Ф╕льтр в╕дправника"
 
-#: mail/folder-browser.c:582
+#: mail/folder-browser.c:1259
 msgid "Filter on Re_cipients"
 msgstr "Ф╕льтр отримувач╕в"
 
-#: mail/folder-browser.c:585
+#: mail/folder-browser.c:1262
 msgid "Filter on _Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:594
-msgid "_Open"
-msgstr "В╕дкрити"
-
-#: mail/folder-browser.c:596
+#: mail/folder-browser.c:1273
 msgid "Resend"
 msgstr ""
 
-#: mail/folder-browser.c:598 ui/evolution-calendar.xml.h:43
-#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+#: mail/folder-browser.c:1275 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-tasks.xml.h:18
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: mail/folder-browser.c:600 ui/evolution-event-editor.xml.h:69
-#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+#: mail/folder-browser.c:1277 ui/evolution-tasks.xml.h:17
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:605
+#: mail/folder-browser.c:1282 ui/evolution-mail-message.xml.h:94
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "В╕дпов╕сти в╕дправнику"
 
-#: mail/folder-browser.c:607 ui/evolution-mail.xml.h:66
+#: mail/folder-browser.c:1284 ui/evolution-mail-message.xml.h:70
+#, fuzzy
+msgid "Reply to _List"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: mail/folder-browser.c:1286 ui/evolution-mail-message.xml.h:69
 msgid "Reply to _All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:102
+#: mail/folder-browser.c:1288
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:611
-#, fuzzy
-msgid "Forward _inline"
-msgstr "Переслати"
-
-#: mail/folder-browser.c:614 ui/evolution-mail.xml.h:40
+#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:616 ui/evolution-mail.xml.h:44
+#: mail/folder-browser.c:1293 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:621 ui/evolution-mail.xml.h:107
+#: mail/folder-browser.c:1295
+#, fuzzy
+msgid "Mark as _Important"
+msgstr "Важливо"
+
+#: mail/folder-browser.c:1297
+#, fuzzy
+msgid "Mark as Unim_portant"
+msgstr "Позначити непрочитаним"
+
+#: mail/folder-browser.c:1302
 msgid "_Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:623 ui/evolution-mail.xml.h:96
+#: mail/folder-browser.c:1304
 msgid "_Copy to Folder..."
 msgstr "Скоп╕ювати в теку..."
 
-#: mail/folder-browser.c:627 ui/evolution-mail.xml.h:118
+#: mail/folder-browser.c:1308 ui/evolution-mail-message.xml.h:96
 msgid "_Undelete"
 msgstr "В╕дновити"
 
-#. { _("Add Sender to Address Book"),  NULL,
-#. GTK_SIGNAL_FUNC (addrbook_sender),  NULL,  0 },
-#. { "",                               NULL,
-#. GTK_SIGNAL_FUNC (NULL),             NULL,  0 },
-#: mail/folder-browser.c:637 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:1313
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Додати адресну книгу"
+
+#: mail/folder-browser.c:1318
 msgid "Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: mail/folder-browser.c:641
+#: mail/folder-browser.c:1322
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:1479
 msgid "Filter on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:1480
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:1482
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:1483
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser-factory.c:213
-#, fuzzy, c-format
-msgid "Properties for \"%s\""
-msgstr "Властивост╕"
-
-#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "Властивост╕"
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
-msgid "Evolution component for handling mail."
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
-msgid "Evolution mail composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
-#, fuzzy
-msgid "Evolution mail executive summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
-#, fuzzy
-msgid "Evolution mail folder display component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
-#, fuzzy
-msgid "Evolution mail folder factory component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
-#, fuzzy
-msgid "Factory for the Evolution composer."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-#, fuzzy
-msgid "Factory for the Evolution mail component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
-#, fuzzy
-msgid "Factory for the Mail Summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
-
-#: mail/importers/elm-importer.c:420
-msgid ""
-"Evolution has found Elm mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/elm-importer.c:430
-#, fuzzy
-msgid "Elm mail"
-msgstr "Е-пошта"
-
 #: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
 #, fuzzy
 msgid "Factory to import mbox into Evolution"
@@ -5869,23 +6673,6 @@ msgstr ""
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:440
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:385
-msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
-msgstr ""
-
-#: mail/importers/pine-importer.c:395
-#, fuzzy
-msgid "Pine mail"
-msgstr "Первинна е-пошта"
-
 #: mail/local-config.glade.h:1
 #, fuzzy
 msgid "Current store format:"
@@ -5921,41 +6708,68 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:105
+#: mail/mail-account-editor-news.c:105 mail/mail-account-editor.c:107
 msgid "You have not filled in all of the required information."
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
+#: mail/mail-account-editor-news.c:160
+#, fuzzy
+msgid "Evolution News Editor"
+msgstr "╤нсталяц╕я Evolution"
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:156
 #, fuzzy
 msgid "Evolution Account Editor"
 msgstr "╤нсталяц╕я Evolution"
 
-#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
+#: mail/mail-account-gui.c:971
+#, fuzzy
+msgid "Save signature"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-account-gui.c:977
+msgid ""
+"This signature has been changed, but hasn't been saved.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: mail/mail-accounts.c:135
 #, fuzzy
 msgid " (default)"
 msgstr "Стерти"
 
-#: mail/mail-accounts.c:197
+#: mail/mail-accounts.c:174
 msgid "Disable"
 msgstr ""
 
-#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+#: mail/mail-accounts.c:176 mail/mail-config.glade.h:38
 msgid "Enable"
 msgstr ""
 
-#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
+#: mail/mail-accounts.c:264
 #, fuzzy
 msgid "Are you sure you want to delete this account?"
 msgstr "Ви впевнен╕, що хочете стерти завдання"
 
-#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
+#: mail/mail-accounts.c:268
+#, fuzzy
+msgid "Don't delete"
+msgstr "В╕дновити"
+
+#: mail/mail-accounts.c:271
+msgid "Really delete account?"
+msgstr ""
+
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 #, fuzzy
 msgid "Are you sure you want to delete this news account?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#. give our dialog an OK button and title
-#: mail/mail-accounts.c:536
+#. give our dialog an Close button and title
+#: mail/mail-accounts.c:742
 msgid "Evolution Account Manager"
 msgstr ""
 
@@ -6014,99 +6828,101 @@ msgid ""
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:273
+msgid ""
+"This message contains only Bcc recipients.\n"
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+
+#: mail/mail-callbacks.c:359
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:354
+#: mail/mail-callbacks.c:410
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:593
+#: mail/mail-callbacks.c:653
 #, c-format
 msgid "On %s, %s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:774
+#: mail/mail-callbacks.c:914
 msgid "Forwarded message:\n"
 msgstr "Переслане пов╕домлення:\n"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:1011
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:879
+#: mail/mail-callbacks.c:1013
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1156
+#: mail/mail-callbacks.c:1374
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1170
+#: mail/mail-callbacks.c:1396
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1202
+#: mail/mail-callbacks.c:1430
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1224
+#: mail/mail-callbacks.c:1442
+#, fuzzy, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: mail/mail-callbacks.c:1463
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Пов╕домлення було отримано"
 
-#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
-msgid "Overwrite file?"
-msgstr "Переписати файл?"
-
-#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
-"Переписати його?"
-
-#: mail/mail-callbacks.c:1298
+#: mail/mail-callbacks.c:1545
 msgid "Save Message As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1547
 msgid "Save Messages As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1435
+#: mail/mail-callbacks.c:1766
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
+#: mail/mail-callbacks.c:1776
+#, fuzzy
+msgid "Filters"
+msgstr "Ф╕льтри..."
+
+#: mail/mail-callbacks.c:1823
 msgid "Print Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1531
+#: mail/mail-callbacks.c:1871
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:1609
+#: mail/mail-callbacks.c:1966
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: mail/mail-config.c:1121 mail/mail-config.c:1124
-msgid "Connecting to server..."
-msgstr "З'╓днання з сервером..."
-
 #: mail/mail-config-druid.c:99
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -6138,10 +6954,14 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:445
+#: mail/mail-config-druid.c:466
 msgid "Evolution Account Wizard"
 msgstr ""
 
+#: mail/mail-config.c:1587 mail/mail-config.c:1590
+msgid "Connecting to server..."
+msgstr "З'╓днання з сервером..."
+
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Check for supported types "
@@ -6152,37 +6972,67 @@ msgid " color"
 msgstr " кол╕р"
 
 #: mail/mail-config.glade.h:3
+msgid "(SSL is not supported in this build of evolution)"
+msgstr ""
+
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "Account"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "Account Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "Accounts"
 msgstr "Електронна адреса м╕стить"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:9
+msgid "Always encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "Always encrypt to myself when sending encrypyed mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:11
+msgid "Always load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:12 mail/message-list.etspec.h:1
+#, fuzzy
+msgid "Attachment"
+msgstr "долучення"
+
+#: mail/mail-config.glade.h:13
 msgid "Authentication"
 msgstr "Автенф╕кац╕я"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:14
 msgid "Authentication Type: "
 msgstr "Тип автенф╕кац╕╖: "
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:15
 msgid "Automatically check for new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:16
+msgid "Certificate ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:18
+#, fuzzy
+msgid "Composer"
+msgstr "П╕дготувати"
+
+#: mail/mail-config.glade.h:19
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -6192,362 +7042,563 @@ msgid ""
 "Click \"Finish\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "De_fault"
 msgstr "Стерти"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:26
+msgid "Default Forward style is: "
+msgstr ""
+
+#: mail/mail-config.glade.h:27
+msgid "Default character set: "
+msgstr ""
+
+#: mail/mail-config.glade.h:29
+msgid "Digital IDs..."
+msgstr ""
+
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "Done"
 msgstr "Нема╓"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Чорновики"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "Drafts folder:"
 msgstr "Створення ново╖ теки"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
+#, fuzzy
+msgid "Edit..."
+msgstr "Виправити"
+
+#: mail/mail-config.glade.h:36
 msgid "Email Address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:37
+msgid "Empty trash folders on exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:39
+msgid "Enabled"
+msgstr ""
+
+#: mail/mail-config.glade.h:40
 msgid "Full Name:"
 msgstr "Повне ╕м'я:"
 
-#: mail/mail-config.glade.h:27
-msgid "Highlight citations with "
+#: mail/mail-config.glade.h:41
+msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:42
+#, fuzzy
+msgid "HTML Signature:"
+msgstr "Файл п╕дпису:"
+
+#: mail/mail-config.glade.h:43
+msgid "Highlight citations with"
+msgstr ""
+
+#: mail/mail-config.glade.h:45
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:46
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:47
+msgid "In HTML mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:48
+#, fuzzy
+msgid "Inline"
+msgstr "Покажчик"
+
+#: mail/mail-config.glade.h:49
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:50
+msgid "Load images if sender is in addressbook"
+msgstr ""
+
+#: mail/mail-config.glade.h:51
 msgid "Mail Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Mailbox location"
+msgstr "Формат"
+
+#: mail/mail-config.glade.h:53
 msgid "Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:54
 #, fuzzy
-msgid "Mark messages as \"Read\" after:"
+msgid "Mark messages as Read after"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:55
+msgid "Message list should display in a threaded fashion by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:56
+msgid "Message preview should be displayed by default"
+msgstr ""
+
+#: mail/mail-config.glade.h:57
+#, fuzzy
+msgid "NNTP Server:"
+msgstr "Сервер LDAP"
+
+#: mail/mail-config.glade.h:59
+msgid "Never load images off the net"
+msgstr ""
+
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "News"
 msgstr "Новий"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:62
 #, fuzzy
 msgid "Optional Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:63
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:65
+msgid "PGP Key ID:"
+msgstr ""
+
+#: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "PGP binary path:"
 msgstr "Шифрування PGP"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:70
+msgid "Pick a color"
+msgstr "Виб╕р кольору"
+
+#: mail/mail-config.glade.h:71
+msgid "Pretty Good Privacy"
+msgstr ""
+
+#: mail/mail-config.glade.h:72
+msgid "Prompt when sending messages with an empty subject"
+msgstr ""
+
+#: mail/mail-config.glade.h:73
+#, fuzzy
+msgid "Prompt when sending messages with only Bcc recipients defined"
+msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
+
+#: mail/mail-config.glade.h:74
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:75
+#, fuzzy
+msgid "Quoted"
+msgstr "Прим╕тки"
+
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "Receiving Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:77
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:78
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:79
+msgid "Remember PGP Passphrase until exit"
+msgstr ""
+
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Required Information"
 msgstr "Нема╓ ╕нформац╕╖"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:83
+msgid "Secure MIME"
+msgstr ""
+
+#: mail/mail-config.glade.h:84
+#, fuzzy
+msgid "Security"
+msgstr "Безпека"
+
+#: mail/mail-config.glade.h:85
 msgid "Select PGP binary"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:86
 #, fuzzy
 msgid "Send mail in HTML format by default."
 msgstr "В╕д╕слати пошту в формат╕ HTML"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "Sending Email"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sendmail"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:90 mail/message-list.etspec.h:6
 msgid "Sent"
 msgstr "В╕д╕слано"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:91
 #, fuzzy
 msgid "Sent and Draft Messages"
 msgstr "В╕д╕слати пов╕домлення негайно"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Sent messages folder:"
 msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:93
 #, fuzzy
 msgid "Server Configuration"
 msgstr "Конф╕╜урац╕я пошти"
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:94
 #, fuzzy
 msgid "Server Type: "
 msgstr "Сервер:"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:95
 msgid "Server requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:96
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "Source"
+msgstr "Джерела"
+
+#: mail/mail-config.glade.h:98
+#, fuzzy
+msgid "Source Information"
+msgstr "Нема╓ ╕нформац╕╖"
+
+#: mail/mail-config.glade.h:99
 msgid "Sources"
 msgstr "Джерела"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Special Folders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:101
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
-#, fuzzy
-msgid "Type"
-msgstr "Тип:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:103
 msgid "Use secure connection (SSL)"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:104
 msgid "Username:"
 msgstr "Назва користувача:"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:105
 msgid ""
 "Welcome to the Evolution Mail Configuration Druid.\n"
 "\n"
 "Click \"Next\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
-#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
-msgid "_Edit"
-msgstr "Редагування"
+#: mail/mail-config.glade.h:112
+msgid "newswindow1"
+msgstr ""
+
+#: mail/mail-config.glade.h:113
+msgid "placeholder"
+msgstr ""
+
+#: mail/mail-config.glade.h:114
+#, fuzzy
+msgid "seconds."
+msgstr "В╕д╕слати"
+
+#: mail/mail-crypto.c:60
+#, fuzzy
+msgid "Could not create a PGP signature context."
+msgstr "Створити новий календар"
+
+#: mail/mail-crypto.c:86
+#, fuzzy
+msgid "Could not create a PGP verification context."
+msgstr "Створити новий календар"
+
+#: mail/mail-crypto.c:116
+#, fuzzy
+msgid "Could not create a PGP encryption context."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: mail/mail-crypto.c:142
+#, fuzzy
+msgid "Could not create a PGP decryption context."
+msgstr ""
+"Не вдалося створити каталог %s:\n"
+"%s"
+
+#: mail/mail-crypto.c:177
+msgid "Could not create a S/MIME signature context."
+msgstr ""
+
+#: mail/mail-crypto.c:209
+msgid "Could not create a S/MIME certsonly context."
+msgstr ""
+
+#: mail/mail-crypto.c:240
+msgid "Could not create a S/MIME encryption context."
+msgstr ""
+
+#: mail/mail-crypto.c:271
+#, fuzzy
+msgid "Could not create a S/MIME envelope context."
+msgstr "Не вдалось створити в╕кно конструктора."
+
+#: mail/mail-crypto.c:301
+#, fuzzy
+msgid "Could not create a S/MIME decode context."
+msgstr "Не вдалось створити в╕кно конструктора."
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:221
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:234
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Неможливо створити тимчасовий каталог: %s"
-
-#: mail/mail-display.c:295
+#: mail/mail-display.c:338
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:297
-#, c-format
-msgid "Open in %s..."
-msgstr "В╕дкрити в %s..."
-
-#: mail/mail-display.c:299
+#: mail/mail-display.c:340
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:334
-msgid "External Viewer"
-msgstr ""
+#: mail/mail-display.c:342
+#, c-format
+msgid "Open in %s..."
+msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:399
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:403
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:424
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:1048
 #, fuzzy
-msgid "Open link in browser"
+msgid "Loading message content"
+msgstr "Пересилання пов╕домлень \"%s\""
+
+#: mail/mail-display.c:1404
+#, fuzzy
+msgid "Open Link in Browser"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: mail/mail-display.c:1109
+#: mail/mail-display.c:1406
+#, fuzzy
+msgid "Copy Link Location"
+msgstr "Контакт"
+
+#: mail/mail-display.c:1408
 #, fuzzy
-msgid "Save as (FIXME)"
+msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1111
+#: mail/mail-display.c:1410
 #, fuzzy
-msgid "Copy location (FIXME)"
-msgstr "Контакт"
+msgid "Save Image as..."
+msgstr "Зберегти як..."
 
-#: mail/mail-format.c:522
+#: mail/mail-folder-cache.c:170
+#, c-format
+msgid "%d new"
+msgstr ""
+
+#: mail/mail-folder-cache.c:176 mail/mail-folder-cache.c:183
+msgid ", "
+msgstr ""
+
+#: mail/mail-folder-cache.c:177
+#, c-format
+msgid "%d hidden"
+msgstr ""
+
+#: mail/mail-folder-cache.c:186
+#, fuzzy, c-format
+msgid "%d unsent"
+msgstr "В╕д╕слати"
+
+#: mail/mail-folder-cache.c:188
+#, c-format
+msgid "%d total"
+msgstr ""
+
+#: mail/mail-format.c:609
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "долучення"
 
-#: mail/mail-format.c:564
+#: mail/mail-format.c:662
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:771
+#: mail/mail-format.c:746
 #, fuzzy
-msgid "Loading message content"
-msgstr "Пересилання пов╕домлень \"%s\""
+msgid "Date"
+msgstr "п╕сля"
 
-#: mail/mail-format.c:1071
+#: mail/mail-format.c:842
+#, fuzzy
+msgid "Bad Address"
+msgstr "Електронна адреса:"
+
+#: mail/mail-format.c:864 mail/message-list.etspec.h:3
+msgid "From"
+msgstr "В╕д"
+
+#: mail/mail-format.c:867
+#, fuzzy
+msgid "Reply-To"
+msgstr "В╕дпов╕дати на:"
+
+#: mail/mail-format.c:870 mail/message-list.etspec.h:10
+msgid "To"
+msgstr "До"
+
+#: mail/mail-format.c:873
+#, fuzzy
+msgid "Cc"
+msgstr "Cc:"
+
+#: mail/mail-format.c:1291
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-format.c:1086
+#: mail/mail-format.c:1307
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1092
+#: mail/mail-format.c:1318
 msgid "Encrypted message"
 msgstr "Зашифроване пов╕домлення"
 
-#: mail/mail-format.c:1093
+#: mail/mail-format.c:1319
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1183 mail/mail-format.c:1571
+#: mail/mail-format.c:1377
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1191 mail/mail-format.c:1579
+#: mail/mail-format.c:1388
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1792
+#: mail/mail-format.c:2046
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1804
+#: mail/mail-format.c:2060
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1808
+#: mail/mail-format.c:2065
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:2094
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr ""
+
+#: mail/mail-format.c:2102
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1847
+#: mail/mail-format.c:2107
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:337
-#, fuzzy, c-format
-msgid "No such folder %s"
-msgstr "Нев╕рна тека \"%s\"."
-
-#: mail/mail-local.c:509
+#: mail/mail-local.c:458
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-local.c:787
+#: mail/mail-local.c:747
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:791
-#, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
-msgstr ""
-
-#: mail/mail-local.c:814
-#, fuzzy
-msgid "Reconfiguring folder"
-msgstr "Конф╕╜урувати теку"
-
-#. first, 'close' the old folder
-#: mail/mail-local.c:843
-msgid "Closing current folder"
-msgstr "Закривання поточно╖ теки"
-
-#: mail/mail-local.c:875
-msgid "Renaming old folder and opening"
-msgstr "Перейменування старо╖ теки та в╕дкривання"
-
-#: mail/mail-local.c:893
-msgid "Creating new folder"
-msgstr "Створення ново╖ теки"
-
-#: mail/mail-local.c:907
-msgid "Copying messages"
-msgstr "Коп╕ювання пов╕домлень"
-
-#: mail/mail-local.c:924
+#: mail/mail-local.c:868
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:963
+#: mail/mail-local.c:907
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-mt.c:190
+#: mail/mail-local.c:1000
+#, fuzzy
+msgid "You cannot change the format of a non-local folder."
+msgstr ""
+"Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: mail/mail-local.c:1011
+#, fuzzy, c-format
+msgid "Reconfigure %s"
+msgstr "Конф╕╜урувати теку"
+
+#: mail/mail-mt.c:187
 #, fuzzy, c-format
 msgid ""
 "Error while '%s':\n"
@@ -6556,382 +7607,342 @@ msgstr ""
 "Помилка п╕д час \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:193
+#: mail/mail-mt.c:190
 #, fuzzy, c-format
 msgid ""
 "Error while performing operation:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:794
 #, fuzzy
 msgid "Working"
 msgstr "Перенесення"
 
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr ""
-
-#: mail/mail-mt.c:874
-#, fuzzy
-msgid "Evolution progress"
-msgstr "Evolution"
-
-#: mail/mail-ops.c:599
+#: mail/mail-ops.c:578
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:603
-#, fuzzy
-msgid "Sending message"
-msgstr "Стерти це пов╕домлення негайно"
-
-#: mail/mail-ops.c:718
+#: mail/mail-ops.c:698
 #, fuzzy, c-format
 msgid "Sending message %d of %d"
 msgstr "Запис пов╕домлення %d з %d"
 
-#: mail/mail-ops.c:737
+#: mail/mail-ops.c:717
 #, fuzzy, c-format
 msgid "Failed on message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:739 mail/mail-send-recv.c:475
+#: mail/mail-ops.c:719 mail/mail-send-recv.c:492
 #, fuzzy
 msgid "Complete."
 msgstr "% завершення:"
 
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:805
 #, fuzzy
 msgid "Saving message to folder"
 msgstr "Збереження пов╕домлень з теки \"%s\""
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Moving messages to %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:884
 #, fuzzy, c-format
 msgid "Copying messages to %s"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:901
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:904
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1016
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1152
+#. Fill in the new fields
+#: mail/mail-ops.c:1056 mail/mail-ops.c:1057
+#, fuzzy
+msgid "Trash"
+msgstr "Завдання"
+
+#: mail/mail-ops.c:1189
 msgid "Forwarded messages"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1230 mail/mail-ops.c:1368
 #, c-format
 msgid "Opening folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1436
+#, fuzzy, c-format
+msgid "Removing folder %s"
+msgstr "В╕дкривання теки %s"
+
+#: mail/mail-ops.c:1568
+#, fuzzy
+msgid "Refreshing folder"
+msgstr "Конф╕╜урувати теку"
+
+#: mail/mail-ops.c:1604
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1653
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання пов╕домлення %s"
 
-#: mail/mail-ops.c:1563
-msgid "Retrieving messages"
+#: mail/mail-ops.c:1722
+#, fuzzy, c-format
+msgid "Retrieving %d message(s)"
 msgstr "Отримання пов╕домлення"
 
-#: mail/mail-ops.c:1573
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Отримання пов╕домлення %d з %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1647
-msgid "Saving messages"
+#: mail/mail-ops.c:1808
+#, fuzzy, c-format
+msgid "Saving %d messsage(s)"
 msgstr "Збереження пов╕домлень"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1887
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1739
-#, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1913
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1987
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:2003
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:2032
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дан╕: %s"
 
-#: mail/mail-search-dialogue.c:113
-msgid "_Search"
-msgstr "Пошук"
+#: mail/mail-ops.c:2101
+#, c-format
+msgid "Disconnecting from %s"
+msgstr ""
+
+#: mail/mail-search.c:138
+#, fuzzy
+msgid "(Untitled Message)"
+msgstr "(Ненайменований)"
+
+#: mail/mail-search.c:235
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Надрукувати пов╕домлення"
+
+#: mail/mail-search.c:239
+#, fuzzy
+msgid "Empty Message"
+msgstr "Виправити пов╕домлення"
 
-#: mail/mail-send-recv.c:138
+#: mail/mail-search.c:284
 #, fuzzy
-msgid "Cancelling ..."
+msgid "Find in Message"
+msgstr "Виправити пов╕домлення"
+
+#: mail/mail-search.c:314
+msgid "Case Sensitive"
+msgstr ""
+
+#: mail/mail-search.c:315
+#, fuzzy
+msgid "Search Forward"
+msgstr "Переслати"
+
+#: mail/mail-search.c:332
+#, fuzzy
+msgid "Find:"
+msgstr "Знайти"
+
+#: mail/mail-search.c:335
+#, fuzzy
+msgid "Matches:"
+msgstr "Шлях:"
+
+#: mail/mail-send-recv.c:141
+#, fuzzy
+msgid "Cancelling..."
 msgstr "В╕дм╕нити"
 
-#: mail/mail-send-recv.c:233
+#: mail/mail-send-recv.c:250
 #, fuzzy
 msgid "Send & Receive mail"
 msgstr "Sendmail"
 
-#: mail/mail-send-recv.c:236
+#: mail/mail-send-recv.c:253
 msgid "Receiving"
 msgstr "Отримання"
 
-#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+#: mail/mail-send-recv.c:302
+#, fuzzy
+msgid "Updating..."
 msgstr "Оновлення..."
 
-#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+#: mail/mail-send-recv.c:304 mail/mail-send-recv.c:350
+#, fuzzy
+msgid "Waiting..."
 msgstr "Оч╕кування..."
 
-#: mail/mail-send-recv.c:306
+#: mail/mail-send-recv.c:323
 msgid "Sending"
 msgstr "В╕дсилання"
 
-#: mail/mail-send-recv.c:471
+#: mail/mail-send-recv.c:488
 msgid "Cancelled."
 msgstr "В╕дм╕нено."
 
-#: mail/mail-summary.c:110
-msgid "Incomplete message written on pipe!"
+#: mail/mail-session.c:171
+msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-summary.c:468
-#, fuzzy
-msgid "Mail Summary"
-msgstr "Нед╕ля"
-
-#: mail/mail-tools.c:141
+#: mail/mail-tools.c:173
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не вдалося створити тимчасову поштову скриньку \"%s\": %s"
 
-#: mail/mail-tools.c:188
-#, c-format
-msgid "[%s] (forwarded message)"
-msgstr "[%s] (переслане пов╕домлення)"
-
-#: mail/mail-tools.c:198
-msgid "Fwd: (no subject)"
-msgstr "Fwd: (без теми)"
-
-#: mail/mail-tools.c:215
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслане пов╕домлення %s"
 
-#: mail/mail-tools.c:217
-msgid "Forwarded message (no subject)"
-msgstr "Переслане пов╕домлення (без теми)"
+#: mail/mail-tools.c:245
+#, fuzzy
+msgid "Forwarded message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-tools.c:415
-#, c-format
-msgid ""
-"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
-"%s<br><b>Subject:</b> %s<br>"
-msgstr ""
+#: mail/mail-tools.c:469
+#, fuzzy
+msgid "Forwarded Message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-vfolder.c:249
+#: mail/mail-vfolder.c:270
 msgid "VFolders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:463
 msgid "New VFolder"
 msgstr "Нова в╕ртуальна тека"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
-msgid "Reply"
-msgstr "В╕дпов╕сти"
-
-#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
-msgid "Reply to the sender of this message"
-msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
-msgid "Reply to All"
-msgstr "В╕дпов╕сти вс╕м"
-
-#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
-msgid "Reply to all recipients of this message"
-msgstr "В╕дпов╕сти вс╕м отримувачам цього пов╕домлення"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
-msgid "Forward"
-msgstr "Переслати"
-
-#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
-msgid "Forward this message"
-msgstr "Переслати це пов╕домлення"
-
-#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
-msgid "Print the selected message"
-msgstr "Надрукувати вибране пов╕домлення"
-
-#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
-msgid "Delete this message"
-msgstr "Стерти це пов╕домлення"
-
-#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
-msgid "Previous"
-msgstr "Попередн╓"
-
-#: mail/message-browser.c:208
-msgid "Previous message"
-msgstr "Попередн╓ пов╕домлення"
-
-#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
-#: ui/evolution-task-editor-dialog.xml.h:32
-msgid "Next"
-msgstr "Дал╕"
-
-#: mail/message-browser.c:211
-msgid "Next message"
-msgstr "Наступне пов╕домлення"
-
-#: mail/message-list.c:678
+#: mail/message-list.c:613
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:679
+#: mail/message-list.c:614
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:680
+#: mail/message-list.c:615
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:681
+#: mail/message-list.c:616
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: mail/message-list.c:682
+#: mail/message-list.c:617
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/message-list.c:686
+#: mail/message-list.c:621
 #, fuzzy
 msgid "Lowest"
 msgstr "Низький"
 
-#: mail/message-list.c:687
+#: mail/message-list.c:622
 #, fuzzy
 msgid "Lower"
 msgstr "Низький"
 
-#: mail/message-list.c:691
+#: mail/message-list.c:626
 #, fuzzy
 msgid "Higher"
 msgstr "Високий"
 
-#: mail/message-list.c:692
+#: mail/message-list.c:627
 #, fuzzy
 msgid "Highest"
 msgstr "Високий"
 
-#: mail/message-list.c:942
+#: mail/message-list.c:877
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:884
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:958
+#: mail/message-list.c:893
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:970
+#: mail/message-list.c:905
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:978
+#: mail/message-list.c:913
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:980
+#: mail/message-list.c:915
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:2290
+#, fuzzy
+msgid "Updating message list"
+msgstr "Збереження пов╕домлень"
+
+#: mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr ""
 
-#: mail/message-list.c:1083
-msgid "From"
-msgstr "В╕д"
-
-#: mail/message-list.c:1083
-#, fuzzy
-msgid "Date"
-msgstr "п╕сля"
-
-#: mail/message-list.c:1083
+#: mail/message-list.etspec.h:4
 #, fuzzy
 msgid "Received"
 msgstr "Дата отримання"
 
-#: mail/message-list.c:1084
-msgid "To"
-msgstr "До"
-
-#: mail/message-list.c:1084
+#: mail/message-list.etspec.h:7
 msgid "Size"
 msgstr "Розм╕р"
 
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.etspec.h:1
 msgid "Folder"
 msgstr "Тека"
 
@@ -6960,42 +7971,1468 @@ msgid "Unsubscribing to folder \"%s\""
 msgstr "В╕дм╕нити передплату на теку \"%s\""
 
 #. Construct the app
-#: mail/subscribe-dialog.c:873
+#: mail/subscribe-dialog.c:878
 msgid "Manage Subscriptions"
 msgstr "Керування передплатами"
 
-#: shell/e-setup.c:118 shell/e-setup.c:191
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: my-evolution/component-factory.c:140
+#, fuzzy
+msgid "Cannot initialize Evolution's Executive Summary component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#: my-evolution/e-summary-calendar.c:176 my-evolution/e-summary-calendar.c:194
+msgid "Appointments"
+msgstr "Зустр╕ч╕"
+
+#: my-evolution/e-summary-calendar.c:177
+#, fuzzy
+msgid "No appointments"
+msgstr "Показати зустр╕ч╕"
+
+#: my-evolution/e-summary-calendar.c:226
+#, fuzzy
+msgid "%l:%M%p"
+msgstr "%I:%M%p"
+
+#: my-evolution/e-summary-calendar.c:228
+#, fuzzy
+msgid "%a %l:%M%p"
+msgstr "%I:%M %p"
+
+#: my-evolution/e-summary-mail.c:104
+#, fuzzy
+msgid "Mail summary"
+msgstr "Нед╕ля"
+
+#: my-evolution/e-summary-preferences.c:420
+msgid "Dictionary.com Word of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:442
+msgid "Quotes of the Day"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:869
+msgid "Add a news feed"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:877
+msgid "Enter the URL of the news feed you wish to add"
+msgstr ""
+
+#: my-evolution/e-summary-preferences.c:1408
+#, fuzzy
+msgid "My Evolution Settings"
+msgstr "╤нсталяц╕я Evolution"
+
+#: my-evolution/e-summary-rdf.c:281
+msgid "There was an error downloading news feed"
+msgstr ""
+
+#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
+#, fuzzy
+msgid "<b>Error downloading RDF</b>"
+msgstr "<b>Помилка завантаження календаря</b>"
+
+#: my-evolution/e-summary-tasks.c:206
+#, fuzzy
+msgid "No tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/e-summary-weather.c:57
+msgid "My Weather"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:313
+msgid "<dd><b>The weather server could not be contacted</b></dd>"
+msgstr ""
+
+#: my-evolution/e-summary-weather.c:643
+#, fuzzy
+msgid "Regions"
+msgstr "Розд╕ли:"
+
+#: my-evolution/e-summary.c:145
+#, fuzzy
+msgid "%A, %d %B %Y"
+msgstr "%A, %d %B %Y"
+
+#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#, fuzzy
+msgid "Print My Evolution"
+msgstr "Evolution"
+
+#: my-evolution/e-summary.c:518
+#, fuzzy
+msgid "Printing of My Evolution failed"
+msgstr "Не вдалося надрукувати пов╕домлення"
+
+#: my-evolution/main.c:52
+#, fuzzy
+msgid "Executive summary component could not initialize Bonobo.\n"
+msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: my-evolution/metar.c:44
+#, fuzzy
+msgid "Clear sky"
+msgstr "Очистити"
+
+#: my-evolution/metar.c:45
+msgid "Broken clouds"
+msgstr ""
+
+#: my-evolution/metar.c:46
+msgid "Scattered clouds"
+msgstr ""
+
+#: my-evolution/metar.c:47
+msgid "Few clouds"
+msgstr ""
+
+#: my-evolution/metar.c:48
+msgid "Overcast"
+msgstr ""
+
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+msgid "Invalid"
+msgstr ""
+
+#: my-evolution/metar.c:63
+msgid "Variable"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "North"
+msgstr "Прим╕тки"
+
+#: my-evolution/metar.c:64
+msgid "North - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:64
+#, fuzzy
+msgid "Northeast"
+msgstr "Нотатки:"
+
+#: my-evolution/metar.c:64
+msgid "East - NorthEast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "East"
+msgstr "Вийти"
+
+#: my-evolution/metar.c:65
+msgid "East - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:65
+#, fuzzy
+msgid "Southeast"
+msgstr "Джерела"
+
+#: my-evolution/metar.c:65
+msgid "South - Southeast"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "South"
+msgstr "м╕сяць"
+
+#: my-evolution/metar.c:66
+msgid "South - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:66
+#, fuzzy
+msgid "Southwest"
+msgstr "Низький"
+
+#: my-evolution/metar.c:66
+msgid "West - Southwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "West"
+msgstr "Тест"
+
+#: my-evolution/metar.c:67
+msgid "West - Northwest"
+msgstr ""
+
+#: my-evolution/metar.c:67
+#, fuzzy
+msgid "Northwest"
+msgstr "Низький"
+
+#: my-evolution/metar.c:67
+msgid "North - Northwest"
+msgstr ""
+
+#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
+#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
+#. NONE
+#. DRIZZLE
+#: my-evolution/metar.c:100
+msgid "Drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Drizzle in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Light drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Moderate drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Heavy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Shallow drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Patches of drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Partial drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100 my-evolution/metar.c:101
+msgid "Thunderstorm"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Windy drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+#, fuzzy
+msgid "Showers"
+msgstr "Показати"
+
+#: my-evolution/metar.c:100
+msgid "Drifting drizzle"
+msgstr ""
+
+#: my-evolution/metar.c:100
+msgid "Freezing drizzle"
+msgstr ""
+
+#. RAIN
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Rain"
+msgstr "Рад╕о"
+
+#: my-evolution/metar.c:101
+msgid "Rain in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Light rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Moderate rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Heavy rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Shallow rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Patches of rain"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Partial rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Blowing rainfall"
+msgstr ""
+
+#: my-evolution/metar.c:101
+msgid "Rain showers"
+msgstr ""
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Drifting rain"
+msgstr "Опис м╕стить"
+
+#: my-evolution/metar.c:101
+#, fuzzy
+msgid "Freezing rain"
+msgstr "Шукати дал╕"
+
+#. SNOW
+#: my-evolution/metar.c:102
+#, fuzzy
+msgid "Snow"
+msgstr "зараз"
+
+#: my-evolution/metar.c:102
+msgid "Snow in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Light snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Moderate snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Heavy snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Shallow snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Patches of snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Partial snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102 my-evolution/metar.c:103
+msgid "Snowstorm"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Blowing snowfall"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Snow showers"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Drifting snow"
+msgstr ""
+
+#: my-evolution/metar.c:102
+msgid "Freezing snow"
+msgstr ""
+
+#. SNOW_GRAINS
+#: my-evolution/metar.c:103
+msgid "Snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grains in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Light snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Moderate snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Heavy snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Shallow snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Patches of snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Partial snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Blowing snow grains"
+msgstr ""
+
+#: my-evolution/metar.c:103
+msgid "Snow grain showers"
+msgstr ""
+
+#: my-evolution/metar.c:103
+#, fuzzy
+msgid "Drifting snow grains"
+msgstr "Опис м╕стить"
+
+#: my-evolution/metar.c:103
+msgid "Freezing snow grains"
+msgstr ""
+
+#. ICE_CRYSTALS
+#: my-evolution/metar.c:104
+msgid "Ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystals in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Few ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Moderate ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Heavy ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Patches of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Partial ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Ice crystal storm"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Blowing ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Showers of ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Drifting ice crystals"
+msgstr ""
+
+#: my-evolution/metar.c:104
+msgid "Freezing ice crystals"
+msgstr ""
+
+#. ICE_PELLETS
+#: my-evolution/metar.c:105
+msgid "Ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellets in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Few ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Moderate ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Heavy ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Shallow ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Patches of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Partial ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Ice pellet storm"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Blowing ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Showers of ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Drifting ice pellets"
+msgstr ""
+
+#: my-evolution/metar.c:105
+msgid "Freezing ice pellets"
+msgstr ""
+
+#. HAIL
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Hail"
+msgstr "Е-пошта"
+
+#: my-evolution/metar.c:106
+msgid "Hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:106 my-evolution/metar.c:107
+msgid "Light hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Moderate hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Heavy hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Shallow hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:106
+msgid "Patches of hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Partial hail"
+msgstr "Первинна е-пошта"
+
+#: my-evolution/metar.c:106
+msgid "Hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Blowing hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Hail showers"
+msgstr ""
+
+#: my-evolution/metar.c:106
+msgid "Drifting hail"
+msgstr ""
+
+#: my-evolution/metar.c:106
+#, fuzzy
+msgid "Freezing hail"
+msgstr "Sendmail"
+
+#. SMALL_HAIL
+#: my-evolution/metar.c:107
+msgid "Small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hail in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Moderate small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Heavy small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Shallow small hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:107
+msgid "Patches of small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Partial small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Small hailstorm"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Blowing small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+#, fuzzy
+msgid "Showers of small hail"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:107
+msgid "Drifting small hail"
+msgstr ""
+
+#: my-evolution/metar.c:107
+msgid "Freezing small hail"
+msgstr ""
+
+#. PRECIPITATION
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown precipitation"
+msgstr "Аутенф╕кац╕я:"
+
+#: my-evolution/metar.c:108
+msgid "Precipitation in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Light precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Moderate precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Heavy precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Shallow precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Patches of precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Partial precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Unknown thunderstorm"
+msgstr "Нев╕дома помилка"
+
+#: my-evolution/metar.c:108
+msgid "Blowing precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Showers, type unknown"
+msgstr ""
+
+#: my-evolution/metar.c:108
+msgid "Drifting precipitation"
+msgstr ""
+
+#: my-evolution/metar.c:108
+#, fuzzy
+msgid "Freezing precipitation"
+msgstr "Час початку з╕брання:"
+
+#. MIST
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Mist"
+msgstr "╕сну╓"
+
+#: my-evolution/metar.c:109
+msgid "Mist in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Light mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Moderate mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Thick mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Shallow mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+msgid "Patches of mist"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Partial mist"
+msgstr "Книжна"
+
+#: my-evolution/metar.c:109
+msgid "Mist with wind"
+msgstr ""
+
+#: my-evolution/metar.c:109
+#, fuzzy
+msgid "Drifting mist"
+msgstr "Список розсилки %s"
+
+#: my-evolution/metar.c:109
+msgid "Freezing mist"
+msgstr ""
+
+#. FOG
+#: my-evolution/metar.c:110
+msgid "Fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Fog in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Light fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Moderate fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Thick fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Shallow fog"
+msgstr "Показати все "
+
+#: my-evolution/metar.c:110
+msgid "Patches of fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Partial fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+#, fuzzy
+msgid "Fog with wind"
+msgstr "Закрити це в╕кно"
+
+#: my-evolution/metar.c:110
+msgid "Drifting fog"
+msgstr ""
+
+#: my-evolution/metar.c:110
+msgid "Freezing fog"
+msgstr ""
+
+#. SMOKE
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke"
+msgstr "Моб╕льний"
+
+#: my-evolution/metar.c:111
+msgid "Smoke in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thin smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Moderate smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Thick smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Shallow smoke"
+msgstr "Показати завдання"
+
+#: my-evolution/metar.c:111
+msgid "Patches of smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Partial smoke"
+msgstr ""
+
+#: my-evolution/metar.c:111
+msgid "Smoke w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:111
+#, fuzzy
+msgid "Smoke with wind"
+msgstr "Закрити це в╕кно"
+
+#: my-evolution/metar.c:111
+msgid "Drifting smoke"
+msgstr ""
+
+#. VOLCANIC_ASH
+#: my-evolution/metar.c:112
+msgid "Volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Moderate volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Thick volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Shallow volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Patches of volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Partial volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Volcanic ash w/ thunders"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Blowing volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Showers of volcanic ash "
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Drifting volcanic ash"
+msgstr ""
+
+#: my-evolution/metar.c:112
+msgid "Freezing volcanic ash"
+msgstr ""
+
+#. SAND
+#: my-evolution/metar.c:113
+#, fuzzy
+msgid "Sand"
+msgstr "В╕дправити"
+
+#: my-evolution/metar.c:113
+msgid "Sand in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Light sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Moderate sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Heavy sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Patches of sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Partial sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Blowing sand"
+msgstr ""
+
+#: my-evolution/metar.c:113
+msgid "Drifting sand"
+msgstr ""
+
+#. HAZE
+#: my-evolution/metar.c:114
+#, fuzzy
+msgid "Haze"
+msgstr "Верхн╕й колонтитул"
+
+#: my-evolution/metar.c:114
+msgid "Haze in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Light haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Moderate haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Thick haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Shallow haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Patches of haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Partial haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Haze with wind"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Drifting haze"
+msgstr ""
+
+#: my-evolution/metar.c:114
+msgid "Freezing haze"
+msgstr ""
+
+#. SPRAY
+#: my-evolution/metar.c:115
+#, fuzzy
+msgid "Sprays"
+msgstr "Т╕ло"
+
+#: my-evolution/metar.c:115
+msgid "Sprays in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Light sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Moderate sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Heavy sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Shallow sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Patches of sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Partial sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Blowing sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Drifting sprays"
+msgstr ""
+
+#: my-evolution/metar.c:115
+msgid "Freezing sprays"
+msgstr ""
+
+#. DUST
+#: my-evolution/metar.c:116
+msgid "Dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Dust in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Light dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Moderate dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Heavy dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Patches of dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Partial dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Blowing dust"
+msgstr ""
+
+#: my-evolution/metar.c:116
+msgid "Drifting dust"
+msgstr ""
+
+#. SQUALL
+#: my-evolution/metar.c:117
+msgid "Squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Squall in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Light squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Moderate squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Heavy squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Partial squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Thunderous squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Blowing squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Drifting squall"
+msgstr ""
+
+#: my-evolution/metar.c:117
+msgid "Freezing squall"
+msgstr ""
+
+#. SANDSTORM
+#: my-evolution/metar.c:118
+msgid "Sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Sandstorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Light standstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Moderate sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Heavy sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Shallow sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Partial sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Thunderous sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Blowing sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Drifting sandstorm"
+msgstr ""
+
+#: my-evolution/metar.c:118
+msgid "Freezing sandstorm"
+msgstr ""
+
+#. DUSTSTORM
+#: my-evolution/metar.c:119
+msgid "Duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Duststorm in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Light duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Moderate duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Heavy duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Shallow duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Partial duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Thunderous duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Blowing duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Drifting duststorm"
+msgstr ""
+
+#: my-evolution/metar.c:119
+msgid "Freezing duststorm"
+msgstr ""
+
+#. FUNNEL_CLOUD
+#: my-evolution/metar.c:120
+msgid "Funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Light funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Moderate funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Thick funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Shallow funnel cloud"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Patches of funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Partial funnel clouds"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Funnel cloud w/ wind"
+msgstr ""
+
+#: my-evolution/metar.c:120
+msgid "Drifting funnel cloud"
+msgstr ""
+
+#. TORNADO
+#: my-evolution/metar.c:121
+msgid "Tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Tornado in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Moderate tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Raging tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Partial tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Thunderous tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Drifting tornado"
+msgstr ""
+
+#: my-evolution/metar.c:121
+msgid "Freezing tornado"
+msgstr ""
+
+#. DUST_WHIRLS
+#: my-evolution/metar.c:122
+msgid "Dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Dust whirls in the vicinity"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Light dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Moderate dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Heavy dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Shallow dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Patches of dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Partial dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Blowing dust whirls"
+msgstr ""
+
+#: my-evolution/metar.c:122
+msgid "Drifting dust whirls"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:1
+msgid "Add new feed"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:2
+#, fuzzy
+msgid "All folders:"
+msgstr "Теки"
+
+#: my-evolution/my-evolution.glade.h:3
+msgid "All news feeds:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:4
+#, fuzzy
+msgid "All stations:"
+msgstr "Весь супров╕д"
+
+#: my-evolution/my-evolution.glade.h:6
+#, fuzzy
+msgid "Display folders:"
+msgstr "Створення ново╖ теки"
+
+#: my-evolution/my-evolution.glade.h:7
+#, fuzzy
+msgid "Display stations:"
+msgstr "Параметри в╕дображення"
+
+#: my-evolution/my-evolution.glade.h:8
+#, fuzzy
+msgid "Displayed feeds:"
+msgstr "День"
+
+#: my-evolution/my-evolution.glade.h:9
+#, fuzzy
+msgid "Five days"
+msgstr "П'ятниця"
+
+#: my-evolution/my-evolution.glade.h:10
+msgid "How many days should the calendar display at once?"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:12
+msgid "Max number of items shown:"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:13
+msgid "News Feed Settings"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+msgid "News Feeds"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:15
+#, fuzzy
+msgid "One day"
+msgstr "Середа"
+
+#: my-evolution/my-evolution.glade.h:16
+#, fuzzy
+msgid "One month"
+msgstr "м╕сяць"
+
+#: my-evolution/my-evolution.glade.h:17
+#, fuzzy
+msgid "One week"
+msgstr "Показати 1 тиждень"
+
+#: my-evolution/my-evolution.glade.h:18
+msgid "Refresh time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:19
+#, fuzzy
+msgid "Schedule"
+msgstr "Планування зустр╕ч╕"
+
+#: my-evolution/my-evolution.glade.h:20
+#, fuzzy
+msgid "Show all tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/my-evolution.glade.h:21
+msgid "Show full path for folders"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:22
+#, fuzzy
+msgid "Show today's tasks"
+msgstr "Показати завдання"
+
+#: my-evolution/my-evolution.glade.h:23
+#, fuzzy
+msgid "Tasks "
+msgstr "Завдання"
+
+#: my-evolution/my-evolution.glade.h:24
+msgid "Units: "
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:25
+#, fuzzy
+msgid "Weather"
+msgstr "╤нша"
+
+#: my-evolution/my-evolution.glade.h:26
+#, fuzzy
+msgid "Weather settings"
+msgstr "Очистити вибране"
+
+#: my-evolution/my-evolution.glade.h:27
+msgid "imperial"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:28
+msgid "metric"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#, fuzzy
+msgid "The Evolution shell."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#: shell/e-activity-handler.c:198
+#, fuzzy
+msgid "Show Details"
+msgstr "Подробиц╕"
+
+#: shell/e-activity-handler.c:200
+#, fuzzy
+msgid "Cancel Operation"
+msgstr "Скасувати зустр╕ч"
+
+#: shell/e-local-storage.c:554
+#, fuzzy
+msgid "Local Folders"
+msgstr "В╕ртуальн╕ теки"
+
+#: shell/e-setup.c:125 shell/e-setup.c:196
 msgid "Evolution installation"
 msgstr "╤нсталяц╕я Evolution"
 
-#: shell/e-setup.c:122
+#: shell/e-setup.c:129
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:123
+#: shell/e-setup.c:130
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Натисн╕ть \"Гаразд\" щоб встановити файли, чи \"В╕дм╕нити\" щоб вийти."
 
-#: shell/e-setup.c:163
+#: shell/e-setup.c:170
 msgid "Could not update files correctly"
 msgstr "Не вдалося коректно поновити файли"
 
-#: shell/e-setup.c:166 shell/e-setup.c:234
-msgid "Evolution files successfully installed."
-msgstr "Файли Evolution усп╕шно встановлено."
-
-#: shell/e-setup.c:195
+#: shell/e-setup.c:200
 #, fuzzy
 msgid "This seems to be the first time you are running Evolution."
 msgstr "Схоже це ваш перший запуск Evolution."
 
-#: shell/e-setup.c:196
+#: shell/e-setup.c:201
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:215
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -7006,16 +9443,14 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:230
-#, c-format
+#: shell/e-setup.c:235
+#, fuzzy, c-format
 msgid ""
-"Cannot copy files into\n"
+"An error occurred in copying files into\n"
 "`%s'."
-msgstr ""
-"Неможливо скоп╕ювати файли в\n"
-"\"%s\"."
+msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: shell/e-setup.c:255
+#: shell/e-setup.c:308
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -7023,7 +9458,16 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:267
+#: shell/e-setup.c:322
+msgid ""
+"Evolution has detected an old\n"
+"Executive-Summary directory.\n"
+"This needs to be removed before\n"
+"Evolution will run.\n"
+"Do you want me to remove this directory?"
+msgstr ""
+
+#: shell/e-setup.c:347
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -7031,19 +9475,58 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell.c:379
+#: shell/e-shell-folder-commands.c:160
+#, fuzzy
+msgid "Cannot move a folder over itself."
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: shell/e-shell-folder-commands.c:162
+#, fuzzy
+msgid "Cannot copy a folder over itself."
+msgstr ""
+"Неможливо скоп╕ювати файли в\n"
+"\"%s\"."
+
+#: shell/e-shell-folder-commands.c:176
+msgid "Cannot move a folder into one of its descendants."
+msgstr ""
+
+#: shell/e-shell-folder-commands.c:270
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell.c:1249
+#: shell/e-shell-folder-commands.c:275
+#, fuzzy
+msgid "Copy folder"
+msgstr "Скоп╕ювати у теку"
+
+#: shell/e-shell-folder-commands.c:313
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Specify a folder to move folder \"%s\" into:"
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:99
+#: shell/e-shell-folder-commands.c:318
+#, fuzzy
+msgid "Move folder"
+msgstr "Перенести в теку"
+
+#: shell/e-shell-folder-commands.c:354
+#, fuzzy, c-format
+msgid "Delete folder '%s'"
+msgstr "Стерти завдання"
+
+#: shell/e-shell-folder-commands.c:363
+#, fuzzy, c-format
+msgid "Are you sure you want to remove the '%s' folder?"
+msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
+
+#: shell/e-shell-folder-commands.c:422
+#, fuzzy, c-format
+msgid "Rename folder '%s'"
+msgstr "В╕дкривання теки %s"
+
+#: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -7052,200 +9535,424 @@ msgstr ""
 "Неможливо створити вказану теку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:156
+#: shell/e-shell-folder-creation-dialog.c:168
 msgid "The specified folder name is not valid."
 msgstr "Вказана назва теки не в╕рна."
 
-#: shell/e-shell-folder-creation-dialog.c:263
+#: shell/e-shell-folder-creation-dialog.c:275
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Створення ново╖ теки"
 
-#: shell/e-shell-folder-selection-dialog.c:96
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:321
+#: shell/e-shell-folder-selection-dialog.c:343
 msgid "New..."
 msgstr "Новий..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:469 shell/e-shell-folder-title-bar.c:470
 msgid "(Untitled)"
 msgstr "(Ненайменований)"
 
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
+#: shell/e-shell-importer.c:97
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
-#: shell/e-shell-view.c:1184
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/e-shell-importer.c:192
 #, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
 
-#: shell/e-shell-view.c:1186
+#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
 #, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:173
+#: shell/e-shell-importer.c:352
+#, fuzzy, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr "Нема╓ ново╖ кореспонденц╕╖ на %s."
+
+#: shell/e-shell-importer.c:362
+msgid "Importing"
+msgstr "╤мпортування"
+
+#: shell/e-shell-importer.c:370
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+
+#: shell/e-shell-importer.c:383
+#, fuzzy, c-format
+msgid "Error starting %s"
+msgstr "Помилка збереження файлу: %s"
+
+#: shell/e-shell-importer.c:402
+#, c-format
+msgid "Error loading %s"
+msgstr "Помилка завантаження %s"
+
+#: shell/e-shell-importer.c:417
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+
+#: shell/e-shell-importer.c:488
+#, fuzzy
+msgid "Automatic"
+msgstr "Автовиб╕р"
+
+#: shell/e-shell-importer.c:538
+msgid "Filename:"
+msgstr "Назва файлу:"
+
+#: shell/e-shell-importer.c:543 shell/importer/import.glade.h:5
+msgid "Select a file"
+msgstr "Вибрати файл"
+
+#: shell/e-shell-importer.c:553
+msgid "File type:"
+msgstr "Тип файлу:"
+
+#: shell/e-shell-importer.c:599
+#, fuzzy
+msgid "Select folder"
+msgstr "Виб╕р теки"
+
+#: shell/e-shell-importer.c:600
+msgid "Select a destination folder for importing this data"
+msgstr ""
+
+#: shell/e-shell-offline-handler.c:554
+msgid "Closing connections..."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:181
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 
-#: shell/e-shell-view-menu.c:179
+#: shell/e-shell-view-menu.c:189
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:208
+#: shell/e-shell-view-menu.c:217
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:210
+#: shell/e-shell-view-menu.c:219
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:437
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shortcuts.c:381
-msgid "Error saving shortcuts."
+#: shell/e-shell-view-menu.c:438
+msgid "Select the folder that you want to open"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:134
+#: shell/e-shell-view-menu.c:583
+#, fuzzy
+msgid "Create a new shortcut"
+msgstr "Створити новий контакт"
+
+#: shell/e-shell-view-menu.c:584
+msgid "Select the folder you want the shortcut to point to:"
+msgstr ""
+
+#: shell/e-shell-view-menu.c:689
+#, fuzzy
+msgid "Work Online"
+msgstr "Перенесення"
+
+#: shell/e-shell-view-menu.c:701 shell/e-shell-view-menu.c:713
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "Work Offline"
+msgstr "Перенесення"
+
+#: shell/e-shell-view.c:175
+msgid "(No folder displayed)"
+msgstr ""
+
+#. Special case for My Evolution
+#: shell/e-shell-view.c:1394 shell/e-storage-set-view.c:1440
+#, fuzzy
+msgid "My Evolution"
+msgstr "Evolution"
+
+#: shell/e-shell-view.c:1411
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1413
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
+#: shell/e-shell-view.c:1451
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1458
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-view.c:1464
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell.c:446
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1311
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:141
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:137
+#: shell/e-shortcuts-view.c:144
 msgid "Group name:"
 msgstr "Назва групи:"
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:272
 msgid "Don't remove"
 msgstr "Не видаляти"
 
-#: shell/e-shortcuts-view.c:276
+#: shell/e-shortcuts-view.c:300
+#, fuzzy
+msgid "Rename Shortcut Group"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:301
+#, fuzzy
+msgid "Rename selected shortcut group to:"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:314
 msgid "_Small Icons"
 msgstr "Мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:277
+#: shell/e-shortcuts-view.c:315
 msgid "Show the shortcuts as small icons"
 msgstr "Показувати ярлик╕ як мал╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:279
+#: shell/e-shortcuts-view.c:317
 msgid "_Large Icons"
 msgstr "Велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:318
 msgid "Show the shortcuts as large icons"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:291
+#: shell/e-shortcuts-view.c:329
 msgid "_New Group..."
 msgstr "Нова група..."
 
-#: shell/e-shortcuts-view.c:292
+#: shell/e-shortcuts-view.c:330
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:294
-msgid "_Remove This Group..."
+#: shell/e-shortcuts-view.c:332
+#, fuzzy
+msgid "_Remove this Group..."
 msgstr "Видалити цю групу..."
 
-#: shell/e-shortcuts-view.c:295
+#: shell/e-shortcuts-view.c:333
 #, fuzzy
 msgid "Remove this shortcut group"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:300
+#: shell/e-shortcuts-view.c:335
+#, fuzzy
+msgid "Re_name this Group..."
+msgstr "Видалити цю групу..."
+
+#: shell/e-shortcuts-view.c:336
+#, fuzzy
+msgid "Rename this shortcut group"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:341
 #, fuzzy
 msgid "_Hide the Shortcut Bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:301
+#: shell/e-shortcuts-view.c:342
 #, fuzzy
 msgid "Hide the shortcut bar"
 msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate"
-msgstr "Актив╕зувати"
+#: shell/e-shortcuts-view.c:461
+#, fuzzy
+msgid "Rename shortcut"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:462
+#, fuzzy
+msgid "Rename selected shortcut to:"
+msgstr "Актив╕зувати цей ярлик"
+
+#: shell/e-shortcuts-view.c:474 ui/evolution-message-composer.xml.h:13
+msgid "Open"
+msgstr "В╕дкрити"
+
+#: shell/e-shortcuts-view.c:474
+msgid "Open the folder linked to this shortcut"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:385
-msgid "Activate this shortcut"
+#: shell/e-shortcuts-view.c:476 ui/evolution.xml.h:23
+msgid "Open in New Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: shell/e-shortcuts-view.c:476
+#, fuzzy
+msgid "Open the folder linked to this shortcut in a new window"
+msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename"
+msgstr "Назва правила: "
+
+#: shell/e-shortcuts-view.c:479
+#, fuzzy
+msgid "Rename this shortcut"
 msgstr "Актив╕зувати цей ярлик"
 
-#: shell/e-shortcuts-view.c:388
+#: shell/e-shortcuts-view.c:481
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-storage.c:178
+#: shell/e-shortcuts.c:585
+msgid "Error saving shortcuts."
+msgstr ""
+
+#: shell/e-shortcuts.c:982
+#, fuzzy
+msgid "Shortcuts"
+msgstr "Панель ярлик╕в"
+
+#: shell/e-shortcuts.c:984
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
+#: shell/e-shortcuts.c:987
+#, fuzzy
+msgid "Contacts"
+msgstr "Контакт"
+
+#: shell/e-storage.c:178 shell/e-storage.c:184
 msgid "(No name)"
 msgstr "(Без назви)"
 
-#: shell/e-storage.c:459
+#: shell/e-storage.c:475
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:461
+#: shell/e-storage.c:477
 msgid "Generic error"
 msgstr "Загальна помилка"
 
-#: shell/e-storage.c:463
+#: shell/e-storage.c:479
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:465
+#: shell/e-storage.c:481
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:467
+#: shell/e-storage.c:483
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:469
+#: shell/e-storage.c:485
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:471
+#: shell/e-storage.c:487
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:473
+#: shell/e-storage.c:489
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:475
-msgid "Permission denied"
-msgstr ""
-
-#: shell/e-storage.c:477
+#: shell/e-storage.c:493
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:479
+#: shell/e-storage.c:495
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "Вид"
+#: shell/e-task-widget.c:168
+#, c-format
+msgid "%s (...)"
+msgstr ""
 
-#: shell/e-storage-set-view.c:650
-msgid "View the selected folder"
-msgstr "Показати вибрану теки"
+#: shell/e-task-widget.c:173
+#, fuzzy
+msgid "%s (%d%% complete)"
+msgstr "% завершення:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "Active connections"
+msgstr "Будь-яке поле м╕стить"
+
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Click OK to close these connections and go offline"
+msgstr ""
+
+#: shell/glade/e-active-connection-dialog.glade.h:3
+#, fuzzy
+msgid "Host"
+msgstr "Комп'ютер:"
+
+#: shell/glade/e-active-connection-dialog.glade.h:4
+msgid "The following connections are currently active:"
+msgstr ""
 
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #, fuzzy
@@ -7262,93 +9969,6 @@ msgstr "Теки"
 msgid "Specify where to create the folder:"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
-#, fuzzy
-msgid "The Evolution shell."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-
-#: shell/importer/importer.c:341
-#, fuzzy, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr "Нема╓ ново╖ кореспонденц╕╖ на %s."
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "╤мпортування"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-
-#: shell/importer/importer.c:372
-#, fuzzy, c-format
-msgid "Error starting %s"
-msgstr "Помилка збереження файлу: %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "Помилка завантаження %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-
-#: shell/importer/importer.c:473
-#, fuzzy
-msgid "Automatic"
-msgstr "Автовиб╕р"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "Назва файлу:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "Вибрати файл"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "Тип файлу:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "╤мпорт"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -7370,276 +9990,370 @@ msgid ""
 "importing external files into Evolution."
 msgstr ""
 
-#: shell/importer/intelligent.c:143
+#: shell/importer/intelligent.c:191
+#, fuzzy
+msgid "Importers"
+msgstr "╤мпорт"
+
+#: shell/importer/intelligent.c:197
+#, fuzzy
+msgid "Don't import"
+msgstr "Не видаляти"
+
+#: shell/importer/intelligent.c:199
 #, fuzzy
 msgid "Don't ask me again"
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: shell/main.c:82
+#: shell/importer/intelligent.c:209
+msgid "Evolution has found the following data sources:"
+msgstr ""
+
+#: shell/main.c:96
 #, no-c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this PREVIEW RELEASE\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
 "Evolution is not yet complete. It's getting close, but there are\n"
-"places where features are either missing or only half working. If\n"
-"you can't figure out how to do something, it's probably because\n"
-"there's no way to do it yet! :-)\n"
+"places where features are either missing or only half working. \n"
 "\n"
-"We hope Evolution will be usable for you, but we still feel the\n"
-"need to warn you that it may: crash, lose your mail, leave stray\n"
-"processes running, consume 100% of your CPU, send non-\n"
-"compliant commands to your servers, and generally embarass you\n"
-"in front of your friends and co-workers. Use only as directed.\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:107
+#: shell/main.c:117
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:138
-msgid "Cannot initialize the Evolution shell."
+#: shell/main.c:155
+#, fuzzy
+msgid "Cannot access the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:184
+#: shell/main.c:215
 msgid "Disable splash screen"
 msgstr ""
 
-#: shell/main.c:185
+#: shell/main.c:216
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:217
+#: shell/main.c:255
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
-#: ui/evolution-addressbook.xml.h:2
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-list.xml.h:2
+#: ui/evolution-mail-message.xml.h:5
+msgid "Copy"
+msgstr "Скоп╕ювати"
+
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-calendar.xml.h:3
+msgid "Copy the selection"
+msgstr "Скоп╕ювати вибране"
+
+#: ui/evolution-addressbook.xml.h:4
 msgid "Create new contact"
 msgstr "Створити новий контакт"
 
-#: ui/evolution-addressbook.xml.h:4
-msgid "Delete a contact"
-msgstr "Стерти контакт"
+#: ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Create new contact list"
+msgstr "Створити новий контакт"
 
-#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
-msgid "Find"
-msgstr "Знайти"
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-mail-list.xml.h:4
+msgid "Cut"
+msgstr "Вир╕зати"
 
-#: ui/evolution-addressbook.xml.h:6
-msgid "Find a contact"
-msgstr "Знайти контакт"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:8
+msgid "Cut the selection"
+msgstr "Вир╕зати вибране"
 
-#: ui/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete selected contacts"
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:10
 msgid "New contact"
 msgstr "Новий контакт"
 
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
-msgid "Previews the message to be printed"
-msgstr "Переглянути пов╕домлення, що буде надрукувано"
-
 #: ui/evolution-addressbook.xml.h:11
-msgid "Print contacts"
+#, fuzzy
+msgid "New list"
+msgstr "Новий"
+
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail-list.xml.h:12
+msgid "Paste"
+msgstr "Вставити"
+
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:17
+msgid "Paste the clipboard"
+msgstr "Вставити буфер обм╕ну"
+
+#: ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Previews the contacts to be printed"
+msgstr "Переглянути календар, що буде надрукувано"
+
+#: ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Print selected contacts"
 msgstr "Надрукувати контакти"
 
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
+#: ui/evolution-addressbook.xml.h:18
+msgid "Select All"
+msgstr "Вибрати все"
+
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Select all contacts"
+msgstr "Стерти контакт"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ui/evolution-addressbook.xml.h:13
+#: ui/evolution-addressbook.xml.h:21
 msgid "Stop Loading"
 msgstr "Зупинити завантаження"
 
-#: ui/evolution-addressbook.xml.h:14
-msgid "View All"
-msgstr "Показати все"
-
-#: ui/evolution-addressbook.xml.h:15
-msgid "View all contacts"
-msgstr "Показати вс╕ контакти"
-
-#: ui/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:22
 #, fuzzy
 msgid "_Addressbook Sources..."
 msgstr "Додати джерело"
 
-#: ui/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:23
 msgid "_Contact"
 msgstr "Контакт"
 
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-addressbook.xml.h:24
+#, fuzzy
+msgid "_Contact Group"
+msgstr "Контакт"
+
+#: ui/evolution-addressbook.xml.h:27 ui/evolution-calendar.xml.h:35
+#: ui/evolution-contact-editor.xml.h:15 ui/my-evolution.xml.h:5
 msgid "_Print..."
 msgstr "Друкувати..."
 
-#: ui/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:28
 msgid "_Search for contacts"
 msgstr "Пошук контакт╕в"
 
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-addressbook.xml.h:29
+msgid "_Select All"
+msgstr "Вибрати все"
+
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:36
+#: ui/evolution-mail-messagedisplay.xml.h:11 ui/evolution.xml.h:62
 msgid "_Tools"
 msgstr "╤нструменти"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "5 Days"
-msgstr "5 Дн╕в"
-
-#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
-#, fuzzy
-msgid "Alter preferences"
-msgstr "Параметри календаря"
+#: ui/evolution-calendar.xml.h:2
+msgid "Configure the calendar's settings"
+msgstr ""
 
 #: ui/evolution-calendar.xml.h:4
 #, fuzzy
-msgid "Create a new all day Event"
+msgid "Create a New All-Day _Event"
 msgstr "Створити новий календар"
 
 #: ui/evolution-calendar.xml.h:5
-msgid "Create a new appointment"
+#, fuzzy
+msgid "Create a _New Appointment"
 msgstr "Створити нову зустр╕ч"
 
 #: ui/evolution-calendar.xml.h:6
-msgid "Create a new calendar"
-msgstr "Створити новий календар"
+msgid "Create a new appointment"
+msgstr "Створити нову зустр╕ч"
 
 #: ui/evolution-calendar.xml.h:7
-msgid "Day"
-msgstr "День"
+msgid "Create an event for the whole day"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9 ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Go To"
 msgstr "Перейти"
 
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
 msgid "Go back in time"
 msgstr "Перейти назад в час╕"
 
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
 msgid "Go forward in time"
 msgstr "Перейти вперед в час╕"
 
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Go to _Date"
 msgstr "К╕нцева дата"
 
-#: ui/evolution-calendar.xml.h:12
-#, fuzzy
-msgid "Go to _Today"
-msgstr "сьогодн╕"
-
-#: ui/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:14
 msgid "Go to a specific date"
 msgstr "Перейти до вказано╖ дати"
 
-#: ui/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to present time"
 msgstr "Поперейти в точний час"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "М╕сяць"
-
-#: ui/evolution-calendar.xml.h:17
-msgid "New _Event"
-msgstr "Нова под╕я"
-
-#: ui/evolution-calendar.xml.h:20
-msgid "Open Calendar"
-msgstr "В╕дкрити календар"
-
-#: ui/evolution-calendar.xml.h:21
-msgid "Prev"
-msgstr "Назад"
+#: ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Нова зустр╕ч"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Переглянути календар, що буде надрукувано"
 
-#: ui/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Print calendar"
 msgstr "Надрукувати календар"
 
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
-msgid "Save As"
-msgstr "Зберегти як"
+#: ui/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Publish Free/Busy Information"
+msgstr "Нема╓ ╕нформац╕╖"
 
-#: ui/evolution-calendar.xml.h:28
-msgid "Save calendar as something else"
-msgstr "Зберегти календар як щось ╕нше"
+#: ui/evolution-calendar.xml.h:23
+msgid "Publish Free/Busy information for this calendar"
+msgstr ""
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Показати 1 день"
 
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Показати 1 м╕сяць"
 
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Показати 1 тиждень"
 
-#: ui/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Показати робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
-#: widgets/misc/e-dateedit.c:424
-msgid "Today"
-msgstr "сьогодн╕"
-
-#: ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "W_ork Week"
 msgstr "Робочий тиждень"
 
-#: ui/evolution-calendar.xml.h:36
-msgid "Week"
-msgstr "Тиждень"
-
-#: ui/evolution-calendar.xml.h:37
-msgid "_Appointment"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "_Appointment..."
 msgstr "Зустр╕ч╕"
 
-#: ui/evolution-calendar.xml.h:38
+#: ui/evolution-calendar.xml.h:30
+#, fuzzy
+msgid "_Calendar Settings..."
+msgstr "Установки пошти..."
+
+#: ui/evolution-calendar.xml.h:32
 msgid "_Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:39
+#: ui/evolution-calendar.xml.h:33
 msgid "_Month"
 msgstr "М╕сяць"
 
-#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
-msgid "_New"
-msgstr "Новий"
-
-#: ui/evolution-calendar.xml.h:41
-msgid "_Open Calendar"
-msgstr "В╕дкрити календар"
-
-#: ui/evolution-calendar.xml.h:45
+#: ui/evolution-calendar.xml.h:37
 #, fuzzy
 msgid "_Week"
 msgstr "Тиждень"
 
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Закрити"
+
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this appointment"
+msgstr "Закрити цю зустр╕ч"
+
+#: ui/evolution-comp-editor.xml.h:5
+msgid "Delete this appointment"
+msgstr "Стерти цю зустр╕ч"
+
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution.xml.h:21
+msgid "Main toolbar"
+msgstr "Головна панель ╕нструмент╕в"
+
+#: ui/evolution-comp-editor.xml.h:7
+#, fuzzy
+msgid "Preview the printed item"
+msgstr "Переглянути пов╕домлення, що буде надрукувано"
+
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-tasks.xml.h:11
+msgid "Print Pre_view"
+msgstr "Перегляд друку"
+
+#: ui/evolution-comp-editor.xml.h:11
+#, fuzzy
+msgid "Print S_etup"
+msgstr "Параметри друку"
+
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:6
+msgid "Print this item"
+msgstr "Надрукувати цей елемент"
+
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:7
+msgid "Print..."
+msgstr "Друкувати..."
+
+#: ui/evolution-comp-editor.xml.h:15 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:5
+msgid "Save and Close"
+msgstr "Зберегти та закрити"
+
+#: ui/evolution-comp-editor.xml.h:16
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Зберегти контакт ╕ закрити д╕алог"
+
+#: ui/evolution-comp-editor.xml.h:17
+msgid "Save this item to disk"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:18
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: ui/evolution-comp-editor.xml.h:19
+#, fuzzy
+msgid "_Action"
+msgstr "Д╕╖"
+
+#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-mail-messagedisplay.xml.h:10
+#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:47
+msgid "_File"
+msgstr "Файл"
+
 #: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
 #: ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete..."
 msgstr "Стерти..."
 
@@ -7651,27 +10365,12 @@ msgstr "Дов╕дка"
 msgid "Print En_velope..."
 msgstr "Надрукувати конверт..."
 
-#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
-#: ui/evolution-task-editor-dialog.xml.h:40
-msgid "Print this item"
-msgstr "Надрукувати цей елемент"
-
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
-msgid "Print..."
-msgstr "Друкувати..."
-
-#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Зберегти як..."
 
-#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:52
-msgid "Save and Close"
-msgstr "Зберегти та закрити"
-
 #: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Зберегти контакт ╕ закрити д╕алог"
@@ -7689,911 +10388,1019 @@ msgstr ""
 msgid "Send _message to contact..."
 msgstr "В╕д╕слати пов╕домлення за контактом..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
-#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
-msgid "_File"
-msgstr "Файл"
-
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
-#: ui/evolution-message-composer.xml.h:51
-#: ui/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:54
+#: ui/evolution-signature-editor.xml.h:11
 msgid "_Save"
 msgstr "Зберегти"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
-msgid "About this application"
-msgstr "Про цю програму"
+#: ui/evolution-contact-list-editor.xml.h:2
+#, fuzzy
+msgid "Delete this list"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
-msgid "About..."
-msgstr "Про..."
+#: ui/evolution-contact-list-editor.xml.h:6
+#, fuzzy
+msgid "Save the list and close the dialog box"
+msgstr "Зберегти контакт ╕ закрити д╕алог"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
-msgid "Actio_ns"
-msgstr "Д╕╖"
+#: ui/evolution-contact-list-editor.xml.h:7
+#, fuzzy
+msgid "Se_nd list to other..."
+msgstr "В╕д╕слати контакт ╕ншому..."
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
-msgid "Address _Book... (FIXME)"
-msgstr "Адресна книга..."
+#: ui/evolution-contact-list-editor.xml.h:8
+#, fuzzy
+msgid "Send _message to list..."
+msgstr "В╕д╕слати пов╕домлення за контактом..."
 
-#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
-msgid "C_lear"
-msgstr "Очистити"
+#: ui/evolution-event-editor.xml.h:1
+#, fuzzy
+msgid "Cancel Mee_ting"
+msgstr "Скасувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
-msgid "C_ut"
-msgstr "Вир╕зати"
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor.xml.h:2
+#, fuzzy
+msgid "Cancel the meeting for this item"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:4
 #, fuzzy
-msgid "Chec_k Names (FIXME)"
-msgstr "Завдання"
+msgid "Forward as i_Calendar"
+msgstr "Завантаження календаря"
 
-#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
-msgid "Clear"
-msgstr "Очистити"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:5
+#, fuzzy
+msgid "Forward this item via email"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
-msgid "Clear the selection"
-msgstr "Очистити вибране"
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor.xml.h:6
+msgid "Obtain the latest meeting information"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
-msgid "Close this appointment"
-msgstr "Закрити цю зустр╕ч"
+#: ui/evolution-event-editor.xml.h:6
+#, fuzzy
+msgid "Re_fresh Meeting"
+msgstr "Планування зустр╕ч╕"
 
-#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
-msgid "Cop_y to Folder... (FIXME)"
-msgstr "Скоп╕ювати у теку..."
+#: ui/evolution-event-editor.xml.h:7
+msgid "Schedule _Meeting"
+msgstr "Планувати зустр╕ч"
 
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
-#: ui/evolution-task-editor-dialog.xml.h:14
-msgid "Copy"
-msgstr "Скоп╕ювати"
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor.xml.h:8
+#, fuzzy
+msgid "Schedule a meeting for this item"
+msgstr "Планування зустр╕ч╕"
 
-#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
-msgid "Copy the selection"
-msgstr "Скоп╕ювати вибране"
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-task-editor.xml.h:9 ui/evolution.xml.h:40
+msgid "_Actions"
+msgstr "Д╕╖"
 
-#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
-msgid "Cut"
-msgstr "Вир╕зати"
+#: ui/evolution-executive-summary.xml.h:1
+#, fuzzy
+msgid "Customise My Evolution"
+msgstr "%s - Evolution %s"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
-msgid "Cut the selection"
-msgstr "Вир╕зати вибране"
+#: ui/evolution-mail-global.xml.h:1
+#, fuzzy
+msgid "Cancel"
+msgstr "В╕дм╕нено"
 
-#: ui/evolution-event-editor.xml.h:18
-msgid "Delete this appointment"
-msgstr "Стерти цю зустр╕ч"
+#: ui/evolution-mail-global.xml.h:2
+#, fuzzy
+msgid "Cancel the current mail operation"
+msgstr "Зберегти поточний файл"
 
-#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
-msgid "Dump XML"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose"
+msgstr "П╕дготувати"
+
+#: ui/evolution-mail-global.xml.h:4
+#, fuzzy
+msgid "Compose _New Message"
+msgstr "Скласти нове пов╕домлення"
+
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit mail accounts and other preferences"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
-msgid "Dump the UI Xml description"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
-msgid "Fi_rst Item in Folder (FIXME)"
-msgstr "Перший елемент у тец╕"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Create or edit virtual folder definitions"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
-msgid "For_ward (FIXME)"
-msgstr "Переслати"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Empty _Trash"
+msgstr "Спорожнити см╕тник"
 
-#: ui/evolution-event-editor.xml.h:23
-msgid "Forward as v_Calendar (FIXME)"
+#: ui/evolution-mail-global.xml.h:9
+msgid "Forget _Passwords"
+msgstr "Забути парол╕"
+
+#: ui/evolution-mail-global.xml.h:10
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
-msgid "Go to the next item"
-msgstr "Перейти до наступного елементу"
+#: ui/evolution-mail-global.xml.h:11
+msgid "Manage _Subscriptions..."
+msgstr "Керування передплатами..."
 
-#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
-msgid "Go to the previous item"
-msgstr "Перейти до попереднього елементу"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Open a window for composing a mail message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
-msgid "In_complete Task (FIXME)"
-msgstr "Невиконане завдання"
+#: ui/evolution-mail-global.xml.h:13
+#, fuzzy
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
-msgid "Modify the file's properties"
-msgstr ""
+#: ui/evolution-mail-global.xml.h:14
+#, fuzzy
+msgid "Send / Receive"
+msgstr "Дата отримання"
 
-#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
-msgid "N_ext"
-msgstr "Наступний"
+#: ui/evolution-mail-global.xml.h:15
+msgid "Send queued mail and retrieve new mail"
+msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
 
-#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
-msgid "Paste"
-msgstr "Вставити"
+#: ui/evolution-mail-global.xml.h:16
+msgid "Show message preview window"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
-msgid "Paste the clipboard"
-msgstr "Вставити буфер обм╕ну"
+#: ui/evolution-mail-global.xml.h:17
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
-msgid "Pre_vious"
-msgstr "Попередн╕й"
+#: ui/evolution-mail-global.xml.h:18
+#, fuzzy
+msgid "Virtual Folder _Editor..."
+msgstr "Редактор в╕ртуальних тек"
 
-#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
-msgid "Print Pre_view"
-msgstr "Перегляд друку"
+#: ui/evolution-mail-global.xml.h:19
+msgid "_Filters..."
+msgstr "Ф╕льтри..."
 
-#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
-msgid "Print S_etup..."
-msgstr "Параметри друку..."
+#: ui/evolution-mail-global.xml.h:20
+msgid "_Mail Message"
+msgstr "В╕д╕слати пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
-msgid "Print Setup"
-msgstr "Параметри друку"
+#: ui/evolution-mail-global.xml.h:21
+msgid "_Mail Settings..."
+msgstr "Установки пошти..."
 
-#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
-msgid "Save"
-msgstr "Зберегти"
+#: ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Preview Pane"
+msgstr "Перегляд"
 
-#: ui/evolution-event-editor.xml.h:43
+#: ui/evolution-mail-global.xml.h:23
 #, fuzzy
-msgid "Save the appointment and close the dialog box"
-msgstr "Зберегти контакт ╕ закрити д╕алог"
+msgid "_Send / Receive"
+msgstr "Дата отримання"
 
-#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
-#: ui/evolution-task-editor-dialog.xml.h:53
-msgid "Save the current file"
-msgstr "Зберегти поточний файл"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution-event-editor.xml.h:46
-msgid "Schedule _Meeting"
-msgstr "Планувати зустр╕ч"
+#: ui/evolution-mail-list.xml.h:3
+#, fuzzy
+msgid "Copy selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:47
+#: ui/evolution-mail-list.xml.h:5
 #, fuzzy
-msgid "Schedule some sort of a meeting"
-msgstr "Планування зустр╕ч╕"
+msgid "Cut selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
-#: ui/evolution-task-editor-dialog.xml.h:57
-msgid "Select All"
-msgstr "Вибрати все"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide S_elected Messages"
+msgstr "Прибрати вибран╕ пов╕домлення"
+
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Deleted Messages"
+msgstr "Прибрати стерт╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-mail-list.xml.h:8
 #, fuzzy
-msgid "Select everything"
-msgstr "Вибрати назви"
+msgid "Hide _Read Messages"
+msgstr "Прибрати прочитан╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
-msgid "Setup the page settings for your current printer"
+#: ui/evolution-mail-list.xml.h:9
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark All as R_ead"
+msgstr "Позначити вс╕ прочитаними"
+
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "Завдання"
+msgid "Mark all visible messages as read"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:38
-#: ui/evolution-task-editor-dialog.xml.h:63
-msgid "_About..."
-msgstr "Про..."
+#: ui/evolution-mail-list.xml.h:13
+#, fuzzy
+msgid "Paste message in the clipboard"
+msgstr "Вставити буфер обм╕ну"
 
-#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "Закрити"
+#: ui/evolution-mail-list.xml.h:14
+#, fuzzy
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
-msgid "_Contact (FIXME)"
-msgstr "Контакт"
+#: ui/evolution-mail-list.xml.h:15 ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Вибрати все"
 
-#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
-msgid "_Copy"
-msgstr "Скоп╕ювати"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select _Thread"
+msgstr "Вибрати г╕лку"
 
-#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:42
-#: ui/evolution-task-editor-dialog.xml.h:68
-msgid "_Debug"
-msgstr "Налагодження"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all and only the messages that are not currently selected"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "Дов╕дка"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Select all messages in the same thread as the selected message"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
-msgid "_Item (FIXME)"
-msgstr "Елемент"
+#: ui/evolution-mail-list.xml.h:19
+#, fuzzy
+msgid "Select all visible messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
-msgid "_Journal Entry (FIXME)"
-msgstr "Журнальний запис"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Show _All"
+msgstr "Показати все"
 
-#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
-msgid "_Last Item in Folder (FIXME)"
-msgstr "Останн╕й елемент у тец╕"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Show messages that have been temporarily hidden"
+msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
-msgid "_Mail Message (FIXME)"
-msgstr "В╕д╕слати пов╕домлення"
+#: ui/evolution-mail-list.xml.h:22
+#, fuzzy
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
-msgid "_Move to Folder... (FIXME)"
-msgstr "Перенести в теку..."
+#: ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Temporarily hide the selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
-msgid "_Note (FIXME)"
-msgstr "Прим╕тка"
+#: ui/evolution-mail-list.xml.h:24
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
-msgid "_Paste"
-msgstr "Вставити"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Expunge"
+msgstr "Викреслити"
+
+#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:48
+msgid "_Folder"
+msgstr "Тека"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "╤нвертувати виб╕р"
 
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
-#: ui/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-mail-list.xml.h:28
 msgid "_Properties..."
 msgstr "Властивост╕..."
 
-#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
-msgid "_Select All"
-msgstr "Вибрати все"
-
-#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
-msgid "_Task (FIXME)"
-msgstr "Завдання"
+#: ui/evolution-mail-list.xml.h:29
+#, fuzzy
+msgid "_Threaded Message List"
+msgstr "Переслати це пов╕домлення"
 
-#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-mail-message.xml.h:1
 #, fuzzy
-msgid "_Unread Item (FIXME)"
-msgstr "Контакт"
+msgid "Apply filter rules to the selected messages"
+msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:1
+#: ui/evolution-mail-message.xml.h:2
 #, fuzzy
-msgid "Add Service"
-msgstr "Додати джерело"
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "В╕дпов╕сти вс╕м отримувачам цього пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:2
-msgid "Add a new service to the Executive Summary"
+#: ui/evolution-mail-message.xml.h:3
+msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ui/evolution-executive-summary.xml.h:3
+#: ui/evolution-mail-message.xml.h:4
 #, fuzzy
-msgid "Create a new email"
-msgstr "Створити новий контакт"
+msgid "Compose a reply to the sender of the selected message"
+msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
 
-#: ui/evolution-executive-summary.xml.h:4
-msgid "Executive Summary Settings..."
-msgstr ""
+#: ui/evolution-mail-message.xml.h:6
+msgid "Copy selected messages to another folder"
+msgstr "Скоп╕ювати вибран╕ пов╕домлення у ╕ншу теку"
 
-#: ui/evolution-executive-summary.xml.h:5
-msgid "New Mail"
-msgstr "Нова пошта"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Create _Virtual Folder From Message"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:2
-msgid "Apply any new filters to the mail in this box"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:3
-msgid "Change the properties of this folder"
-msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
+#: ui/evolution-mail-message.xml.h:9
+msgid "Create a rule to filter messages to these recipients"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:4
-msgid "Compose"
-msgstr "П╕дготувати"
+#: ui/evolution-mail-message.xml.h:10
+msgid "Create a rule to filter messages to this mailing list"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:5
-msgid "Compose a new message"
-msgstr "Скласти нове пов╕домлення"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Create a rule to filter messages with this subject"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:6
-msgid "Configure Folder..."
-msgstr "Налаштувати теку..."
+#: ui/evolution-mail-message.xml.h:12
+#, fuzzy
+msgid "Create a virtual folder for these recipients"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:8
-msgid "Copy message to a new folder"
-msgstr "Скоп╕ювати пов╕домлення у нову теку"
+#: ui/evolution-mail-message.xml.h:13
+#, fuzzy
+msgid "Create a virtual folder for this mailing list"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Скоп╕ювати вибран╕ пов╕домлення у ╕ншу теку"
+#: ui/evolution-mail-message.xml.h:14
+#, fuzzy
+msgid "Create a virtual folder for this sender"
+msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:10
-msgid "Create _Virtual Folder From Message"
+#: ui/evolution-mail-message.xml.h:15
+#, fuzzy
+msgid "Create a virtual folder for this subject"
 msgstr "Створити в╕ртуальну теку з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:12
-msgid "Delete the selected messages"
+#: ui/evolution-mail-message.xml.h:17
+#, fuzzy
+msgid "Display the next important message"
+msgstr "В╕дпов╕сти в╕дправнику цього пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:18
+#, fuzzy
+msgid "Display the next message"
+msgstr "Перейти до наступного пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:19
+#, fuzzy
+msgid "Display the next unread message"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:14
-msgid "Display all of the message headers"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
-msgid "Edit Message"
-msgstr "Виправити пов╕домлення"
-
-#: ui/evolution-mail.xml.h:16
-msgid "Edit the current message"
-msgstr "Виправити поточне пов╕домлення"
+#: ui/evolution-mail-message.xml.h:21
+#, fuzzy
+msgid "Display the previous important message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:17
-msgid "Empty _Trash"
-msgstr "Спорожнити см╕тник"
+#: ui/evolution-mail-message.xml.h:22
+#, fuzzy
+msgid "Display the previous message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:18
-msgid "Expunge"
-msgstr "Викреслити"
+#: ui/evolution-mail-message.xml.h:23
+#, fuzzy
+msgid "Display the previous unread message"
+msgstr "Перейти до попереднього пов╕домлення"
 
-#: ui/evolution-mail.xml.h:19
-msgid "Filter on Mailing _List"
+#: ui/evolution-mail-message.xml.h:24
+#, fuzzy
+msgid "Filter on Mailing _List..."
 msgstr "Ф╕льтр списку розсилки"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Filter on Se_nder"
+#: ui/evolution-mail-message.xml.h:25
+#, fuzzy
+msgid "Filter on Se_nder..."
 msgstr "Ф╕льтр в╕дправника"
 
-#: ui/evolution-mail.xml.h:21
-msgid "Filter on _Recipients"
+#: ui/evolution-mail-message.xml.h:26
+#, fuzzy
+msgid "Filter on _Recipients..."
 msgstr "Ф╕льтр отримувач╕в"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Filter on _Subject"
+#: ui/evolution-mail-message.xml.h:27
+#, fuzzy
+msgid "Filter on _Subject..."
 msgstr "Ф╕льтр теми"
 
-#: ui/evolution-mail.xml.h:23
-msgid "Finaly remove all mails tagged for deletion"
-msgstr "Остаточно видалити пошту в╕дм╕чену для стирання"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Force images in HTML mail to be loaded"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:24
-msgid "Forget _Passwords"
-msgstr "Забути парол╕"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Forward"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward As"
 msgstr "Переслати як"
 
-#: ui/evolution-mail.xml.h:27
+#: ui/evolution-mail-message.xml.h:31
 #, fuzzy
-msgid "Forward inline"
-msgstr "Переслати"
-
-#: ui/evolution-mail.xml.h:28
-msgid "Forward the selected mail to someone"
-msgstr ""
+msgid "Forward _Attached"
+msgstr "Переслати як"
 
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-mail-message.xml.h:32
 #, fuzzy
-msgid "Forward this message in-line with your mail, so you can edit it"
-msgstr "Переслати пов╕домлення без теми"
-
-#: ui/evolution-mail.xml.h:31
-msgid "Full _Headers"
-msgstr "Повн╕ заголовки"
-
-#: ui/evolution-mail.xml.h:32
-msgid "Go to the next message"
-msgstr "Перейти до наступного пов╕домлення"
-
-#: ui/evolution-mail.xml.h:33
-msgid "Go to the previous message"
-msgstr "Перейти до попереднього пов╕домлення"
-
-#: ui/evolution-mail.xml.h:34
-msgid "Hide Deleted Messages"
-msgstr "Прибрати стерт╕ пов╕домлення"
+msgid "Forward _Inline"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:35
-msgid "Hide S_elected Messages"
-msgstr "Прибрати вибран╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Forward _Quoted"
+msgstr "Переслати"
 
-#: ui/evolution-mail.xml.h:36
-msgid "Hide _Deleted Messages"
-msgstr "Прибрати стерт╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:34
+#, fuzzy
+msgid "Forward the selected message in the body of a new message"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:37
-msgid "Hide _Read messages"
-msgstr "Прибрати прочитан╕ пов╕домлення"
+#: ui/evolution-mail-message.xml.h:35
+#, fuzzy
+msgid "Forward the selected message quoted like a reply"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:38
-msgid "Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: ui/evolution-mail-message.xml.h:36
+#, fuzzy
+msgid "Forward the selected message to someone"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.xml.h:39
-msgid "Manage _Subscriptions..."
-msgstr "Керування передплатами..."
+#: ui/evolution-mail-message.xml.h:37
+#, fuzzy
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:41
-msgid "Mark All as R_ead"
-msgstr "Позначити вс╕ прочитаними"
+#: ui/evolution-mail-message.xml.h:39
+#, fuzzy
+msgid "Load _Images"
+msgstr "Переслан╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:42
-msgid "Mark As Read"
-msgstr "Позначити прочитаним"
+#: ui/evolution-mail-message.xml.h:41
+#, fuzzy
+msgid "Mark as I_mportant"
+msgstr "Важливо"
 
-#: ui/evolution-mail.xml.h:43
-msgid "Mark As U_nread"
+#: ui/evolution-mail-message.xml.h:43
+#, fuzzy
+msgid "Mark as Unimp_ortant"
 msgstr "Позначити непрочитаним"
 
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail-message.xml.h:44
 #, fuzzy
 msgid "Mark the selected messages as having been read"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail-message.xml.h:45
+#, fuzzy
+msgid "Mark the selected messages as important"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail-message.xml.h:47
+#, fuzzy
+msgid "Mark the selected messages as unimportant"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Mark the selected messages for deletion"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:49
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail.xml.h:48
-msgid "Move message to a new folder"
-msgstr "Перенести пов╕домлення у нову теку"
-
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail-message.xml.h:50
 #, fuzzy
 msgid "Move selected messages to another folder"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.xml.h:51
-msgid "Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Next"
+msgstr "Дал╕"
 
-#: ui/evolution-mail.xml.h:52
-msgid "Open the current message in a new window"
+#: ui/evolution-mail-message.xml.h:52
+#, fuzzy
+msgid "Next Important Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:53
+#, fuzzy
+msgid "Next Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Next Thread"
+msgstr "Вибрати г╕лку"
+
+#: ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Next Unread Message"
+msgstr "Наступне пов╕домлення"
+
+#: ui/evolution-mail-message.xml.h:56
+#, fuzzy
+msgid "Open the selected message in a new window"
 msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
 
-#: ui/evolution-mail.xml.h:58
-msgid "Print Preview of message..."
-msgstr "Перегляд друку пов╕домлення..."
+#: ui/evolution-mail-message.xml.h:57
+#, fuzzy
+msgid "Open the selected message in the composer to re-send it"
+msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:59
-msgid "Print message to the printer"
-msgstr "Надрукувати пов╕домлення на принтер╕"
+#: ui/evolution-mail-message.xml.h:58
+msgid "Previews the message to be printed"
+msgstr "Переглянути пов╕домлення, що буде надрукувано"
 
-#: ui/evolution-mail.xml.h:60
-msgid "Print message..."
-msgstr "Надрукувати пов╕домлення..."
+#: ui/evolution-mail-message.xml.h:59
+msgid "Previous"
+msgstr "Попередн╓"
 
-#: ui/evolution-mail.xml.h:63
-msgid "Redirect (FIXME: implement me)"
-msgstr "Перенаправити"
+#: ui/evolution-mail-message.xml.h:60
+#, fuzzy
+msgid "Previous Important Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:67
-msgid "Reply to all"
-msgstr "В╕дпов╕сти вс╕м"
+#: ui/evolution-mail-message.xml.h:61
+#, fuzzy
+msgid "Previous Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:69
-msgid "Reply to sender"
-msgstr "В╕дпов╕сти в╕дправнику"
+#: ui/evolution-mail-message.xml.h:62
+#, fuzzy
+msgid "Previous Unread Message"
+msgstr "Попередн╓ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
-msgid "S_earch Message"
-msgstr "Серверне пов╕домлення:"
+msgid "Print Message..."
+msgstr "Надрукувати пов╕домлення..."
 
-#: ui/evolution-mail.xml.h:72
-msgid "S_ource"
-msgstr "Джерело"
+#: ui/evolution-mail-message.xml.h:65
+#, fuzzy
+msgid "Print Preview..."
+msgstr "Перегляд друку"
 
-#: ui/evolution-mail.xml.h:73
-msgid "Save the message into a new file"
-msgstr "Зберегти пов╕домлення у новому файл╕"
+#: ui/evolution-mail-message.xml.h:66
+#, fuzzy
+msgid "Print this message"
+msgstr "Надрукувати пов╕домлення"
 
-#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
-msgid "Select _All"
-msgstr "Вибрати все"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Reply"
+msgstr "В╕дпов╕сти"
 
-#: ui/evolution-mail.xml.h:76
-msgid "Select _Thread"
-msgstr "Вибрати г╕лку"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Reply to All"
+msgstr "В╕дпов╕сти вс╕м"
 
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail-message.xml.h:71
 #, fuzzy
-msgid "Send / Receive"
-msgstr "Дата отримання"
+msgid "S_earch Message"
+msgstr "Серверне пов╕домлення:"
+
+#: ui/evolution-mail-message.xml.h:72
+#, fuzzy
+msgid "Save the message as a text file"
+msgstr "Зберегти пов╕домлення у новому файл╕"
 
-#: ui/evolution-mail.xml.h:78
-msgid "Send a reply to the person who sent you this mail"
+#: ui/evolution-mail-message.xml.h:73
+msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:79
-msgid "Send a single mail in reply to all the selected mail"
+#: ui/evolution-mail-message.xml.h:74
+msgid "Show Email _Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail-message.xml.h:75
 #, fuzzy
-msgid ""
-"Send queued mail\n"
-"    and retrieve new mail"
-msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+msgid "Show Full _Headers"
+msgstr "Повн╕ заголовки"
 
-#: ui/evolution-mail.xml.h:82
-msgid "Send queued mail and retrieve new mail"
-msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+#: ui/evolution-mail-message.xml.h:76
+#, fuzzy
+msgid "Show message in the normal style"
+msgstr ""
+"Дату потр╕бно вводити у такому формат╕: \n"
+"\n"
+"%s"
 
-#: ui/evolution-mail.xml.h:83
-msgid "Show _All"
-msgstr "Показати все"
+#: ui/evolution-mail-message.xml.h:77
+#, fuzzy
+msgid "Show message with all email headers"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-mail.xml.h:85
+#: ui/evolution-mail-message.xml.h:78
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Переслати це пов╕домлення"
+msgid "Show the raw email source of the message"
+msgstr "Долучити файл до пов╕домлення"
 
-#: ui/evolution-mail.xml.h:86
+#: ui/evolution-mail-message.xml.h:79
 #, fuzzy
 msgid "Un-delete the selected messages"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: ui/evolution-mail.xml.h:87
-msgid "Undelete"
-msgstr "В╕дновити"
+#: ui/evolution-mail-message.xml.h:80
+#, fuzzy
+msgid "VFolder on Mailing _List..."
+msgstr "Ф╕льтр списку розсилки"
 
-#: ui/evolution-mail.xml.h:92
-msgid "View Raw Message Source"
-msgstr ""
+#: ui/evolution-mail-message.xml.h:81
+#, fuzzy
+msgid "VFolder on Se_nder..."
+msgstr "В╕ртуальна тека в╕дправника"
 
-#: ui/evolution-mail.xml.h:93
+#: ui/evolution-mail-message.xml.h:82
 #, fuzzy
-msgid "Virtual Folder _Editor..."
-msgstr "Редактор в╕ртуальних тек"
+msgid "VFolder on _Recipients..."
+msgstr "В╕ртуальна тека отримувач╕в"
 
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail-message.xml.h:83
+#, fuzzy
+msgid "VFolder on _Subject..."
+msgstr "В╕ртуальна тека теми"
+
+#: ui/evolution-mail-message.xml.h:84
 msgid "_Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: ui/evolution-mail.xml.h:95
-msgid "_Attachment"
-msgstr "Долучення"
+#: ui/evolution-mail-message.xml.h:85
+#, fuzzy
+msgid "_Copy to Folder"
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution-mail.xml.h:97
+#: ui/evolution-mail-message.xml.h:86
 #, fuzzy
 msgid "_Create Filter From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: ui/evolution-mail.xml.h:99
-msgid "_Expunge"
-msgstr "Викреслити"
-
-#: ui/evolution-mail.xml.h:100
-msgid "_Filters..."
-msgstr "Ф╕льтри..."
-
-#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:32
-msgid "_Folder"
-msgstr "Тека"
+#: ui/evolution-mail-message.xml.h:88
+#, fuzzy
+msgid "_Forward Message"
+msgstr "Переслан╕ пов╕домлення"
 
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail-message.xml.h:89
 #, fuzzy
-msgid "_Inline"
-msgstr "Покажчик"
+msgid "_Message Display"
+msgstr "Пов╕домлення"
 
-#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: ui/evolution-mail-message.xml.h:90
+#, fuzzy
+msgid "_Move to Folder"
+msgstr "Перенести в теку"
 
-#: ui/evolution-mail.xml.h:105
-msgid "_Mail Message"
-msgstr "В╕д╕слати пов╕домлення"
+#: ui/evolution-mail-message.xml.h:91
+#, fuzzy
+msgid "_Normal Display"
+msgstr "День"
 
-#: ui/evolution-mail.xml.h:106
-msgid "_Mail Settings..."
-msgstr "Установки пошти..."
+#: ui/evolution-mail-message.xml.h:92
+#, fuzzy
+msgid "_Open Message"
+msgstr "В╕д╕слати пов╕домлення знову"
 
-#: ui/evolution-mail.xml.h:108
+#: ui/evolution-mail-message.xml.h:93
 #, fuzzy
-msgid "_Open Selected Items"
-msgstr "В╕дкрити завдання"
+msgid "_Re-send Message"
+msgstr "В╕д╕слати пов╕домлення знову"
 
-#: ui/evolution-mail.xml.h:110
-msgid "_Quoted"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрити це в╕кно"
 
-#: ui/evolution-mail.xml.h:111
-msgid "_Reply"
-msgstr "В╕дпов╕сти"
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:10
+msgid "Customi_ze Toolbars..."
+msgstr ""
 
-#: ui/evolution-mail.xml.h:112
-msgid "_Resend Messages"
-msgstr "В╕д╕слати пов╕домлення знову"
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution.xml.h:11
+msgid "Customize"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:114
-msgid "_Save Message As..."
-msgstr "Зберегти пов╕домлення як..."
+#: ui/evolution-mail-messagedisplay.xml.h:5 ui/evolution.xml.h:12
+msgid "Customize toolbars"
+msgstr ""
 
-#: ui/evolution-mail.xml.h:115
-#, fuzzy
-msgid "_Send / Receive"
-msgstr "Дата отримання"
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-signature-editor.xml.h:5 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:42
+msgid "_Close"
+msgstr "Закрити"
 
-#: ui/evolution-mail.xml.h:116
-msgid "_Threaded"
-msgstr ""
+#: ui/evolution-mail-messagedisplay.xml.h:12
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:63
+msgid "_View"
+msgstr "Вид"
 
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Долучити"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Закрити поточний файл"
 
 #: ui/evolution-message-composer.xml.h:5
+#, fuzzy
+msgid "Delete all but signature"
+msgstr "Стерти контакт"
+
+#: ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "Зашифрувати це пов╕домлення PGP"
 
-#: ui/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:8
 msgid "F_ormat"
 msgstr "Формат"
 
-#: ui/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:9
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:8
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Inline Text _File..."
+msgstr "Вставити текстовий файл..."
+
+#: ui/evolution-message-composer.xml.h:11
 msgid "Insert a file as text into the message"
 msgstr "Вставити файл як текст у пов╕домлення"
 
-#: ui/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:12
 msgid "Insert text file..."
 msgstr "Вставити текстовий файл..."
 
-#: ui/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:14
 msgid "Open a file"
 msgstr "В╕дкрити файл"
 
-#: ui/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:15
 msgid "PGP Encrypt"
 msgstr "Шифрування PGP"
 
-#: ui/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:16
 msgid "PGP Sign"
 msgstr "П╕дпис PGP"
 
 #: ui/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Save _Draft"
-msgstr "Чорновик"
+msgid "S/MIME Encrypt"
+msgstr "Шифрування PGP"
 
 #: ui/evolution-message-composer.xml.h:18
-msgid "Save in _folder... (FIXME)"
-msgstr "Зберегти в тец╕..."
+msgid "S/MIME Sign"
+msgstr ""
 
 #: ui/evolution-message-composer.xml.h:19
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:243
+msgid "Save"
+msgstr "Зберегти"
+
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save As"
+msgstr "Зберегти як"
+
+#: ui/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save _Draft"
+msgstr "Чорновик"
+
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Зберегти в тец╕..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-signature-editor.xml.h:4
+msgid "Save the current file"
+msgstr "Зберегти поточний файл"
+
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Зберегти поточний файл з ╕ншою назвою"
 
-#: ui/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "В╕дправити"
 
-#: ui/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "В╕дправити п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "В╕дправити п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "В╕д╕слати пошту в формат╕ HTML"
 
-#: ui/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "В╕д╕слати пов╕домлення п╕зн╕ше"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Send the message now"
-msgstr "В╕д╕слати пов╕домлення негайно"
-
-#: ui/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send this message now"
 msgstr "Стерти це пов╕домлення негайно"
 
-#: ui/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Показати / прибрати долучення"
 
-#: ui/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Показати долучення"
 
-#: ui/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Sign this message with your PGP key"
 msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
 
-#: ui/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "П╕дписати це пов╕домлення вашим ключем PGP"
+
+#: ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "Toggles whether the CC field is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:40
 #, fuzzy
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-message-composer.xml.h:42
+#, fuzzy
+msgid "_Attachment..."
+msgstr "Долучення"
+
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Bcc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Cc Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:6
+msgid "_Debug"
+msgstr "Налагодження"
+
+#: ui/evolution-message-composer.xml.h:47
+#, fuzzy
+msgid "_Delete all"
+msgstr "Стерти"
+
+#: ui/evolution-message-composer.xml.h:50
 msgid "_From Field"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:51
+#: ui/evolution-signature-editor.xml.h:10
 msgid "_Insert"
 msgstr "Вставити"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Insert text file... (FIXME)"
-msgstr "Вставити текстовий файл..."
-
-#: ui/evolution-message-composer.xml.h:49
+#: ui/evolution-message-composer.xml.h:52
 msgid "_Open..."
 msgstr "В╕дкрити..."
 
-#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-message-composer.xml.h:53
 #, fuzzy
 msgid "_Reply-To Field"
 msgstr "В╕дпов╕дати на:"
 
-#: ui/evolution-message-composer.xml.h:52
+#: ui/evolution-message-composer.xml.h:55
 msgid "_Security"
 msgstr "Безпека"
 
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:51
+msgid "_Help"
+msgstr "Дов╕дка"
+
 #: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Додати теку до вашого списку передплачених тек"
 
-#: ui/evolution-subscribe.xml.h:3
+#: ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "Тека"
 
-#: ui/evolution-subscribe.xml.h:4
+#: ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Оновити список"
 
-#: ui/evolution-subscribe.xml.h:5
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Оновити список тек"
 
-#: ui/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "Передплатити"
 
-#: ui/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "Припинити передплату"
 
-#: ui/evolution-task-editor-dialog.xml.h:5
+#: ui/evolution-task-editor.xml.h:1
 #, fuzzy
-msgid "Assig_n Task (FIXME)"
-msgstr "Прив'язати завдання"
-
-#: ui/evolution-task-editor-dialog.xml.h:24
-msgid "Find Again"
-msgstr "Шукати дал╕"
-
-#: ui/evolution-task-editor-dialog.xml.h:29
-msgid "Meeting Re_quest (FIXME)"
-msgstr ""
-
-#: ui/evolution-task-editor-dialog.xml.h:43
-msgid "Redo"
-msgstr "Повторити"
-
-#: ui/evolution-task-editor-dialog.xml.h:44
-msgid "Redo the undone action"
-msgstr "Повторити в╕дм╕нену д╕ю"
-
-#: ui/evolution-task-editor-dialog.xml.h:45
-msgid "Replace"
-msgstr "Зам╕нити"
-
-#: ui/evolution-task-editor-dialog.xml.h:46
-msgid "Replace a string"
-msgstr "Зам╕нити рядок"
+msgid "Cancel Task"
+msgstr "Нове завдання"
 
-#: ui/evolution-task-editor-dialog.xml.h:47
-msgid "Reply to A_ll (FIXME)"
-msgstr "В╕дпов╕сти вс╕м"
+#: ui/evolution-task-editor.xml.h:3
+#, fuzzy
+msgid "Delegate Task"
+msgstr "Стерти завдання"
 
-#: ui/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor.xml.h:7
 #, fuzzy
-msgid "S_end Status Report (FIXME)"
-msgstr "Контакт"
+msgid "Re_fresh Task"
+msgstr "Оновити список"
 
-#: ui/evolution-task-editor-dialog.xml.h:49
-msgid "S_kip Occurrence (FIXME)"
+#: ui/evolution-tasks.xml.h:2
+msgid "Configure the task view's settings"
 msgstr ""
 
-#: ui/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-tasks.xml.h:3
 #, fuzzy
-msgid "Save the task and close the dialog box"
-msgstr "Зберегти контакт ╕ закрити д╕алог"
-
-#: ui/evolution-task-editor-dialog.xml.h:55
-msgid "Search again for the same string"
-msgstr "Шукати зновуй той же рядок"
-
-#: ui/evolution-task-editor-dialog.xml.h:56
-msgid "Search for a string"
-msgstr "Пошук рядка"
-
-#: ui/evolution-task-editor-dialog.xml.h:61
-msgid "Undo"
-msgstr "В╕дм╕нити"
-
-#: ui/evolution-task-editor-dialog.xml.h:62
-msgid "Undo the last action"
-msgstr "В╕дм╕нити останню операц╕ю"
-
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
-
-#: ui/evolution-task-editor-dialog.xml.h:77
-msgid "_Mark Complete (FIXME)"
-msgstr "Позначити виконаним"
-
-#: ui/evolution-task-editor-dialog.xml.h:84
-msgid "_Reply (FIXME)"
-msgstr "В╕дпов╕сти"
+msgid "Copy selected task"
+msgstr "В╕дкрити завдання"
 
-#: ui/evolution-tasks.xml.h:2
+#: ui/evolution-tasks.xml.h:4
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: ui/evolution-tasks.xml.h:3
+#: ui/evolution-tasks.xml.h:5
+#, fuzzy
+msgid "Cut selected task"
+msgstr "Стерти завдання"
+
+#: ui/evolution-tasks.xml.h:7
+#, fuzzy
+msgid "Delete selected tasks"
+msgstr "Стерти завдання"
+
+#: ui/evolution-tasks.xml.h:8
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: ui/evolution-tasks.xml.h:5
+#: ui/evolution-tasks.xml.h:9
+#, fuzzy
+msgid "Paste task from the clipboard"
+msgstr "Вставити буфер обм╕ну"
+
+#: ui/evolution-tasks.xml.h:12
 msgid "Save task as something else"
 msgstr "Зберегти завдання як щось ╕нше"
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Tasks Preferences..."
-msgstr "Параметри завдань..."
+#: ui/evolution-tasks.xml.h:13
+#, fuzzy
+msgid "Tasks Settings"
+msgstr "Установки пошти..."
 
-#: ui/evolution-tasks.xml.h:9
+#: ui/evolution-tasks.xml.h:19
 msgid "_Task"
 msgstr "Завдання"
 
@@ -8601,135 +11408,220 @@ msgstr "Завдання"
 msgid "About Evolution..."
 msgstr "Про Evolution..."
 
+#: ui/evolution.xml.h:2
+#, fuzzy
+msgid "Add to _Shortcut Bar"
+msgstr "Панель ярлик╕в"
+
 #: ui/evolution.xml.h:3
-msgid "Close this window"
-msgstr "Закрити це в╕кно"
+#, fuzzy
+msgid "Change the name of this folder"
+msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: ui/evolution.xml.h:4
-msgid "Customi_ze Toolbars..."
-msgstr ""
+#: ui/evolution.xml.h:6
+#, fuzzy
+msgid "Copy this folder"
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution.xml.h:5
-msgid "Customize"
-msgstr ""
+#: ui/evolution.xml.h:7
+#, fuzzy
+msgid "Create _New Folder..."
+msgstr "Створення ново╖ теки"
 
-#: ui/evolution.xml.h:6
-msgid "Customize toolbars"
+#: ui/evolution.xml.h:8
+msgid "Create a link to this folder in the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Створення ново╖ теки"
+
+#: ui/evolution.xml.h:13
+#, fuzzy
+msgid "Delete this folder"
+msgstr "Стерти цей елемент"
+
+#: ui/evolution.xml.h:14
 msgid "Display a different folder"
 msgstr "В╕добразити ╕ншу теку"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:15
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ui/evolution.xml.h:17
 msgid "Evolution _Window"
 msgstr "В╕кно Evolution"
 
-#: ui/evolution.xml.h:10
-#, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
-
-#: ui/evolution.xml.h:11
+#: ui/evolution.xml.h:18
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:19
 msgid "Getting _Started"
 msgstr "Розпочато"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:20
 msgid "Import an external file format"
 msgstr ""
 
-#: ui/evolution.xml.h:14
-msgid "Main toolbar"
-msgstr "Головна панель ╕нструмент╕в"
+#: ui/evolution.xml.h:22
+#, fuzzy
+msgid "Move this folder to another place"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:24
+#, fuzzy
+msgid "Open in New _Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: ui/evolution.xml.h:25
+#, fuzzy
+msgid "Open this folder in an other window"
+msgstr "В╕дкрити поточне пов╕домлення у новому в╕кн╕"
+
+#: ui/evolution.xml.h:26
 msgid "Show information about Evolution"
 msgstr "Показати ╕нформац╕ю про Evolution"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "П╕дготувати зв╕т про помилку"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "В╕д╕слати зв╕т про помилку"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:29
 msgid "Submit bug report using Bug Buddy."
 msgstr "В╕д╕слати зв╕т про помилку використовуючи Bug Buddy"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:30
+#, fuzzy
+msgid "Toggle"
+msgstr "Моб╕льний"
+
+#: ui/evolution.xml.h:31
 msgid "Toggle whether to show the folder bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Перемикнути стан показу панел╕ тек"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "Toggle whether we are working offline."
+msgstr "Перемикнути стан показу панел╕ тек"
+
+#: ui/evolution.xml.h:34
 msgid "Using the C_ontact Manager"
 msgstr "Використання менеджера контакт╕в"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:35
 msgid "Using the _Calendar"
 msgstr "Використання календаря"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:36
 msgid "Using the _Mailer"
 msgstr "Використання поштово╖ програми"
 
-#: ui/evolution.xml.h:24
-#, fuzzy
-msgid "Work Offline"
-msgstr "Перенесення"
+#: ui/evolution.xml.h:37
+msgid "View the selected folder"
+msgstr "Показати вибрану теки"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:39
 msgid "_About Evolution..."
 msgstr "Про Evolution..."
 
-#: ui/evolution.xml.h:26
-msgid "_Actions"
-msgstr "Д╕╖"
+#: ui/evolution.xml.h:41
+msgid "_Appointment (FIXME)"
+msgstr "Зустр╕ч"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:43
+msgid "_Contact (FIXME)"
+msgstr "Контакт"
+
+#: ui/evolution.xml.h:44
+#, fuzzy
+msgid "_Copy..."
+msgstr "Скоп╕ювати"
+
+#: ui/evolution.xml.h:49
 msgid "_Folder Bar"
 msgstr "Панель тек"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:50
 msgid "_Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:52
 msgid "_Import file..."
 msgstr "╤мпортувати файл..."
 
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:53
 msgid "_Index"
 msgstr "Покажчик"
 
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:54
 msgid "_Mail message"
 msgstr "Поштову пов╕домлення"
 
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:55
+#, fuzzy
+msgid "_Move..."
+msgstr "Перенести"
+
+#: ui/evolution.xml.h:56
+msgid "_New"
+msgstr "Новий"
+
+#: ui/evolution.xml.h:57
 msgid "_New Folder"
 msgstr "Нова тека"
 
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:58
+#, fuzzy
+msgid "_Rename..."
+msgstr "В╕дкрити..."
+
+#: ui/evolution.xml.h:59
+#, fuzzy
+msgid "_Shortcut"
+msgstr "Панель ярлик╕в"
+
+#: ui/evolution.xml.h:60
 msgid "_Shortcut Bar"
 msgstr "Панель ярлик╕в"
 
+#: ui/evolution.xml.h:61
+msgid "_Task (FIXME)"
+msgstr "Завдання"
+
+#: ui/evolution.xml.h:64
+#, fuzzy
+msgid "_Work Offline"
+msgstr "Перенесення"
+
+#: ui/my-evolution.xml.h:1
+msgid "Change the settings for My Evolution"
+msgstr ""
+
+#: ui/my-evolution.xml.h:4
+#, fuzzy
+msgid "_My Evolution Settings..."
+msgstr "Установки пошти..."
+
 #: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
+#, fuzzy
+msgid "Address Cards"
 msgstr "Адресн╕ картки"
 
 #: views/addressbook/galview.xml.h:2
@@ -8763,9 +11655,12 @@ msgstr ""
 "\n"
 "Категор╕╖: "
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr ""
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:393
 msgid "Busy"
@@ -8839,42 +11734,34 @@ msgstr "Час завершення з╕брання:"
 msgid "All Attendees"
 msgstr "Весь супров╕д"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#: widgets/menus/gal-view-menus.c:177
+#: widgets/menus/gal-view-menus.c:218
 #, fuzzy
 msgid "_Current View"
 msgstr "Поточний р╕к (%Y)"
 
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:259
 msgid "Define Views"
 msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:428
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
+#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:423
 msgid "Now"
 msgstr "зараз"
 
-#: widgets/misc/e-cell-date-edit.c:245
+#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:429
+msgid "Today"
+msgstr "сьогодн╕"
+
+#: widgets/misc/e-cell-date-edit.c:248
 msgid "OK"
 msgstr "Гаразд"
 
-#: widgets/misc/e-cell-date-edit.c:726
+#: widgets/misc/e-cell-date-edit.c:731
 #, fuzzy, c-format
 msgid "The time must be in the format: %s"
 msgstr ""
@@ -8882,22 +11769,108 @@ msgstr ""
 "\n"
 "%s"
 
+#: widgets/misc/e-charset-picker.c:59
+msgid "Baltic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:60
+msgid "Central European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:61
+msgid "Chinese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:62
+msgid "Cyrillic"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:63
+#, fuzzy
+msgid "Greek"
+msgstr "тиждень"
+
+#: widgets/misc/e-charset-picker.c:64
+msgid "Japanese"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:65
+msgid "Korean"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:66
+#, fuzzy
+msgid "Turkish"
+msgstr "Завдання"
+
+#: widgets/misc/e-charset-picker.c:67
+msgid "Unicode"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:68
+msgid "Western European"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:85
+#, fuzzy
+msgid "Traditional"
+msgstr "Орган╕зац╕я"
+
+#: widgets/misc/e-charset-picker.c:86 widgets/misc/e-charset-picker.c:87
+msgid "Simplified"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:91
+msgid "Ukrainian"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:102
+#, fuzzy
+msgid "New"
+msgstr "Новий"
+
+#: widgets/misc/e-charset-picker.c:160
+#, fuzzy, c-format
+msgid "Unknown character set: %s"
+msgstr "Нев╕дома помилка: %s"
+
+#: widgets/misc/e-charset-picker.c:202
+msgid "Enter the character set to use"
+msgstr ""
+
+#: widgets/misc/e-charset-picker.c:277
+#, fuzzy
+msgid "Other..."
+msgstr "╤нша"
+
+#: widgets/misc/e-charset-picker.c:394
+msgid "Character Encoding"
+msgstr ""
+
 #: widgets/misc/e-clipped-label.c:112
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:157
+#, fuzzy
+msgid "Search Editor"
+msgstr "Редактор контакт╕в"
+
+#: widgets/misc/e-filter-bar.c:173
 #, fuzzy
 msgid "Save Search"
 msgstr "Пошук"
 
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:241
 msgid "Advanced Search"
 msgstr "Удосконалений пошук"
 
-#: widgets/misc/e-filter-bar.c:317
-#, fuzzy
-msgid "Advanced ..."
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "Показати все"
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
 msgstr "Додатково..."
 
 #: widgets/misc/e-messagebox.c:152
@@ -8908,6 +11881,11 @@ msgstr "╤нформац╕я"
 msgid "Warning"
 msgstr "Попередження"
 
+#: widgets/misc/e-messagebox.c:166
+#, fuzzy
+msgid "Error"
+msgstr "Без помилок"
+
 #: widgets/misc/e-messagebox.c:173
 msgid "Question"
 msgstr "Питання"
@@ -8921,7 +11899,7 @@ msgstr "Пов╕домлення"
 msgid "Don't show this message again."
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
 msgid "Sear_ch"
 msgstr "Пошук"
 
@@ -8944,3 +11922,522 @@ msgstr "init_corba(): не вдалось ╕н╕ц╕ал╕зувати GNOME"
 #: wombat/wombat.c:198
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#, fuzzy
+#~ msgid "Set task view preferences"
+#~ msgstr "Параметри календаря"
+
+#, fuzzy
+#~ msgid "TasksPreferences"
+#~ msgstr "Параметри завдань..."
+
+#~ msgid "C_ontacts..."
+#~ msgstr "Зв'язки..."
+
+#~ msgid "_Company:"
+#~ msgstr "Компан╕я:"
+
+#~ msgid "As _Minicards"
+#~ msgstr "Як _Minicards"
+
+#~ msgid "SASL"
+#~ msgstr "SASL"
+
+#~ msgid "Find..."
+#~ msgstr "Шукати..."
+
+#~ msgid "label26"
+#~ msgstr "label26"
+
+#~ msgid "Open calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "Save calendar"
+#~ msgstr "Зберегти календар"
+
+#~ msgid "<b>Error loading calendar:<br>Method not supported"
+#~ msgstr "<b>Помилка завантаження календаря:<br>Метод не п╕дтриму╓ться"
+
+#~ msgid "Colors"
+#~ msgstr "Кольори"
+
+#~ msgid "Highlight"
+#~ msgstr "П╕дсв╕тка"
+
+#~ msgid "TaskPad"
+#~ msgstr "Панель завдань"
+
+#~ msgid "Visual Alarms"
+#~ msgstr "В╕зуальн╕ си╜нали"
+
+#~ msgid "Work week"
+#~ msgstr "Робочий тиждень"
+
+#~ msgid "Edit Task"
+#~ msgstr "Виправити завдання"
+
+#~ msgid "Percent complete"
+#~ msgstr "В╕дсоток виконання"
+
+#~ msgid "Mark the task complete"
+#~ msgstr "Позначити завдання як виконане"
+
+#~ msgid "Edit this task..."
+#~ msgstr "Виправити це завдання..."
+
+#~ msgid "Edit the task"
+#~ msgstr "Виправити завдання"
+
+#, fuzzy
+#~ msgid "Go to Today"
+#~ msgstr "сьогодн╕"
+
+#, fuzzy
+#~ msgid "Component successfully updated."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#, fuzzy
+#~ msgid "I couldn't update your calendar store."
+#~ msgstr "Не вдалося створити календар в \"%s\""
+
+#, fuzzy
+#~ msgid "Component successfully deleted."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#, fuzzy
+#~ msgid "I don't recognize this type of calendar component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#~ msgid "Add to Calendar"
+#~ msgstr "Додати до календаря"
+
+#~ msgid "Update Calendar"
+#~ msgstr "Поновити календар"
+
+#, fuzzy
+#~ msgid "Attendee address"
+#~ msgstr "Весь супров╕д"
+
+#, fuzzy
+#~ msgid "Attendees: "
+#~ msgstr "Весь супров╕д"
+
+#~ msgid ""
+#~ "Cancel\n"
+#~ "Meeting"
+#~ msgstr ""
+#~ "Скасувати\n"
+#~ "зустр╕ч"
+
+#, fuzzy
+#~ msgid "Organizer: "
+#~ msgstr "Ор╕╓нтац╕я:"
+
+#~ msgid "Show a dialog"
+#~ msgstr "Показати д╕алог"
+
+#~ msgid "Appointment Basics"
+#~ msgstr "П╕дстави зустр╕ч╕"
+
+#~ msgid "_Starting date:"
+#~ msgstr "Дата початку:"
+
+#~ msgid "label21"
+#~ msgstr "label26"
+
+#~ msgid "label55"
+#~ msgstr "label26"
+
+#~ msgid "Summary contains"
+#~ msgstr "Зведення м╕стить"
+
+#~ msgid "Comment contains"
+#~ msgstr "Коментар м╕стить"
+
+#, fuzzy
+#~ msgid "Has category"
+#~ msgstr ""
+#~ "\n"
+#~ "Категор╕╖: "
+
+#, fuzzy
+#~ msgid "Could not test lock file for %s: %s"
+#~ msgstr "Створити новий календар"
+
+#, fuzzy
+#~ msgid "Scanning IMAP folder"
+#~ msgstr "Сканування тек в \"%s\""
+
+#, fuzzy
+#~ msgid "%s is not a selectable folder"
+#~ msgstr "Показати вибрану теки"
+
+#, fuzzy
+#~ msgid "Inline attachment"
+#~ msgstr "долучення"
+
+#, fuzzy
+#~ msgid "Send as:"
+#~ msgstr "В╕д╕слати \"%s\""
+
+#~ msgid ""
+#~ "Could not open signature file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не вдалося в╕дкрити файл п╕дпису %s:\n"
+#~ "%s"
+
+#~ msgid "That is not a regular file."
+#~ msgstr "Це не звичайний файл."
+
+#~ msgid "%I:%M:%S %p%n"
+#~ msgstr "%I:%M:%S %p%n"
+
+#~ msgid "%H:%M:%S%n"
+#~ msgstr "%H:%M:%S%n"
+
+#~ msgid "%I:%M %p%n"
+#~ msgstr "%I:%M %p%n"
+
+#~ msgid "%H:%M%n"
+#~ msgstr "%H:%M%n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Неможливо в╕дкрити файл %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Send an email to %s"
+#~ msgstr "Отримання пошти з %s"
+
+#, fuzzy
+#~ msgid "Close %s"
+#~ msgstr "Закрити"
+
+#, fuzzy
+#~ msgid "Move %s to the left"
+#~ msgstr "Перенести в теку"
+
+#, fuzzy
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Перейти до попереднього елементу"
+
+#, fuzzy
+#~ msgid "Move %s into the next row"
+#~ msgstr "Перейти до наступного елементу"
+
+#, fuzzy
+#~ msgid "RDF Summary"
+#~ msgstr "Нед╕ля"
+
+#, fuzzy
+#~ msgid "Factory for the test bonobo component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#, fuzzy
+#~ msgid "Factory for the test component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
+
+#~ msgid "Forward to Address"
+#~ msgstr "Переслати на адресу"
+
+#~ msgid "Closing current folder"
+#~ msgstr "Закривання поточно╖ теки"
+
+#~ msgid "Renaming old folder and opening"
+#~ msgstr "Перейменування старо╖ теки та в╕дкривання"
+
+#~ msgid "Copying messages"
+#~ msgstr "Коп╕ювання пов╕домлень"
+
+#, fuzzy
+#~ msgid "Evolution progress"
+#~ msgstr "Evolution"
+
+#~ msgid "Retrieving message number %d of %d (uid \"%s\")"
+#~ msgstr "Отримання пов╕домлення %d з %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving message %d of %d (uid \"%s\")"
+#~ msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#~ msgid "[%s] (forwarded message)"
+#~ msgstr "[%s] (переслане пов╕домлення)"
+
+#~ msgid "Fwd: (no subject)"
+#~ msgstr "Fwd: (без теми)"
+
+#~ msgid "Forwarded message (no subject)"
+#~ msgstr "Переслане пов╕домлення (без теми)"
+
+#~ msgid "Print the selected message"
+#~ msgstr "Надрукувати вибране пов╕домлення"
+
+#~ msgid "Delete this message"
+#~ msgstr "Стерти це пов╕домлення"
+
+#~ msgid "Evolution files successfully installed."
+#~ msgstr "Файли Evolution усп╕шно встановлено."
+
+#~ msgid "Activate"
+#~ msgstr "Актив╕зувати"
+
+#~ msgid "Activate this shortcut"
+#~ msgstr "Актив╕зувати цей ярлик"
+
+#~ msgid "Find a contact"
+#~ msgstr "Знайти контакт"
+
+#~ msgid "View All"
+#~ msgstr "Показати все"
+
+#~ msgid "View all contacts"
+#~ msgstr "Показати вс╕ контакти"
+
+#~ msgid "5 Days"
+#~ msgstr "5 Дн╕в"
+
+#~ msgid "Create a new calendar"
+#~ msgstr "Створити новий календар"
+
+#~ msgid "Day"
+#~ msgstr "День"
+
+#~ msgid "New _Event"
+#~ msgstr "Нова под╕я"
+
+#~ msgid "Open Calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "Prev"
+#~ msgstr "Назад"
+
+#~ msgid "Save calendar as something else"
+#~ msgstr "Зберегти календар як щось ╕нше"
+
+#~ msgid "_Open Calendar"
+#~ msgstr "В╕дкрити календар"
+
+#~ msgid "About this application"
+#~ msgstr "Про цю програму"
+
+#~ msgid "About..."
+#~ msgstr "Про..."
+
+#~ msgid "Actio_ns"
+#~ msgstr "Д╕╖"
+
+#~ msgid "Address _Book... (FIXME)"
+#~ msgstr "Адресна книга..."
+
+#~ msgid "C_lear"
+#~ msgstr "Очистити"
+
+#, fuzzy
+#~ msgid "Chec_k Names (FIXME)"
+#~ msgstr "Завдання"
+
+#~ msgid "Cop_y to Folder... (FIXME)"
+#~ msgstr "Скоп╕ювати у теку..."
+
+#~ msgid "Fi_rst Item in Folder (FIXME)"
+#~ msgstr "Перший елемент у тец╕"
+
+#~ msgid "For_ward (FIXME)"
+#~ msgstr "Переслати"
+
+#~ msgid "Go to the next item"
+#~ msgstr "Перейти до наступного елементу"
+
+#~ msgid "Go to the previous item"
+#~ msgstr "Перейти до попереднього елементу"
+
+#~ msgid "In_complete Task (FIXME)"
+#~ msgstr "Невиконане завдання"
+
+#~ msgid "N_ext"
+#~ msgstr "Наступний"
+
+#~ msgid "Pre_vious"
+#~ msgstr "Попередн╕й"
+
+#~ msgid "Print S_etup..."
+#~ msgstr "Параметри друку..."
+
+#, fuzzy
+#~ msgid "Schedule some sort of a meeting"
+#~ msgstr "Планування зустр╕ч╕"
+
+#, fuzzy
+#~ msgid "Select everything"
+#~ msgstr "Вибрати назви"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "Завдання"
+
+#~ msgid "_About..."
+#~ msgstr "Про..."
+
+#~ msgid "_Item (FIXME)"
+#~ msgstr "Елемент"
+
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "Журнальний запис"
+
+#~ msgid "_Last Item in Folder (FIXME)"
+#~ msgstr "Останн╕й елемент у тец╕"
+
+#~ msgid "_Mail Message (FIXME)"
+#~ msgstr "В╕д╕слати пов╕домлення"
+
+#~ msgid "_Move to Folder... (FIXME)"
+#~ msgstr "Перенести в теку..."
+
+#~ msgid "_Note (FIXME)"
+#~ msgstr "Прим╕тка"
+
+#, fuzzy
+#~ msgid "_Unread Item (FIXME)"
+#~ msgstr "Контакт"
+
+#, fuzzy
+#~ msgid "Add Service"
+#~ msgstr "Додати джерело"
+
+#, fuzzy
+#~ msgid "Create a new email"
+#~ msgstr "Створити новий контакт"
+
+#~ msgid "New Mail"
+#~ msgstr "Нова пошта"
+
+#~ msgid "Configure Folder..."
+#~ msgstr "Налаштувати теку..."
+
+#~ msgid "Copy message to a new folder"
+#~ msgstr "Скоп╕ювати пов╕домлення у нову теку"
+
+#~ msgid "Edit the current message"
+#~ msgstr "Виправити поточне пов╕домлення"
+
+#~ msgid "Expunge"
+#~ msgstr "Викреслити"
+
+#~ msgid "Finaly remove all mails tagged for deletion"
+#~ msgstr "Остаточно видалити пошту в╕дм╕чену для стирання"
+
+#, fuzzy
+#~ msgid "Forward inline"
+#~ msgstr "Переслати"
+
+#, fuzzy
+#~ msgid "Forward this message in-line with your mail, so you can edit it"
+#~ msgstr "Переслати пов╕домлення без теми"
+
+#~ msgid "Hide Deleted Messages"
+#~ msgstr "Прибрати стерт╕ пов╕домлення"
+
+#~ msgid "Invert Selection"
+#~ msgstr "╤нвертувати виб╕р"
+
+#~ msgid "Mark As Read"
+#~ msgstr "Позначити прочитаним"
+
+#~ msgid "Mark As U_nread"
+#~ msgstr "Позначити непрочитаним"
+
+#~ msgid "Move message to a new folder"
+#~ msgstr "Перенести пов╕домлення у нову теку"
+
+#~ msgid "Print Preview of message..."
+#~ msgstr "Перегляд друку пов╕домлення..."
+
+#~ msgid "Print message to the printer"
+#~ msgstr "Надрукувати пов╕домлення на принтер╕"
+
+#~ msgid "Redirect (FIXME: implement me)"
+#~ msgstr "Перенаправити"
+
+#~ msgid "Reply to all"
+#~ msgstr "В╕дпов╕сти вс╕м"
+
+#~ msgid "Reply to sender"
+#~ msgstr "В╕дпов╕сти в╕дправнику"
+
+#~ msgid "S_ource"
+#~ msgstr "Джерело"
+
+#, fuzzy
+#~ msgid ""
+#~ "Send queued mail\n"
+#~ "    and retrieve new mail"
+#~ msgstr "В╕д╕слати пов╕домлення з черги та отримати нов╕"
+
+#~ msgid "_Reply"
+#~ msgstr "В╕дпов╕сти"
+
+#~ msgid "_Save Message As..."
+#~ msgstr "Зберегти пов╕домлення як..."
+
+#~ msgid "Save in _folder... (FIXME)"
+#~ msgstr "Зберегти в тец╕..."
+
+#~ msgid "Send the message now"
+#~ msgstr "В╕д╕слати пов╕домлення негайно"
+
+#~ msgid "_Insert text file... (FIXME)"
+#~ msgstr "Вставити текстовий файл..."
+
+#, fuzzy
+#~ msgid "Assig_n Task (FIXME)"
+#~ msgstr "Прив'язати завдання"
+
+#~ msgid "Redo"
+#~ msgstr "Повторити"
+
+#~ msgid "Redo the undone action"
+#~ msgstr "Повторити в╕дм╕нену д╕ю"
+
+#~ msgid "Replace"
+#~ msgstr "Зам╕нити"
+
+#~ msgid "Replace a string"
+#~ msgstr "Зам╕нити рядок"
+
+#~ msgid "Reply to A_ll (FIXME)"
+#~ msgstr "В╕дпов╕сти вс╕м"
+
+#, fuzzy
+#~ msgid "S_end Status Report (FIXME)"
+#~ msgstr "Контакт"
+
+#~ msgid "Search again for the same string"
+#~ msgstr "Шукати зновуй той же рядок"
+
+#~ msgid "Search for a string"
+#~ msgstr "Пошук рядка"
+
+#~ msgid "Undo"
+#~ msgstr "В╕дм╕нити"
+
+#~ msgid "Undo the last action"
+#~ msgstr "В╕дм╕нити останню операц╕ю"
+
+#~ msgid "_Mark Complete (FIXME)"
+#~ msgstr "Позначити виконаним"
+
+#~ msgid "_Reply (FIXME)"
+#~ msgstr "В╕дпов╕сти"
+
+#, fuzzy
+#~ msgid "Evolution bar _shortcut"
+#~ msgstr "Evolution - %s"
+
+#, fuzzy
+#~ msgid "Advanced ..."
+#~ msgstr "Додатково..."