I like monkeys - Federico

svn path=/trunk/; revision=6981

1 files changed, 3276 insertions, 2124 deletions

diff --git a/po/uk.po b/po/uk.po
index a2e9df58ab..ea9afb723e 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: 2000-11-01 11:50+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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,14 +13,242 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Авто"
+
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "╤м'я:"
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "Дата народження:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "Адреса:"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+#, fuzzy
+msgid ""
+"\n"
+"  Country:     "
+msgstr "Кра╖на:"
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "Е-пошта 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "Е-пошта 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "Робоча 2"
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "╤м'я:"
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "категор╕╖"
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1064
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1066
-#: calendar/conduits/todo/todo-conduit.c:946 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -139,26 +367,29 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:628
-#: calendar/conduits/todo/todo-conduit.c:507
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:629
-#: calendar/conduits/todo/todo-conduit.c:508
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -179,113 +410,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Доступн╕ категор╕╖:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Робоча"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Робоча 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Робочий факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Авто"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Компан╕я"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Домашня"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Домашня 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Домашн╕й факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Моб╕льний"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "╤нша"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "╤нший факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Пейджер"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Первинний"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Рад╕о"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Телекс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "Первинна е-пошта"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ви впевнен╕, що хочете\n"
-"стерти цю контактну ╕нформац╕ю?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Стерти контактну ╕нформац╕ю?"
 
@@ -299,7 +428,7 @@ msgid "_Add"
 msgstr "Додати"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -312,11 +441,13 @@ msgstr "Типи телефон╕в"
 msgid "New phone type"
 msgstr "Новий тип телефона"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:90 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Додати"
 
@@ -356,6 +487,11 @@ msgstr "Робочий факс:"
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Первинна е-пошта"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
@@ -369,7 +505,7 @@ msgid "C_ontacts..."
 msgstr "Зв'язки..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
@@ -386,7 +522,7 @@ msgid "_Address..."
 msgstr "Адреса..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -431,59 +567,146 @@ msgid "No_tes:"
 msgstr "Нотатки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Подробиц╕"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Робоча"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Робоча 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Робочий факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Авто"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Компан╕я"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Домашня"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Домашня 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Домашн╕й факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Моб╕льний"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "╤нша"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "╤нший факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Пейджер"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Первинний"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Рад╕о"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Телекс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Е-пошта 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Е-пошта 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Адреса _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Канада"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Перев╕рка адреси"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Кра╖на:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Ф╕нлянд╕я"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "США"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "Адреса:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "М╕сто:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "А/С:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Адреса _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Штат/область:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "США"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Канада"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Ф╕нлянд╕я"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "╤ндекс:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Кра╖на:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -536,19 +759,24 @@ msgstr "Пр╕звище:"
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Як _Minicards"
 
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -557,10 +785,34 @@ msgid ""
 "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"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Новий"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Т╕ло м╕стить"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "Д╕╖"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "Д╕╖"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
@@ -569,172 +821,169 @@ msgid "External Directories"
 msgstr "Зовн╕шн╕ каталоги"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Опис:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Сервер LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "╤м'я:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Номер порта:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "╤м'я:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Вибрати назви"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Шукати..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Вибрати назви"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Вибер╕ть назву з списку:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Пошук"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "в╕кно2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
@@ -751,198 +1000,187 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494
-msgid "Search"
-msgstr "Пошук"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Параметри стор╕нки:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Назва стилю:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Перегляд:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Параметри"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Т╕ло"
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Внизу:"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "К╕льк╕сть стовпчик╕в:"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Розм╕ри:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Шрифт..."
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Шрифт..."
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Формат"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Заголовок"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Т╕ло"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Висота:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Альбомна"
+
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Л╕воруч:"
+
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Формат"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Поля"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Пап╕р"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "К╕льк╕сть стовпчик╕в:"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Тип:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Параметри"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Ор╕╓нтац╕я"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Розм╕ри:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Стор╕нка"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Ширина:"
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Параметри стор╕нки:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Висота:"
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Пап╕р"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Джерело паперу:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Поля"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Книжна"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Вгор╕:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Перегляд:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Внизу:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Л╕воруч:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Праворуч:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Стор╕нка"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Розм╕р:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Ор╕╓нтац╕я"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Книжна"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Альбомна"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Назва стилю:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Заголовок"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Вгор╕:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Тип:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Ширина:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "дп"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "пп"
 
@@ -954,13 +1192,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:584
-#: calendar/conduits/todo/todo-conduit.c:463
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -972,8 +1210,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:561
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1017,49 +1255,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Файлу не знайдено"
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "В╕дкрити календар"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Зберегти календар"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
@@ -1091,7 +1326,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1103,36 +1338,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1142,15 +1376,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Значення пр╕оритету ма╓ бути м╕ж 1 та 9, включно"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, який в╕добразить календар"
 
@@ -1167,475 +1401,459 @@ msgid "No summary available."
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Закрити"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Сон"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Сон"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Час сну (в хвилинах)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Робочий тиждень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Пнд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Втр"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Срд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Чтв"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Птн"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Сбт"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Ндл"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Перший день тижня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Понед╕лок"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Tuesday"
-msgstr "В╕второк"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Wednesday"
-msgstr "Середа"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Thursday"
-msgstr "Четвер"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Friday"
-msgstr "П'ятниця"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 годин (дп/пп)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Saturday"
-msgstr "Субота"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Нед╕ля"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Початок дня:"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "К╕нець дня:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Розд╕лювач╕ часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Формат часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 годин (дп/пп)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 години"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Календар"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Параметри календаря"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Кольори"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
-msgid "Priority"
-msgstr "Пр╕оритет"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "К╕нець дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Перший день тижня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Птн"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "П'ятниця"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Кольори"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Пнд"
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Понед╕лок"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr ""
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Пр╕оритет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr ""
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Початок дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Ндл"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Нед╕ля"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
-msgstr "Виправити завдання"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Чтв"
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
-msgid "No summary"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Четвер"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
-#, c-format
-msgid "Appointment - %s"
-msgstr "Зустр╕ч - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Розд╕лювач╕ часу:"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
-#, c-format
-msgid "Task - %s"
-msgstr "Завдання - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Формат часу:"
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальний рядок - %s"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "Втр"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "В╕второк"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Срд"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Середа"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Робочий тиждень"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "Стан:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Не розпочато"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "Класиф╕кац╕я:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Викону╓ться"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "В╕дм╕нено"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "В╕дм╕нено"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "Пр╕оритет:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Дата виконання:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Високий"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Звичайний"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "Викону╓ться"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Низький"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "Класиф╕кац╕я:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
 msgid "None"
 msgstr "Нема╓"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "Зв'язки..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Звичайний"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Не розпочато"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Дата виконання:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "Зв'язки..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "Пр╕оритет:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "Стан:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Виправити завдання"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Зустр╕ч - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Завдання - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальний рядок - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "В╕дкрити..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "В╕дкрити завдання"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Позначити завдання як виконане"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:92 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:20 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:59
+#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Стерти"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Стерти завдання"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, 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:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
+#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
 msgid "New appointment..."
 msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Виправити зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1646,245 +1864,214 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:279
-msgid "Edit Appointment"
-msgstr "Виправити зустр╕ч"
-
-#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
 #.
-#. figure out why alarm units aren't sticking between edits
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Зустр╕ч╕:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Час"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Days"
+msgstr "День"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Кожен"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Класиф╕кац╕я"
+#: po/tmp/event-editor-dialog.glade.h:14
+#, fuzzy
+msgid "Exceptions"
+msgstr "Виключення"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
+#: po/tmp/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Hours"
+msgstr "година"
+
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Лист до:"
+
+#: po/tmp/event-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Minutes"
+msgstr "хвилина"
+
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Понед╕лок"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "Перегляд:"
+
+#: po/tmp/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "Ауд╕о"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
-msgstr "Програма"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
-msgstr "Пошта"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Mail _to:"
-msgstr "Лист до:"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Час"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
-msgstr "Запустити програму:"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "Ауд╕о"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Reminder"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
-msgstr "Щодня"
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "Час завершення з╕брання:"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
-msgstr "Щотижня"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "Пошта"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
-msgstr "Щом╕сяця"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "Програма"
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "Запустити програму:"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr "Щороку"
+#: po/tmp/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "_Start time:"
+msgstr "Час початку з╕брання:"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
-msgstr "позначка23"
+#: po/tmp/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "_Starting date:"
+msgstr "Початок дня:"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
-msgstr "позначка24"
+#: po/tmp/event-editor-dialog.glade.h:41
+#, fuzzy
+msgid "for"
+msgstr "четвертий"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
-msgstr "позначка25"
+#: po/tmp/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "label21"
+msgstr "label26"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "м╕сяць"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-"Понед╕лок\n"
-"В╕второк\n"
-"Середа\n"
-"Четвер\n"
-"П'ятниця\n"
-"Субота\n"
-"Нед╕ля\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "month(s)"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "р╕к"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
-msgstr "позначка27"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/event-editor-dialog.glade.h:84
+#: calendar/gui/event-editor.c:407
 #, fuzzy
-msgid "Ending date"
-msgstr "К╕нцева дата"
-
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
-msgstr ""
+msgid "on"
+msgstr "Пнд"
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "день"
 
-#: calendar/gui/event-editor-dialog.glade.h:87
+#: calendar/gui/event-editor.c:559
 #, fuzzy
-msgid "End after"
-msgstr "К╕нцева дата"
-
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
-msgstr ""
+msgid "on the"
+msgstr "м╕сяць"
 
-#: calendar/gui/event-editor-dialog.glade.h:89
+#: calendar/gui/event-editor.c:566
 #, fuzzy
-msgid "Exceptions"
-msgstr "Виключення"
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/event-editor-dialog.glade.h:91
+#: calendar/gui/event-editor.c:722
 #, fuzzy
-msgid "Change"
-msgstr "Стор╕нка"
+msgid "occurrences"
+msgstr "Джерела"
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1983,11 +2170,11 @@ msgstr "п'ятниця"
 msgid "saturday"
 msgstr "субота"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "р╕к"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "м╕сяць"
 
@@ -1995,19 +2182,15 @@ msgstr "м╕сяць"
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "тиждень"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "день"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "година"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "хвилина"
 
@@ -2015,7 +2198,7 @@ msgstr "хвилина"
 msgid "min"
 msgstr "хв"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "секунда"
 
@@ -2035,8 +2218,8 @@ msgstr "вчора"
 msgid "today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "зараз"
 
@@ -2102,53 +2285,29 @@ msgstr "дванадцятий"
 msgid "ago"
 msgstr "тому"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:186
-#, fuzzy
-msgid "Due Date:"
-msgstr "Дата"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Приор╕тет:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, fuzzy, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Створити новий календар"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Гаразд"
 
@@ -2360,176 +2519,94 @@ msgstr "Поточний р╕к (%Y)"
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:803
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "В╕дображення часу"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Формат часу"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12-годинний (ДП/ПП)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24-годинний"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Початок тижня"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Д╕апазон дн╕в"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr ""
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr ""
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr ""
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr ""
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr ""
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr ""
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr ""
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr ""
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr ""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Параметри"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr ""
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr "ПВСЧПСН"
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 #, fuzzy
-msgid "Alarm Properties"
-msgstr "Властивост╕ долучення"
+msgid "SMTWTFS"
+msgstr "ПВСЧПСН"
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr ""
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Створити новий календар"
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:99
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Створити новий календар"
-
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, fuzzy, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не вдалося створити канал: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, fuzzy, c-format
 msgid "Could not fork: %s"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Нев╕дома помилка)"
 
@@ -2543,56 +2620,60 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: нема╓ ╕н╕ц╕ал╕зац╕╖ в модул╕."
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:182
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:168
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(нев╕домий хост)"
 
-#: camel/camel-service.c:119
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:270
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:358
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2601,51 +2682,67 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "Рядок URL \"%s\" не м╕стить назви протоколу"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "Рядок URL \"%s\" не м╕стить нев╕рну назву протоколу"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Номер порта в URL \"%s\" не числовий"
 
-#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Не вдалося створити канал: %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/imap/camel-imap-command.c:370
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:578
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2657,27 +2754,31 @@ msgstr "IMAP4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження плшти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:139
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: camel/providers/imap/camel-imap-store.c:234
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/imap/camel-imap-store.c:141
+#: camel/providers/imap/camel-imap-store.c:236
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:166
-#, c-format
-msgid "Could not connect to IMAP server on %s."
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:230
+#: camel/providers/imap/camel-imap-store.c:333
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2685,54 +2786,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
-#, fuzzy
-msgid "Could not create summary"
-msgstr "Створити новий календар"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Не вдалося отримати пов╕домлення: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "\"%s\" не ╓ звичайним файлом."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Файл локально╖ пошти %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Не вдалося перейменувати теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "В╕д╕слан╕ пов╕домлення"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, fuzzy, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Переслати це пов╕домлення"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Не вдалося в╕дкрити файл \"%s\":\n"
+"Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не ╕сну╓."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не вдалося створити теку \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "\"%s\" не ╓ каталогом."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Локальний поштовий каталог %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Створити новий календар"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "В╕д╕слан╕ пов╕домлення"
+
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Не вдалося в╕дкрити файл \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2741,14 +2984,14 @@ msgstr ""
 "Не вдалось створити файл \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" не ╓ звичайним файлом."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2757,149 +3000,90 @@ msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:263
-msgid "Mbox folders may not be nested."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:277
-#, c-format
-msgid "Local mail file %s"
-msgstr "Файл локально╖ пошти %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not open summary %s"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr ""
-
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr ""
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Створити новий календар"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
-msgid "Could not load or create summary"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s"
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: camel/providers/mh/camel-mh-folder.c:399
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:115
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося в╕дкрити теку \"%s\":\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:130
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося створити теку \"%s\":\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не ╓ каталогом."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Не вдалося стерти теку \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Не вдалося перейменувати теку \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:197
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Не вдалося перейменувати теку \"%s\": %s ╕сну╓"
-
-#: camel/providers/mh/camel-mh-store.c:205
-msgid "MH folders may not be nested."
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:217
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Локальний поштовий каталог %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -2917,7 +3101,7 @@ msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
 msgid "Server rejected username/password"
 msgstr "Сервер в╕дкинув ╕м'я користувача ╕ пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Пов╕домлення %s не знайдено."
@@ -2926,13 +3110,13 @@ msgstr "Пов╕домлення %s не знайдено."
 msgid "Could not get group list from server."
 msgstr "Не вдалося отримати сп╕сок груп з сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:93
-#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не вдалося завантажити список груп для %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
@@ -2950,33 +3134,33 @@ msgstr ""
 msgid "Could not open directory for news server: %s"
 msgstr "Не вдалося в╕дкрити каталог сервера новин: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -2991,66 +3175,66 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:162
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:174
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -3115,108 +3299,108 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт╕в"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:119
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Видалити"
 
-#: composer/e-msg-composer-attachment-bar.c:443
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Властивост╕ долучення"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "Тип MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
+msgstr "Тип MIME:"
+
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "В╕д:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:300
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3224,15 +3408,15 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Введ╕ть тему послання"
 
-#: composer/e-msg-composer.c:298
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3241,131 +3425,149 @@ msgstr ""
 "Не вдалося в╕дкрити файл п╕дпису %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:407
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:418
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:438
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:460
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:462
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:503
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:547 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:553
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:575
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "В╕дкрити файл"
 
-#: composer/e-msg-composer.c:701
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Цього файлу не ╕сну╓."
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Це не звичайний файл."
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:731
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1343
 #, fuzzy
 msgid "Compose a message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1420
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Створити новий календар"
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Пошук"
+
+#: filter/filter-datespec.c:62
 #, fuzzy
 msgid "years"
 msgstr "Заголовок"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 #, fuzzy
 msgid "months"
 msgstr "Шрифти"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 #, fuzzy
 msgid "weeks"
 msgstr "Тиждень"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 #, fuzzy
 msgid "days"
 msgstr "Т╕ло"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 #, fuzzy
 msgid "seconds"
 msgstr "В╕д╕слати"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 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:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3373,44 +3575,48 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<клацн╕ть тут для вибору дати>"
 
-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Редагування"
 
-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 #, fuzzy
 msgid "Edit Filter Rule"
 msgstr "Редагування"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Редагування"
@@ -3431,84 +3637,103 @@ msgstr "Д╕╖"
 msgid "Remove action"
 msgstr "Видалити"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 #, fuzzy
 msgid "Select Folder"
 msgstr "Вибрати назви"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<клацн╕ть тут для вибору теки>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Тест"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Назва правила: "
 
-#: filter/filter-rule.c:513
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:527
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:544
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:548
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:553
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:577
 #, fuzzy
 msgid "Add criterion"
 msgstr "Д╕╖"
 
-#: filter/filter-rule.c:570
+#: filter/filter-rule.c:583
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Видалити"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-
-#: filter/filter.glade.h:11
-#, fuzzy
-msgid "Filter Rules"
-msgstr "Редагування"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Виправити"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Теки"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "Редагування"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "В╕ртуальн╕ теки"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Теки"
@@ -3547,90 +3772,145 @@ msgid "Message Body"
 msgstr "Т╕ло пов╕домлення"
 
 #: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Т╕ло пов╕домлення"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Пов╕домлення було отримано"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Пов╕домлення було в╕д╕слано"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "В╕дправник"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Стан:"
+
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Джерело"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "Стан:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "contains"
 msgstr "Д╕╖"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "does not exist"
+msgstr "Цього файлу не ╕сну╓."
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "Файлу не знайдено"
+
+#: filter/libfilter-i18n.h:32
+#, fuzzy
+msgid "does not start with"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "Тест"
+
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "on or after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "was after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr ""
 
@@ -3656,84 +3936,168 @@ msgstr "Редагування"
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:236
+#: mail/component-factory.c:227
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: mail/component-factory.c:243
-#, fuzzy
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: mail/component-factory.c:248
-#, fuzzy
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: mail/component-factory.c:330
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr ""
-
-#: mail/component-factory.c:349
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Зберегти"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Т╕ло м╕стить"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Тема м╕стить"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Т╕ло не м╕стить"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Тема не м╕стить"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:314
+#: mail/folder-browser.c:455
 #, fuzzy
-msgid "Custom"
-msgstr "Вир╕зати"
+msgid "VFolder on Recipients"
+msgstr "Адресати пов╕домлення"
 
-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
 #, fuzzy
-msgid "Full Search"
-msgstr "Пошук"
+msgid "Filter on Sender"
+msgstr "Файлу не знайдено"
 
-#: mail/folder-browser.c:497
-msgid "Save"
-msgstr "Зберегти"
+#: mail/folder-browser.c:459
+#, fuzzy
+msgid "Filter on Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "В╕дкрити"
+
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Зберегти як..."
+
+#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
+msgid "Print"
+msgstr "Друкувати"
+
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr "В╕дпов╕сти в╕дправнику"
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Переслати"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Переслати"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "Позначити як прочитане"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "Позначити як непрочитане"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Перенести в теку"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Скоп╕ювати у теку"
+
+#: mail/folder-browser.c:480
+#, fuzzy
+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:484
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Редагування"
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/mail-autofilter.c:76
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Тема"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3741,130 +4105,190 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:515
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:517
+#: mail/mail-callbacks.c:554
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:619
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:718
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Переписати файл?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
+"Переписати його?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Зберегти як..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Зберегти як..."
+
+#: mail/mail-callbacks.c:877
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:763 mail/message-list.c:1564
+#: mail/mail-callbacks.c:922
 #, fuzzy
 msgid "Print Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-callbacks.c:810
+#: mail/mail-callbacks.c:969
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/mail-config-druid.glade.h:6
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Повна назва:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Файл п╕дпису"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Назва користувача:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Шлях:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Аутенф╕кац╕я:"
 
-#: mail/mail-config-gui.c:941
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr ""
 
 #: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr ""
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config-gui.c:1107
+#: mail/mail-config-gui.c:1130
 #, fuzzy
 msgid "Mail source type:"
 msgstr "Джерело паперу:"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3873,12 +4297,12 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1131
+#: mail/mail-config-gui.c:1154
 #, fuzzy
 msgid "News source type:"
 msgstr "Новий тип телефона"
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3887,181 +4311,113 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Додати джерело"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Виправити джерело"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Додати сервер новин"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Виправити сервер новин"
 
-#: mail/mail-config-gui.c:2233
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Перев╕рка \"%s\""
 
-#: mail/mail-config-gui.c:2235
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2277
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2329
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Адреса"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Орган╕зац╕я"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Джерела"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Поштов╕ джерела"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:13
+#, fuzzy
+msgid "Mark message as seen [ms]: "
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Сервери новин"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Джерела новин"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Орган╕зац╕я"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
 
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: mail/mail-crypto.c:137
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Не вдалось створити канал до %s: %s"
-
-#: mail/mail-crypto.c:164
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Не вдалось виконати %s: %s\n"
-
-#: mail/mail-crypto.c:168
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Джерела"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Неможливо створити канал до GPG/PGP: %s"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Переписати файл?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
-"Переписати його?"
-
-#: mail/mail-display.c:87
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4070,446 +4426,526 @@ msgstr ""
 "Неможливо в╕дкрити файл %s:\n"
 "%s"
 
-#: mail/mail-display.c:99
+#: mail/mail-display.c:113
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: mail/mail-display.c:195
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:235
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:281
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:305
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:332
+#: mail/mail-display.c:355
 #, fuzzy
 msgid "Hide"
 msgstr "Заголовок"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "долучення"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "В╕дпов╕сти"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Виправити пов╕домлення"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Закривання поточно╖ теки"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Перейменування старо╖ теки та в╕дкривання"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Створення ново╖ теки"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, 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:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr ""
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Створення ново╖ теки"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Створити нову теку"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:110
-#, fuzzy, c-format
-msgid "Retrieving messages : %s"
-msgstr "Переслати це пов╕домлення"
-
-#: mail/mail-ops.c:253
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:441
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:446
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:449
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "В╕д╕слати \"%s\""
 
-#: mail/mail-ops.c:452
+#: mail/mail-ops.c:549
 #, fuzzy
 msgid "Send a message without a subject"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:626
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:628
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:764 mail/mail-ops.c:771
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:768 mail/mail-ops.c:774
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:909
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:912
+#: mail/mail-ops.c:1006
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:948
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1047
+#: mail/mail-ops.c:1141
 #, fuzzy, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1050
+#: mail/mail-ops.c:1144
 #, fuzzy, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1081
+#: mail/mail-ops.c:1175
 #, fuzzy, c-format
 msgid "Marking message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1204
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1275 mail/subscribe-dialog.c:163
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Нема╓ опису)"
 
-#: mail/mail-ops.c:1335
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1338
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1535
 #, fuzzy, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-ops.c:1446
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслати  пов╕домлення \"%s\""
 
-#: mail/mail-ops.c:1454
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1491
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Завантаження \"%s\""
 
-#: mail/mail-ops.c:1596
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Завантажити \"%s\""
 
-#: mail/mail-ops.c:1698
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Створення \"%s\""
 
-#: mail/mail-ops.c:1700
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Створити \"%s\""
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1794
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: mail/mail-ops.c:1796
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхрон╕зувати \"%s\""
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1865
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1868
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1980
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "В╕дкрити пов╕домлення з \"%s\""
 
-#: mail/mail-ops.c:2084
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2156
+#: mail/mail-ops.c:2313
 #, fuzzy, c-format
 msgid "View messages from \"%s\""
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-ops.c:2182
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-threads.c:299
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Cancel"
+msgstr "В╕дм╕нено"
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Перев╕рка %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, fuzzy, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Переслати це пов╕домлення"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, fuzzy, c-format
 msgid "Writing message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, fuzzy, c-format
 msgid "Saving changes to %s"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:551
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr ""
-
-#: mail/mail-tools.c:580
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4520,169 +4956,138 @@ msgstr ""
 msgid "VFolders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Нова в╕ртуальна тека"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:47
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "В╕дпов╕сти"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:48
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:154 mail/message-list.c:1567 ui/evolution-mail.h:49
-msgid "Reply to All"
-msgstr "В╕дпов╕сти вс╕м"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:50
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:51
-msgid "Forward"
-msgstr "Переслати"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:52
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
-#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
-msgid "Print"
-msgstr "Друкувати"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:58
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:60
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Стерти це пов╕домлення"
 
-#: mail/message-list.c:511
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:514
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:517
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1562
-msgid "Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
-
-#: mail/message-list.c:1563
-msgid "Edit Message"
-msgstr "Виправити пов╕домлення"
-
-#: mail/message-list.c:1566
-msgid "Reply to Sender"
-msgstr "В╕дпов╕сти в╕дправнику"
-
-#: mail/message-list.c:1568
-msgid "Forward Message"
-msgstr "Переслати пов╕домлення"
-
-#: mail/message-list.c:1570
-msgid "Delete Message"
-msgstr "Стерти пов╕домлення"
-
-#: mail/message-list.c:1571
-msgid "Move Message"
-msgstr "Перенести пов╕домлення"
-
-#: mail/message-list.c:1572
-msgid "Copy Message"
-msgstr "Скоп╕ювати пов╕домлення"
-
-#: mail/message-list.c:1574
-msgid "VFolder on Subject"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/message-list.c:1575
-msgid "VFolder on Sender"
+#. well, we could scan more children, build up a (more accurate) list, but this should do ok
+#: mail/message-list.c:858 mail/message-list.c:873
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:1576
+#: mail/message-list.c:860 mail/message-list.c:875
 #, fuzzy
-msgid "VFolder on Recipients"
-msgstr "Адресати пов╕домлення"
-
-#: mail/message-list.c:1578
-msgid "Filter on Subject"
-msgstr ""
+msgid "<unknown>"
+msgstr "Нев╕дома помилка"
 
-#: mail/message-list.c:1579
+#: mail/message-list.c:2068
 #, fuzzy
-msgid "Filter on Sender"
-msgstr "Файлу не знайдено"
+msgid "Rebuilding message view"
+msgstr "Переслати це пов╕домлення"
 
-#: mail/message-list.c:1580
-#, fuzzy
-msgid "Filter on Recipients"
-msgstr "Адресати пов╕домлення"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr ""
 
-#: mail/message-list.c:1581 mail/message-list.c:1604
-msgid "Filter on Mailing List"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/message-list.c:1606
+#: mail/subscribe-dialog.c:172
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1694
-#, fuzzy
-msgid "Rebuilding message view"
-msgstr "Переслати це пов╕домлення"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1696
-msgid "Rebuild message view"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Сканування тек в \"%s\""
+
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:118
-msgid "Display folders containing:"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Сканування тек в \"%s\""
+
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "╤нсталяц╕я Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Файли Evolution усп╕шно встановлено."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4693,14 +5098,14 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4708,7 +5113,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4760,44 +5165,44 @@ msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 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:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Теки"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:336
+#: shell/e-shell.c:1208
 #, c-format
-msgid "Cannot set up local storage -- %s"
+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:122
@@ -4868,65 +5273,67 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:127
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "_View"
+msgstr "Новий"
+
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
-#, fuzzy
-msgid "_View"
-msgstr "Новий"
-
-#: shell/e-storage-set-view.c:223
-#, fuzzy
-msgid "View the selected folder"
-msgstr "Надрукувати вибране пов╕домлення"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4948,612 +5355,1224 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:160
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
-msgid "_Actions"
-msgstr "Д╕╖"
-
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 #, fuzzy
 msgid "N_ew Directory Server"
 msgstr "Сервер:"
 
-#.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-#, fuzzy
-msgid "_Print Contacts..."
-msgstr "Зв'язки..."
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+msgid "_Actions"
+msgstr "Д╕╖"
 
-#: ui/evolution-addressbook.h:11
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "_New Contact"
+msgid "Delete a contact"
 msgstr "Стерти контактну ╕нформац╕ю?"
 
-#: ui/evolution-addressbook.h:12
-msgid "_Tools"
-msgstr "╤нструменти"
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
+msgid "Find"
+msgstr "Знайти"
 
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New"
 msgstr "Новий"
 
-#: ui/evolution-addressbook.h:15
-msgid "Create a new contact"
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:16
-msgid "Find"
-msgstr "Знайти"
-
-#: ui/evolution-addressbook.h:17
-msgid "Find a contact"
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.h:19
-msgid "Print contacts"
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.h:21
-#, fuzzy
-msgid "Delete a contact"
-msgstr "Стерти контактну ╕нформац╕ю?"
-
-#: ui/evolution-addressbook.h:22
+#: po/tmp/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "Новий"
 
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:24
-msgid "Stop"
-msgstr ""
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "Зв'язки..."
 
-#: ui/evolution-addressbook.h:25
-msgid "Stop Loading"
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
 msgstr ""
 
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "╤нструменти"
+
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9 ui/evolution.h:14
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "5 Дн╕в"
+
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:8
 #, fuzzy
-msgid "_New"
-msgstr "Новий"
+msgid "Ca_lendar"
+msgstr "Календар"
+
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr "Параметри календаря..."
 
-#: ui/evolution-calendar.h:10
-msgid "New Ca_lendar"
-msgstr "Новий календар"
+#: po/tmp/evolution-calendar.xml.h:10
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Стерти цю зустр╕ч"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Створити новий календар"
 
-#: ui/evolution-calendar.h:12
-msgid "_Open"
-msgstr "В╕дкрити"
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "День"
 
-#: ui/evolution-calendar.h:13
-msgid "_Open Calendar"
-msgstr "В╕дкрити календар"
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "М╕сяць"
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "В╕дкрити календар"
 
-#: ui/evolution-calendar.h:15
-msgid "_Save Calendar As"
-msgstr "Зберегти календар як"
+#: po/tmp/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Prev"
+msgstr "Перегляд:"
 
-#: ui/evolution-calendar.h:16
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr "Надрукувати цей календар"
+
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Зберегти календар якось ╕накше"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
+msgstr "сьогодн╕"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Тиждень"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#, fuzzy
+msgid "_New"
+msgstr "Новий"
+
+#: po/tmp/evolution-calendar.xml.h:33
+msgid "_Open Calendar"
+msgstr "В╕дкрити календар"
+
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.h:18
-msgid "_New appointment..."
-msgstr "Нова зустр╕ч..."
+#: po/tmp/evolution-calendar.xml.h:35
+msgid "_Save Calendar As"
+msgstr "Зберегти календар як"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
+#: po/tmp/evolution-contact-editor.xml.h:8
 #, fuzzy
-msgid "Create a new appointment"
-msgstr "Стерти цю зустр╕ч"
+msgid "Delete..."
+msgstr "Стерти"
 
-#: ui/evolution-calendar.h:20
-msgid "Calendar Preferences..."
-msgstr "Параметри календаря..."
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "Дов╕дка"
 
-#: ui/evolution-calendar.h:21
-msgid "Alter preferences"
+#: po/tmp/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Надрукувати пов╕домлення..."
+
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
+msgstr "Надрукувати цей елемент"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
+msgid "Print..."
+msgstr "Друкувати..."
+
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save _As..."
+msgstr "Зберегти як..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Зберегти та закрити"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-calendar.h:25
-msgid "Print this calendar"
-msgstr "Надрукувати цей календар"
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-calendar.h:26
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Prev"
-msgstr "Перегляд:"
+msgid "Send _message to contact..."
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-calendar.h:27
-msgid "Go back in time"
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+msgid "_File"
+msgstr "Файл"
+
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Друкувати..."
+
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr "Зберегти"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-event-editor.xml.h:6
+msgid "About this application"
 msgstr ""
 
-#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
-msgid "Today"
-msgstr "сьогодн╕"
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "Шрифт..."
 
-#: ui/evolution-calendar.h:29
-msgid "Go to present time"
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "Д╕╖"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Календар"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Вир╕зати"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Календар"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "╤нвертувати виб╕р"
+
+#: po/tmp/evolution-event-editor.xml.h:14
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Стерти цю зустр╕ч"
+
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
+msgstr "Скоп╕ювати"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-calendar.h:30
-msgid "Next"
+#: po/tmp/evolution-event-editor.xml.h:17
+#, fuzzy
+msgid "Cut"
+msgstr "Вир╕зати"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-calendar.h:31
-msgid "Go forward in time"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-calendar.h:32
-msgid "Go to"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-calendar.h:33
-msgid "Go to a specific date"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-calendar.h:34
-msgid "Day"
-msgstr "День"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: ui/evolution-calendar.h:35
-msgid "Show 1 day"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-calendar.h:36
-msgid "5 Days"
-msgstr "5 Дн╕в"
+#: po/tmp/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution-calendar.h:37
-msgid "Show the working week"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-calendar.h:38
-msgid "Week"
-msgstr "Тиждень"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr ""
 
-#: ui/evolution-calendar.h:39
-msgid "Show 1 week"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-calendar.h:40
-msgid "Month"
-msgstr "М╕сяць"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.h:41
-msgid "Show 1 month"
+#: po/tmp/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Переслати"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
-#: ui/evolution.h:13
-msgid "_File"
-msgstr "Файл"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:10
-msgid "_Save"
-msgstr "Зберегти"
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Зберегти як"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:13
-msgid "_Print"
-msgstr "Друкувати"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:15
-msgid "Save and Close"
-msgstr "Зберегти та закрити"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
+#: po/tmp/evolution-event-editor.xml.h:38
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "Перегляд друку"
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
-msgstr "Друкувати..."
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
-msgstr "Надрукувати цей елемент"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Стерти цей елемент"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-mail.h:9
-msgid "_Threaded"
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Зберегти долучення"
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Переслати це пов╕домлення"
+msgid "FIXME: _File..."
+msgstr "Поштов╕ ф╕льтри..."
 
-#: ui/evolution-mail.h:11
-msgid "Print message..."
-msgstr "Надрукувати пов╕домлення..."
+#: po/tmp/evolution-event-editor.xml.h:49
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Шрифт..."
 
-#: ui/evolution-mail.h:12
-msgid "Print message to the printer"
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-mail.h:13
+#: po/tmp/evolution-event-editor.xml.h:52
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Перегляд друку"
+msgid "FIXME: _Journal Entry"
+msgstr "Журнальний рядок - %s"
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: ui/evolution-mail.h:14
+#: po/tmp/evolution-event-editor.xml.h:54
 #, fuzzy
-msgid "Previews the message to be printed"
-msgstr "В╕д╕слати пов╕домлення"
+msgid "FIXME: _Mail Message"
+msgstr "Виправити пов╕домлення"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
-msgid "Select _All"
-msgstr "Вибрати все"
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: ui/evolution-mail.h:16
-msgid "_Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: po/tmp/evolution-event-editor.xml.h:56
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "Перенести в теку"
 
-#: ui/evolution-mail.h:17
-msgid "Mail _Filters..."
-msgstr "Поштов╕ ф╕льтри..."
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "Нова зустр╕ч..."
 
-#: ui/evolution-mail.h:18
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-mail.h:19
-msgid "_Mail Configuration..."
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-mail.h:20
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-mail.h:21
-msgid "Forget _Passwords"
-msgstr "Забути парол╕"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
 
-#: ui/evolution-mail.h:22
-msgid "_Message"
-msgstr "Пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: ui/evolution-mail.h:23
-msgid "_Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
 
-#: ui/evolution-mail.h:24
-msgid "_Edit Message"
-msgstr "Виправити пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: ui/evolution-mail.h:25
-msgid "_Print Message"
-msgstr "Надрукувати пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr ""
 
-#: ui/evolution-mail.h:26
-msgid "Reply to _Sender"
-msgstr "В╕дпов╕сти в╕дправнику"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "F_ormat"
+msgstr "Формат"
 
-#: ui/evolution-mail.h:27
-msgid "Reply to _All"
-msgstr "В╕дпов╕сти вс╕м"
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
 
-#: ui/evolution-mail.h:28
-msgid "_Forward"
-msgstr "Переслати"
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
 
-#: ui/evolution-mail.h:29
-msgid "Mar_k As Read"
-msgstr "Позначити як прочитане"
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr ""
 
-#: ui/evolution-mail.h:30
-msgid "Mark As U_nread"
-msgstr "Позначити як непрочитане"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr ""
 
-#: ui/evolution-mail.h:32
-msgid "_Move to Folder"
-msgstr "Перенести в теку"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
 
-#: ui/evolution-mail.h:33
-msgid "_Copy to Folder"
-msgstr "Скоп╕ювати в теку"
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "Вийти"
 
-#: ui/evolution-mail.h:34
+#: po/tmp/evolution-event-editor.xml.h:75
 #, fuzzy
-msgid "_VFolder on Subject"
-msgstr "Адресати пов╕домлення"
+msgid "Paste"
+msgstr "Стор╕нка"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
 
-#: ui/evolution-mail.h:35
+#: po/tmp/evolution-event-editor.xml.h:77
 #, fuzzy
-msgid "VFolder on Se_nder"
-msgstr "Файлу не знайдено"
+msgid "Pre_vious"
+msgstr "Перегляд:"
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "Адресати пов╕домлення"
+msgid "Previous"
+msgstr "Перегляд:"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "_Filter on Subject"
-msgstr "Файлу не знайдено"
+msgid "Print S_etup..."
+msgstr "Друкувати..."
 
-#: ui/evolution-mail.h:38
+#: po/tmp/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Fi_lter on Sender"
-msgstr "Файлу не знайдено"
+msgid "Print Setup"
+msgstr "Параметри стор╕нки:"
 
-#: ui/evolution-mail.h:39
+#: po/tmp/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Filter on Rec_ipients"
-msgstr "Адресати пов╕домлення"
+msgid "Properties"
+msgstr "Властивост╕ долучення"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
-msgid "F_older"
-msgstr "Тека"
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Рад╕о"
 
-#: ui/evolution-mail.h:41
-msgid "_Expunge"
+#: po/tmp/evolution-event-editor.xml.h:85
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Видалити"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "В╕дпов╕сти"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
 msgstr ""
 
-#: ui/evolution-mail.h:42
-msgid "_Configure Folder"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 #, fuzzy
-msgid "Get Mail"
-msgstr "Подробиц╕"
+msgid "Save the current file"
+msgstr "Файл п╕дпису:"
 
-#: ui/evolution-mail.h:44
-msgid "Send queued mail and retrieve new mail"
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
 msgstr ""
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Вибрати все"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "Вибрати назви"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "_About..."
+msgstr "Про Evolution..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Закрити"
+
+#: po/tmp/evolution-event-editor.xml.h:106
+#, fuzzy
+msgid "_Copy"
+msgstr "Скоп╕ювати"
+
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+msgid "_Edit"
+msgstr "Редагування"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Шукати..."
+
+#: po/tmp/evolution-event-editor.xml.h:112
+#, fuzzy
+msgid "_Forms"
+msgstr "Формат"
+
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "Дов╕дка"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+#, fuzzy
+msgid "_Insert"
+msgstr "Покажчик"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "Тема"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "Пр╕звище:"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "Друкувати"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "Властивост╕ долучення"
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "Рад╕о"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "╤нструменти"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
 #, fuzzy
 msgid "Compose"
 msgstr "Дата виконання:"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: ui/evolution-mail.h:53
+#: po/tmp/evolution-mail.xml.h:9
+msgid "Copy message to a new folder"
+msgstr "Скоп╕ювати пов╕домлення у нову теку"
+
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+msgid "F_older"
+msgstr "Тека"
+
+#: po/tmp/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Fi_lter on Sender"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Filter on Rec_ipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "Забути парол╕"
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "Подробиц╕"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "Поштов╕ ф╕льтри..."
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Опис:"
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr "Позначити як прочитане"
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr "Позначити як непрочитане"
+
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail.h:54
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.h:55
-msgid "Copy"
-msgstr "Скоп╕ювати"
+#: po/tmp/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "В╕д╕слати пов╕домлення"
 
-#: ui/evolution-mail.h:56
-msgid "Copy message to a new folder"
-msgstr "Скоп╕ювати пов╕домлення у нову теку"
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Перегляд друку"
 
-#: ui/evolution-subscribe.h:11 ui/evolution.h:28
-msgid "_Edit"
-msgstr "Редагування"
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+msgid "Print message..."
+msgstr "Надрукувати пов╕домлення..."
 
-#: ui/evolution-subscribe.h:13
-msgid "_Unselect All"
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr "В╕дпов╕сти в╕дправнику"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
+msgstr "Вибрати все"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
-msgid "Subscribe"
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Переслати це пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:42
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:43
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
-msgid "Unsubscribe"
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "Редагування"
+
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
 msgstr ""
 
-#: ui/evolution-subscribe.h:18
-msgid "Add folder to your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Скоп╕ювати в теку"
+
+#: po/tmp/evolution-mail.xml.h:49
+msgid "_Edit Message"
+msgstr "Виправити пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-subscribe.h:20
-msgid "Remove folder from your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:51
+#, fuzzy
+msgid "_Filter on Subject"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr "Переслати"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr "╤нвертувати виб╕р"
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
 msgstr ""
 
-#: ui/evolution-subscribe.h:21
-msgid "Refresh List"
-msgstr "Оновити список"
+#: po/tmp/evolution-mail.xml.h:55
+msgid "_Message"
+msgstr "Пов╕домлення"
 
-#: ui/evolution-subscribe.h:22
-msgid "Refresh List of Folders"
-msgstr "Оновити список тек"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "Перенести в теку"
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: po/tmp/evolution-mail.xml.h:58
+msgid "_Print Message"
+msgstr "Надрукувати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Зберегти як..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Джерело"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "Стерти"
+
+#: po/tmp/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_VFolder on Subject"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
+msgstr "В╕ртуальн╕ теки"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
+msgid "Attach"
+msgstr "Долучити файл"
 
-#: ui/evolution.h:10
-msgid "Toggle whether to show the shortcut bar"
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "Закривання поточно╖ теки"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
 msgstr ""
 
-#: ui/evolution.h:11
-msgid "Show the _Folder Bar"
-msgstr "Показати панель тек"
+#: po/tmp/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Долучити файл до пов╕домлення"
 
-#: ui/evolution.h:12
-msgid "Toggle whether to show the folder bar"
-msgstr "Перемикнути стан показу панел╕ тек"
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
 
-#: ui/evolution.h:16
-msgid "_Folder"
-msgstr "Тека"
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "В╕дкрити файл"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
+msgid "Save As"
+msgstr "Зберегти як"
 
-#: ui/evolution.h:18
-msgid "_Mail message (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: ui/evolution.h:19
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Перейти на теку..."
 
-#: ui/evolution.h:20
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Редактор зв'язк╕в"
+msgid "Save the message in a specified folder"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution.h:21
-msgid "_Task (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Стерти це пов╕домлення"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Зберегти долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: ui/evolution.h:22
-msgid "_Go to Folder..."
-msgstr "Перейти на теку..."
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "В╕дкрити..."
 
-#: ui/evolution.h:23
-msgid "Display a different folder"
-msgstr "В╕добразити ╕ншу теку"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#: ui/evolution.h:24
-msgid "_Create New Folder..."
-msgstr "Створити нову теку..."
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr "Оновити список"
 
-#: ui/evolution.h:25
-msgid "Create a new folder"
-msgstr "Створити нову теку"
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr "Оновити список тек"
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
 
-#: ui/evolution.h:26
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr "В╕добразити ╕ншу теку"
+
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.h:27
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Evolution - %s"
+
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.h:30
-msgid "_Settings"
-msgstr "Установки"
+#: po/tmp/evolution.xml.h:10
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Час початку зустр╕ч╕:"
 
-#: ui/evolution.h:31
-msgid "_Help"
-msgstr "Дов╕дка"
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr "Показати ╕нформац╕ю про Evolution"
 
-#: ui/evolution.h:32
-msgid "_Index"
-msgstr "Покажчик"
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr "Показати панель тек"
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:13
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Час початку зустр╕ч╕:"
+msgid "Show the _Shortcut Bar"
+msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: ui/evolution.h:34
-msgid "Using the _Mailer"
-msgstr ""
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "В╕д╕слати зв╕т про помилку"
 
-#: ui/evolution.h:35
+#: po/tmp/evolution.xml.h:15
 #, fuzzy
-msgid "Using the _Calendar"
-msgstr "Надрукувати календар"
+msgid "Submit bug report using Bug Buddy."
+msgstr "В╕д╕слати зв╕т про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr "Перемикнути стан показу панел╕ тек"
+
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "В╕д╕слати зв╕т про помилку"
+#: po/tmp/evolution.xml.h:19
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "Надрукувати календар"
 
-#: ui/evolution.h:38
-msgid "Submit bug report using Bug Buddy"
-msgstr "В╕д╕слати зв╕т про помилку за допомогою Bug Buddy"
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
 
-#: ui/evolution.h:39
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "Про Evolution..."
 
-#: ui/evolution.h:40
-msgid "Show information about Evolution"
-msgstr "Показати ╕нформац╕ю про Evolution"
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr "Зустр╕ч"
+
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "Редактор зв'язк╕в"
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "Тека"
+
+#: po/tmp/evolution.xml.h:27
+msgid "_Go to Folder..."
+msgstr "Перейти на теку..."
+
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr "Покажчик"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr "Установки"
+
+#: po/tmp/evolution.xml.h:33
+msgid "_Task (FIXME)"
+msgstr ""
+
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -5631,43 +6650,28 @@ 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:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. 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:415
-msgid "MTWTFSS"
-msgstr "ПВСЧПСН"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "зараз"
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -5675,3 +6679,151 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Група %i"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ви впевнен╕, що хочете\n"
+#~ "стерти цю контактну ╕нформац╕ю?"
+
+#~ msgid "window2"
+#~ msgstr "в╕кно2"
+
+#~ msgid "Daily"
+#~ msgstr "Щодня"
+
+#~ msgid "Weekly"
+#~ msgstr "Щотижня"
+
+#~ msgid "Monthly"
+#~ msgstr "Щом╕сяця"
+
+#~ msgid "Yearly"
+#~ msgstr "Щороку"
+
+#~ msgid "label23"
+#~ msgstr "позначка23"
+
+#~ msgid "label24"
+#~ msgstr "позначка24"
+
+#~ msgid "label25"
+#~ msgstr "позначка25"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday\n"
+#~ msgstr ""
+#~ "Понед╕лок\n"
+#~ "В╕второк\n"
+#~ "Середа\n"
+#~ "Четвер\n"
+#~ "П'ятниця\n"
+#~ "Субота\n"
+#~ "Нед╕ля\n"
+
+#~ msgid "label27"
+#~ msgstr "позначка27"
+
+#, fuzzy
+#~ msgid "Ending date"
+#~ msgstr "К╕нцева дата"
+
+#, fuzzy
+#~ msgid "End after"
+#~ msgstr "К╕нцева дата"
+
+#, fuzzy
+#~ msgid "Change"
+#~ msgstr "Стор╕нка"
+
+#, fuzzy
+#~ msgid "Due Date:"
+#~ msgstr "Дата"
+
+#~ msgid "Priority:"
+#~ msgstr "Приор╕тет:"
+
+#~ msgid "Time display"
+#~ msgstr "В╕дображення часу"
+
+#~ msgid "Time format"
+#~ msgstr "Формат часу"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12-годинний (ДП/ПП)"
+
+#~ msgid "24-hour"
+#~ msgstr "24-годинний"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Початок тижня"
+
+#~ msgid "Day range"
+#~ msgstr "Д╕апазон дн╕в"
+
+#~ msgid "Preferences"
+#~ msgstr "Параметри"
+
+#, fuzzy
+#~ msgid "Could not create summary"
+#~ msgstr "Створити новий календар"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Не вдалося отримати пов╕домлення: %s"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Не вдалося перейменувати теку \"%s\": %s ╕сну╓"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#, fuzzy
+#~ msgid "Full Search"
+#~ msgstr "Пошук"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Не вдалось створити канал до %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Не вдалось виконати %s: %s\n"
+
+#, fuzzy
+#~ msgid "Retrieving messages : %s"
+#~ msgstr "Переслати це пов╕домлення"
+
+#~ msgid "Open in New Window"
+#~ msgstr "В╕дкрити у новому в╕кн╕"
+
+#~ msgid "Forward Message"
+#~ msgstr "Переслати пов╕домлення"
+
+#~ msgid "Delete Message"
+#~ msgstr "Стерти пов╕домлення"
+
+#~ msgid "Move Message"
+#~ msgstr "Перенести пов╕домлення"
+
+#~ msgid "Copy Message"
+#~ msgstr "Скоп╕ювати пов╕домлення"
+
+#, fuzzy
+#~ msgid "_New Contact"
+#~ msgstr "Стерти контактну ╕нформац╕ю?"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Новий календар"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "Створити нову теку..."