Updated Ukrainian Translation

svn path=/trunk/; revision=13580

1 files changed, 470 insertions, 572 deletions

diff --git a/po/uk.po b/po/uk.po
index 3f9b5939c8..b4d6232900 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
+"POT-Creation-Date: 2001-10-11 13:24+0300\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"
@@ -732,8 +732,7 @@ msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
 #: addressbook/gui/component/addressbook-component.c:66
 #: calendar/gui/dialogs/comp-editor-util.c:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-shortcuts.c:1062
 #, fuzzy
 msgid "Contacts"
 msgstr "Контакт"
@@ -805,7 +804,7 @@ msgid "Base"
 msgstr "Вставити"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:172
 #, fuzzy
 msgid "Basic"
 msgstr "Вставити"
@@ -914,11 +913,6 @@ msgstr "Порт:"
 msgid "_Server name:"
 msgstr "Назва сервера:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-#, fuzzy
-msgid "Other Contacts"
-msgstr "Контакт"
-
 #: addressbook/gui/component/addressbook.c:400
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
@@ -969,8 +963,7 @@ msgid "Category is"
 msgstr "Категор╕╖"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:104
 msgid "Advanced..."
 msgstr "Додатково..."
 
@@ -984,16 +977,6 @@ msgstr "Будь-яка категор╕я"
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:178
-#, fuzzy
-msgid "(none)"
-msgstr "(Без назви)"
-
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #: addressbook/gui/contact-editor/e-contact-editor.c:1636
@@ -1056,7 +1039,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:164
 #: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
 #: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
 msgid "Remove"
 msgstr "Видалити"
@@ -1163,7 +1146,7 @@ msgid "Contact Editor"
 msgstr "Редактор контакт╕в"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:177
 msgid "Details"
 msgstr "Подробиц╕"
 
@@ -1232,8 +1215,8 @@ msgstr "Контакти..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1400 mail/mail-config.glade.h:96
 #: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
@@ -1293,13 +1276,6 @@ msgid "_Web page address:"
 msgstr "Адреса стор╕нки WWW:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Ви впевнен╕, що хочете стерти завдання"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Стерти контакт?"
 
@@ -2536,7 +2512,7 @@ msgstr "Усп╕шно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
 #: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: shell/e-storage.c:520
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
@@ -2545,7 +2521,7 @@ msgstr "Нев╕дома помилка"
 msgid "Repository offline"
 msgstr "Перенесення"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:510
 msgid "Permission denied"
 msgstr ""
 
@@ -2873,20 +2849,20 @@ msgstr "Надрукувати конверт"
 
 #: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:652
 msgid "High"
 msgstr "Високий"
 
 #: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
 #: calendar/gui/calendar-model.c:1673
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:651
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:650
 msgid "Low"
 msgstr "Низький"
 
@@ -3024,11 +3000,11 @@ msgstr "Час сну (в хвилинах)"
 msgid "_Edit appointment"
 msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:629
 msgid "No description available."
 msgstr "Нема╓ опису."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:689
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3036,7 +3012,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:740
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3069,7 +3045,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3258,12 +3234,12 @@ msgstr "Опис м╕стить"
 msgid "Comment contains"
 msgstr "Коментар м╕стить"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
 msgstr ""
 
 #: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: shell/e-shortcuts.c:1056
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3271,9 +3247,8 @@ msgstr "Календар"
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:68 my-evolution/e-summary-tasks.c:235
+#: my-evolution/e-summary-tasks.c:251 shell/e-shortcuts.c:1059
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Завдання"
@@ -3287,7 +3262,7 @@ msgstr "Ф╕льтр списку розсилки"
 msgid "Create a new appointment"
 msgstr "Створити нову зустр╕ч"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3422
 msgid "New _Appointment"
 msgstr "Нова зустр╕ч"
 
@@ -3869,12 +3844,12 @@ msgstr "Журнальний запис - %s"
 msgid "No summary"
 msgstr "Нема╓ зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
+#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1747
 #: mail/mail-display.c:100
 msgid "Overwrite file?"
 msgstr "Переписати файл?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
+#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1755
 #: mail/mail-display.c:104
 msgid ""
 "A file by that name already exists.\n"
@@ -3949,26 +3924,26 @@ msgstr "Стерто"
 msgid "Enter Delegate"
 msgstr "Стерто"
 
-#: calendar/gui/dialogs/event-editor.c:186
+#: calendar/gui/dialogs/event-editor.c:181
 msgid "Appointment"
 msgstr "Зустр╕ч"
 
-#: calendar/gui/dialogs/event-editor.c:191
+#: calendar/gui/dialogs/event-editor.c:186
 msgid "Reminder"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/event-editor.c:196
+#: calendar/gui/dialogs/event-editor.c:191
 msgid "Recurrence"
 msgstr "Повторення"
 
-#: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
 #, fuzzy
 msgid "Scheduling"
 msgstr "Планувати зустр╕ч"
 
-#: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
 #, fuzzy
 msgid "Meeting"
 msgstr "Зас╕дання"
@@ -4013,7 +3988,7 @@ msgid "Pu_blic"
 msgstr "Публ╕чне"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:12
 #, fuzzy
 msgid "Show Time As"
 msgstr "Показати"
@@ -4031,31 +4006,31 @@ msgstr "Час завершення:"
 msgid "_Start time:"
 msgstr "Дата початку:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
+#: calendar/gui/dialogs/meeting-page.c:504
 msgid "That person is already attending the meeting!"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Автомоб╕льний телефон"
 
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
 #, fuzzy
 msgid "Required Participants"
 msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Потр╕бн╕ люди"
 
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
 #, fuzzy
 msgid "Non-Participants"
 msgstr "Потр╕бн╕ люди"
@@ -4079,59 +4054,53 @@ msgstr "Весь супров╕д"
 #: calendar/gui/dialogs/meeting-page.etspec.h:2
 #: calendar/gui/e-meeting-time-sel.etspec.h:2
 #, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Клацн╕ть тут щоб додати контакт *"
+msgid "Common Name"
+msgstr "Дата завершення"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:3
 #: calendar/gui/e-meeting-time-sel.etspec.h:3
 #, fuzzy
-msgid "Common Name"
-msgstr "Дата завершення"
+msgid "Delegated From"
+msgstr "Стерто"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:4
 #: calendar/gui/e-meeting-time-sel.etspec.h:4
 #, fuzzy
-msgid "Delegated From"
+msgid "Delegated To"
 msgstr "Стерто"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:5
 #: calendar/gui/e-meeting-time-sel.etspec.h:5
 #, fuzzy
-msgid "Delegated To"
-msgstr "Стерто"
+msgid "Language"
+msgstr "Кер╕вник"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:6
 #: calendar/gui/e-meeting-time-sel.etspec.h:6
-#, fuzzy
-msgid "Language"
-msgstr "Кер╕вник"
+msgid "Member"
+msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:7
 #: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
+msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
 #, fuzzy
 msgid "Role"
 msgstr "Моб╕льний"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-meeting-time-sel.etspec.h:9 filter/libfilter-i18n.h:49
 #: mail/message-list.etspec.h:8
 msgid "Status"
 msgstr "Стан"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/mail-config.glade.h:87
 #: shell/glade/e-active-connection-dialog.glade.h:5
 msgid "Type"
 msgstr "Тип"
@@ -4287,8 +4256,8 @@ msgstr "Пр╕оритет:"
 msgid "_Status:"
 msgstr "Стан:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
 #, fuzzy
 msgid "Assignment"
 msgstr "Призначення"
@@ -4367,27 +4336,27 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
+#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3443
+#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1379
 #: shell/e-shortcuts-view.c:385
 msgid "_Open"
 msgstr "В╕дкрити"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
+#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3452
 #: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вир╕зати"
 
-#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3455
+#: calendar/gui/e-calendar-table.c:920 calendar/gui/e-day-view.c:3454
 #: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Скоп╕ювати"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
+#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3429
+#: calendar/gui/e-day-view.c:3456 calendar/gui/e-week-view.c:3283
 #: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
@@ -4411,7 +4380,6 @@ msgid "_Delete Selected Tasks"
 msgstr "Стерти вибран╕ завдання"
 
 #: calendar/gui/e-calendar-table.c:1194
-#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Click to add a task"
 msgstr "Клацн╕ть щоб додати завдання"
@@ -4420,50 +4388,50 @@ msgstr "Клацн╕ть щоб додати завдання"
 msgid "Alarms"
 msgstr "Си╜нали"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
+#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:718
 #: camel/camel-filter-driver.c:834
 #, fuzzy
 msgid "Complete"
 msgstr "% завершення:"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Completion Date"
 msgstr "Дата завершення"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:9
 msgid "End Date"
 msgstr "Дата к╕нця"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Geographical Position"
 msgstr "Географ╕чне положення"
 
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Priority"
 msgstr "Пр╕оритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Start Date"
 msgstr "Дата початку"
 
 #. FIXME: Inbox shortcut should point to something else for
 #. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:15
 #: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
+#: shell/e-storage-set-view.c:1444
 msgid "Summary"
 msgstr "Зведення"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:16
 #, fuzzy
 msgid "Task sort"
 msgstr "Сортувати завдання"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
+#: calendar/gui/e-calendar-table.etspec.h:18
 msgid "URL"
 msgstr "URL"
 
@@ -4474,104 +4442,64 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1402
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:345
 msgid "am"
 msgstr "дп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:348
 msgid "pm"
 msgstr "пп"
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3424 calendar/gui/e-week-view.c:3278
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Нова щоденна под╕я"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3288
 #: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to _Today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3436 calendar/gui/e-week-view.c:3290
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "К╕нцева дата"
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3445 calendar/gui/e-week-view.c:3298
 #, fuzzy
 msgid "_Delete this Appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3323
 #, fuzzy
 msgid "Make this Occurrence _Movable"
 msgstr "Зберегти поточний файл"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3325
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей елемент"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3468 calendar/gui/e-week-view.c:3327
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Джерела"
 
-#: calendar/gui/e-itip-control.c:469
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:474
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:479
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Нема╓ ╕нформац╕╖"
-
-#: calendar/gui/e-itip-control.c:483
-msgid "Begins: <b>"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:692
-#, c-format
-msgid "<b>Summary:</b> %s<br><br>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:702
-#, fuzzy, c-format
-msgid "<b>Description:</b> %s"
-msgstr "Опис:"
-
 #: calendar/gui/e-itip-control.c:737
 #, c-format
 msgid "<b>%s</b> has published meeting information."
@@ -4731,69 +4659,65 @@ msgstr ""
 msgid "Bad Free/Busy Message"
 msgstr "Попередн╓ пов╕домлення"
 
-#: calendar/gui/e-itip-control.c:917
+#: calendar/gui/e-itip-control.c:916
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Схоже тека непоправно з╕псована."
 
-#: calendar/gui/e-itip-control.c:936
+#: calendar/gui/e-itip-control.c:935
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
+#: calendar/gui/e-itip-control.c:963 calendar/gui/e-itip-control.c:969
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:995
-msgid "The attachment has no viewable calendar items"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1094
+#: calendar/gui/e-itip-control.c:1088
 msgid "Calendar file could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1090
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Дата виконання:"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1134
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1142
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1144
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Весь супров╕д"
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1146
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Не вдалося створити календар в \"%s\""
 
-#: calendar/gui/e-itip-control.c:1183
+#: calendar/gui/e-itip-control.c:1176
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% завершення:"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
+#: calendar/gui/e-itip-control.c:1208 calendar/gui/e-itip-control.c:1242
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Дата в╕дсилання"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1210 calendar/gui/e-itip-control.c:1246
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1406
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4858,7 +4782,7 @@ msgstr "К╕мната"
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
 #: calendar/gui/e-meeting-model.c:690
 #: camel/providers/smtp/camel-smtp-transport.c:224
-#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
+#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
 msgid "Unknown"
 msgstr ""
 
@@ -5086,11 +5010,7 @@ msgstr ""
 msgid "September"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:253
-msgid "Atleast one attendee is necessary"
-msgstr ""
-
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:258
 msgid "An organizer must be set."
 msgstr "Потр╕бно вказати орган╕затора."
 
@@ -5290,7 +5210,7 @@ msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
 #: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
+#: mail/mail-callbacks.c:2163 my-evolution/e-summary.c:607
 #: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
 msgid "Print Preview"
 msgstr "Перегляд друку"
@@ -5341,107 +5261,107 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "НПВСЧПС"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:230
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:254
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:259
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:267
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:296
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:308
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:335
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:367
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:408
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:504
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:516
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:646
 msgid "contains? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:651
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:658
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:675
 msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
+"contains? expects argument 1 to be one of \"any\", \"summary\", "
+"\"description\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:717
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:729
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:817
 msgid "is-completed? expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:862
 msgid "completed-before? expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:867
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1155
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5506,7 +5426,7 @@ msgid "Unable to process spool folder"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
 #: camel/camel-filter-driver.c:683
-#, fuzzy, c-format
+#, fuzzy
 msgid "Getting message %d (%d%%)"
 msgstr "Запис пов╕домлення %d з %d"
 
@@ -5552,26 +5472,19 @@ msgstr "Помилка збереження файлу: %s"
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:479
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1048
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Помилка у ре╜улярному вираз╕ \"%s\":\n"
 "%s"
 
-#: camel/camel-folder.c:1087
-#, fuzzy, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr ""
-"Помилка у ре╜улярному вираз╕ \"%s\":\n"
-"%s"
-
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1229
 #, fuzzy
 msgid "Moving messages"
 msgstr "Коп╕ювання пов╕домлень"
@@ -6118,12 +6031,12 @@ msgstr ""
 "Не вдалося в╕дкрити файл \"%s\":\n"
 "%s"
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:554
 #, fuzzy, c-format
 msgid "No such message %s in %s"
 msgstr "Переслати це пов╕домлення"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:649
 #, fuzzy, c-format
 msgid "No such message: %s"
 msgstr "Переслати це пов╕домлення"
@@ -6148,7 +6061,7 @@ msgstr "Не вдалося отримати теку: %s: %s"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-vtrash-folder.c:117
+#: camel/camel-vtrash-folder.c:109
 #, fuzzy
 msgid "You cannot copy messages from this trash folder."
 msgstr ""
@@ -6179,42 +6092,42 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь OK в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:191
+#: camel/providers/imap/camel-imap-folder.c:189
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:210
+#: camel/providers/imap/camel-imap-folder.c:208
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:274
+#: camel/providers/imap/camel-imap-folder.c:272
 msgid "Folder was destroyed and recreated on server."
 msgstr ""
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:436
+#: camel/providers/imap/camel-imap-folder.c:434
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Збереження пов╕домлень"
 
-#: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1491
+#: camel/providers/imap/camel-imap-folder.c:1894
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1639
 #, fuzzy
 msgid "Scanning for new messages"
 msgstr "Збереження пов╕домлень"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:1931
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -6309,7 +6222,7 @@ msgstr ""
 msgid "No such folder %s"
 msgstr "Нев╕рна тека \"%s\"."
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1148
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6416,7 +6329,7 @@ msgstr "В╕д╕слан╕ пов╕домлення"
 #: camel/providers/local/camel-mh-folder.c:195
 #: camel/providers/local/camel-mh-folder.c:204
 #: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:537
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -6428,7 +6341,7 @@ msgstr ""
 #: camel/providers/local/camel-maildir-folder.c:206
 #: camel/providers/local/camel-mbox-folder.c:328
 #: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:580
+#: camel/providers/local/camel-spool-folder.c:537
 #, fuzzy
 msgid "No such message"
 msgstr "Переслати це пов╕домлення"
@@ -6495,13 +6408,13 @@ msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
 #: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:275
+#: camel/providers/local/camel-spool-folder.c:273
 #, fuzzy, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
 #: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:457
+#: camel/providers/local/camel-spool-folder.c:414
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
@@ -6514,9 +6427,9 @@ msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
 #: camel/providers/local/camel-mbox-folder.c:344
 #: camel/providers/local/camel-mbox-folder.c:376
 #: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:596
-#: camel/providers/local/camel-spool-folder.c:628
-#: camel/providers/local/camel-spool-folder.c:641
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -6526,12 +6439,12 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:629
+#: camel/providers/local/camel-spool-folder.c:586
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно з╕псована."
 
 #: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:642
+#: camel/providers/local/camel-spool-folder.c:599
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -6680,7 +6593,7 @@ msgstr "\"%s\" не ╓ каталогом."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Неможливо в╕дкрити поштову скриньку: %s: %s\n"
 
-#: camel/providers/local/camel-spool-folder.c:513
+#: camel/providers/local/camel-spool-folder.c:470
 #, fuzzy, c-format
 msgid "Cannot append message to spool file: %s: %s"
 msgstr "Неможливо додати пов╕домлення до файлу Mbox: %s: %s"
@@ -6820,41 +6733,41 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:176
+#: camel/providers/pop3/camel-pop3-folder.c:189
 #, fuzzy
 msgid "Retrieving POP summary"
 msgstr "Отримання пов╕домлення %d з %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:182
+#: camel/providers/pop3/camel-pop3-folder.c:195
 #, fuzzy, c-format
 msgid "Could not check POP server for new messages: %s"
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-folder.c:229
+#: camel/providers/pop3/camel-pop3-folder.c:242
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:253
+#: camel/providers/pop3/camel-pop3-folder.c:266
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "Стерти вибран╕ пов╕домлення"
 
-#: camel/providers/pop3/camel-pop3-folder.c:329
+#: camel/providers/pop3/camel-pop3-folder.c:342
 #, fuzzy, c-format
 msgid "Could not fetch message: %s"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:345
+#: camel/providers/pop3/camel-pop3-folder.c:358
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:368
+#: camel/providers/pop3/camel-pop3-folder.c:381
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/pop3/camel-pop3-folder.c:372
+#: camel/providers/pop3/camel-pop3-folder.c:385
 #, fuzzy, c-format
 msgid "Retrieving POP message %d"
 msgstr "Отримання пов╕домлення %d з %d"
@@ -7274,58 +7187,47 @@ msgstr ""
 msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:97
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:99
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт╕в"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:478
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:509
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:510
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
-#, fuzzy, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Не вдалося отримати теку: %s: %s"
-
-#: composer/e-msg-composer-attachment.c:176
-#, fuzzy, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "\"%s\" не ╓ звичайним файлом."
-
 #: composer/e-msg-composer-attachment.glade.h:1
 msgid "Attachment properties"
 msgstr "Властивост╕ долучення"
@@ -7494,11 +7396,11 @@ msgstr "В╕дкрити файл"
 msgid "Insert File"
 msgstr "Вставити текстовий файл..."
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1870 composer/e-msg-composer.c:2316
 msgid "Compose a message"
 msgstr "П╕дготувати пов╕домлення"
 
-#: composer/e-msg-composer.c:2407
+#: composer/e-msg-composer.c:2406
 msgid "Could not create composer window."
 msgstr "Не вдалось створити в╕кно конструктора."
 
@@ -7779,7 +7681,7 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: filter/filter-datespec.c:711 mail/message-list.c:939
+#: filter/filter-datespec.c:711 mail/message-list.c:940
 #, fuzzy
 msgid "%b %d %l:%M %p"
 msgstr "%I:%M %p"
@@ -8069,7 +7971,7 @@ msgstr "В╕дпов╕сти вс╕м"
 msgid "Score"
 msgstr "Моб╕льний"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1325
 msgid "Sender"
 msgstr "В╕дправник"
 
@@ -8104,7 +8006,7 @@ msgstr "почина╓ться на"
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:921
 #: mail/message-list.etspec.h:9
 msgid "Subject"
 msgstr "Тема"
@@ -8299,56 +8201,51 @@ msgstr "В╕ртуальн╕ теки"
 msgid "Virtual Trash folder"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/component-factory.c:125
-#, fuzzy, c-format
-msgid "Cannot connect to store: %s"
-msgstr "Створити новий календар"
-
-#: mail/component-factory.c:146
+#: mail/component-factory.c:114
 msgid "This folder cannot contain messages."
 msgstr ""
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:357
 #, fuzzy
 msgid "Properties..."
 msgstr "Властивост╕..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:357
 #, fuzzy
 msgid "Change this folder's properties"
 msgstr "Зм╕нити властивост╕ ц╕╓╖ теки"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:700
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:814
 #, fuzzy
 msgid "New Mail Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:814
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:845
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:854
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:860
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати поштовий компонент Evolutuion."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1025
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -8361,174 +8258,174 @@ msgstr "Властивост╕"
 msgid "Properties"
 msgstr "Властивост╕"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:262 mail/mail-display.c:275
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:734
 #, c-format
 msgid "%d new"
 msgstr ""
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:737 mail/folder-browser.c:742
+#: mail/folder-browser.c:764
 msgid ", "
 msgstr ""
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:738
 #, c-format
 msgid "%d hidden"
 msgstr ""
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:743
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Стерто"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:766
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "В╕д╕слати"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:768
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "В╕д╕слати"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:770
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1013
 #, fuzzy
 msgid "Create vFolder from Search"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1362
 #, fuzzy
 msgid "VFolder on _Subject"
 msgstr "В╕ртуальна тека теми"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1363
 msgid "VFolder on Se_nder"
 msgstr "В╕ртуальна тека в╕дправника"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1364
 msgid "VFolder on _Recipients"
 msgstr "В╕ртуальна тека отримувач╕в"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1365
 #, fuzzy
 msgid "VFolder on Mailing _List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1369
 msgid "Filter on Sub_ject"
 msgstr "Ф╕льтр теми"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1370
 msgid "Filter on Sen_der"
 msgstr "Ф╕льтр в╕дправника"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1371
 msgid "Filter on Re_cipients"
 msgstr "Ф╕льтр отримувач╕в"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1372
 msgid "Filter on _Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1380 ui/evolution-mail-message.xml.h:89
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1381 ui/evolution-mail-message.xml.h:97
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1382
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1386 ui/evolution-mail-message.xml.h:96
 #, fuzzy
 msgid "_Reply to Sender"
 msgstr "В╕дпов╕сти в╕дправнику"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1387 ui/evolution-mail-message.xml.h:69
 #, fuzzy
 msgid "Reply to _List"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1388 ui/evolution-mail-message.xml.h:68
 msgid "Reply to _All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1389
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1391 ui/evolution-mail-message.xml.h:40
 msgid "Mar_k as Read"
 msgstr "Позначити прочитаним"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1392 ui/evolution-mail-message.xml.h:42
 msgid "Mark as U_nread"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1393
 #, fuzzy
 msgid "Mark as _Important"
 msgstr "Важливо"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1394
 #, fuzzy
 msgid "Mark as Unim_portant"
 msgstr "Позначити непрочитаним"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1398
 msgid "_Move to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1399
 msgid "_Copy to Folder..."
 msgstr "Скоп╕ювати в теку..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1401 ui/evolution-mail-message.xml.h:99
 msgid "_Undelete"
 msgstr "В╕дновити"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1405
 #, fuzzy
 msgid "Add Sender to Address Book"
 msgstr "Додати в╕дправника а адресну книгу"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1408
 msgid "Apply Filters"
 msgstr "Застосувати ф╕льтри"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1410
 #, fuzzy
 msgid "Create Ru_le From Message"
 msgstr "Створити правило з пов╕домлення"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1560
 msgid "Filter on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1561
 #, fuzzy
 msgid "VFolder on Mailing List"
 msgstr "Ф╕льтр списку розсилки"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1563
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1564
 #, fuzzy, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Ф╕льтр списку розсилки (%s)"
@@ -8607,8 +8504,8 @@ msgstr "╤нсталяц╕я Evolution"
 #: mail/mail-account-gui.c:947
 #, fuzzy
 msgid "Could not save signature file."
-msgstr "Не вдалося зберегти файл си"
-"Не вдалося в╕дкрити файл п╕дпису %s:\n"
+msgstr ""
+"Не вдалося зберегти файл сиНе вдалося в╕дкрити файл п╕дпису %s:\n"
 "%s"
 
 #: mail/mail-account-gui.c:1024
@@ -8688,7 +8585,7 @@ msgstr "Список розсилки %s"
 msgid "Add Filter Rule"
 msgstr "Редагування"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:163
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8696,129 +8593,129 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:215
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:227
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:251
 msgid "You have not set a mail transport method"
 msgstr ""
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:282
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:297
 #, fuzzy
 msgid "Send anyway?"
 msgstr "В╕д╕слати пошту"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:339
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:383
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:387
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Неможливо в╕д╕слати пов╕домлення: не визначено отримувач╕в"
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:391
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:485
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:520
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:616
 msgid "You must configure an account before you can send this email."
 msgstr ""
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:849
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Нев╕дома помилка"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:854
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1243
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1245
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1621
 #, fuzzy, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1643
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1678
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1691
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Ви впевнен╕, що хочете стерти завдання \"%s\"?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1712
 #, fuzzy
 msgid "No Message Selected"
 msgstr "Пов╕домлення було отримано"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1799
 msgid "Save Message As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1801
 msgid "Save Messages As..."
 msgstr "Зберегти пов╕домлення як..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1946 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Попередження"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:1953
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8826,61 +8723,61 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:1960
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Б╕льше не показувати це пов╕домлення."
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2065
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2076
 msgid "Filters"
 msgstr "Ф╕льтри"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2124
 msgid "Print Message"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2170
 msgid "Printing of message failed"
 msgstr "Не вдалося надрукувати пов╕домлення"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2259
 #, fuzzy, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Ви впевнен╕, що хочете стерти зустр╕ч"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:136
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in,\n"
 "unless you wish to include this information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:138
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:140
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:142
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system\n"
 "administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:154
+#: mail/mail-config-druid.c:144
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and\n"
@@ -8892,16 +8789,11 @@ msgid ""
 msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:591
+#: mail/mail-config-druid.c:569
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "╤нсталяц╕я Evolution"
 
-#: mail/mail-config.c:315
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Електронна адреса м╕стить"
-
 #: mail/mail-config.c:1618
 #, c-format
 msgid ""
@@ -8910,14 +8802,6 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1629
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "mbox"
-
 #: mail/mail-config.c:1873
 msgid "Checking Service"
 msgstr ""
@@ -9039,7 +8923,7 @@ msgstr "День"
 msgid "Done"
 msgstr "Нема╓"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:32
 msgid "Drafts"
 msgstr "Чорновики"
 
@@ -9052,8 +8936,7 @@ msgstr "Створення ново╖ теки"
 msgid "E_nable"
 msgstr ""
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:103
 #, fuzzy
 msgid "Edit..."
 msgstr "Виправити"
@@ -9203,7 +9086,6 @@ msgid "Sending Mail"
 msgstr "Sendmail"
 
 #: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
 msgid "Sent"
 msgstr "В╕д╕слано"
 
@@ -9428,205 +9310,200 @@ msgstr "Не вдалось створити в╕кно конструктора."
 msgid "Could not create a S/MIME decode context."
 msgstr "Не вдалось створити в╕кно конструктора."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:223
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:327
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:329
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:331
 #, c-format
 msgid "Open in %s..."
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:392
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:396
 msgid "Hide"
 msgstr "Прибрати"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:417
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1055
 #, fuzzy
 msgid "Loading message content"
 msgstr "Пересилання пов╕домлень \"%s\""
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1517
 #, fuzzy
 msgid "Open Link in Browser"
 msgstr "В╕дкрити у новому в╕кн╕"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1519
 #, fuzzy
 msgid "Copy Link Location"
 msgstr "Контакт"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1522
 #, fuzzy
 msgid "Save Link as (FIXME)"
 msgstr "Завдання"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1525
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Зберегти як..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:627
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "долучення"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:680
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:764
 #, fuzzy
 msgid "Date"
 msgstr "п╕сля"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:866
 #, fuzzy
 msgid "Bad Address"
 msgstr "Електронна адреса:"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:907 mail/message-list.etspec.h:3
 msgid "From"
 msgstr "В╕д"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:910
 #, fuzzy
 msgid "Reply-To"
 msgstr "В╕дпов╕дати на:"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:914 mail/message-list.etspec.h:10
 msgid "To"
 msgstr "До"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:918
 #, fuzzy
 msgid "Cc"
 msgstr "Cc:"
 
-#: mail/mail-format.c:923
-#, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
-
-#: mail/mail-format.c:1370
+#: mail/mail-format.c:1361
 #, fuzzy
 msgid "No GPG/PGP program configured."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-format.c:1386
+#: mail/mail-format.c:1377
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1397
+#: mail/mail-format.c:1388
 msgid "Encrypted message"
 msgstr "Зашифроване пов╕домлення"
 
-#: mail/mail-format.c:1398
+#: mail/mail-format.c:1389
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1453
+#: mail/mail-format.c:1444
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1455
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2132
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2146
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2151
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2180
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2188
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2193
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:565
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Конф╕╜урувати теку"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:638
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:691
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:737
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1102
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1117
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1139
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1227
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr ""
 "Неможливо отримати пов╕домлення \"%s\" з теки \"%s\"\n"
 "  %s"
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1236
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Конф╕╜урувати теку"
@@ -9720,116 +9597,103 @@ msgstr "В╕д╕слан╕ пов╕домлення"
 msgid "Copying messages to %s"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-ops.c:877
-#, fuzzy, c-format
-msgid "Cannot copy a folder `%s' to itself"
-msgstr ""
-"Неможливо скоп╕ювати файли в\n"
-"\"%s\"."
-
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:872
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:875
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:989
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
-#, fuzzy
-msgid "Trash"
-msgstr "Завдання"
-
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1172
 msgid "Forwarded messages"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1215
 #, c-format
 msgid "Opening folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1287
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1356
 #, fuzzy, c-format
 msgid "Removing folder %s"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1450
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "В╕дкривання теки %s"
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1501
 #, fuzzy
 msgid "Refreshing folder"
 msgstr "Конф╕╜урувати теку"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1537
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1586
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання пов╕домлення %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1653
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Отримання пов╕домлення"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1739
 #, fuzzy, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Збереження пов╕домлень"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1851
 #, fuzzy, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1879
 #, fuzzy, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1953
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1969
 #, fuzzy, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2000
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дан╕: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2069
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2070
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "З'╓днання з сервером..."
@@ -9930,17 +9794,17 @@ msgstr ""
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не вдалося створити тимчасову поштову скриньку \"%s\": %s"
 
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:259
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслане пов╕домлення %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:263
 #, fuzzy
 msgid "Forwarded message"
 msgstr "Переслан╕ пов╕домлення"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:396
 #, fuzzy
 msgid "Forwarded Message"
 msgstr "Переслан╕ пов╕домлення"
@@ -9964,11 +9828,6 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
-#, fuzzy
-msgid "VFolders"
-msgstr "Теки"
-
 #: mail/mail-vfolder.c:736
 #, fuzzy
 msgid "Edit VFolder"
@@ -9993,72 +9852,72 @@ msgstr "Fwd: (без теми)"
 msgid "%s - Message"
 msgstr "Пов╕домлення"
 
-#: mail/message-list.c:639
+#: mail/message-list.c:640
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:640
+#: mail/message-list.c:641
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:641
+#: mail/message-list.c:642
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:642
+#: mail/message-list.c:643
 #, fuzzy
 msgid "Multiple Unseen Messages"
 msgstr "Не вдалося в╕д╕слати пов╕домлення: %s"
 
-#: mail/message-list.c:643
+#: mail/message-list.c:644
 #, fuzzy
 msgid "Multiple Messages"
 msgstr "Надрукувати пов╕домлення"
 
-#: mail/message-list.c:647
+#: mail/message-list.c:648
 #, fuzzy
 msgid "Lowest"
 msgstr "Низький"
 
-#: mail/message-list.c:648
+#: mail/message-list.c:649
 #, fuzzy
 msgid "Lower"
 msgstr "Низький"
 
-#: mail/message-list.c:652
+#: mail/message-list.c:653
 #, fuzzy
 msgid "Higher"
 msgstr "Високий"
 
-#: mail/message-list.c:653
+#: mail/message-list.c:654
 #, fuzzy
 msgid "Highest"
 msgstr "Високий"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:904
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:910
+#: mail/message-list.c:911
 #, fuzzy
 msgid "Today %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:920
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:931
+#: mail/message-list.c:932
 #, fuzzy
 msgid "%a %l:%M %p"
 msgstr "%I:%M %p"
 
-#: mail/message-list.c:941
+#: mail/message-list.c:942
 #, fuzzy
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2338
 #, fuzzy
 msgid "Generating message list"
 msgstr "Збереження пов╕домлень"
@@ -10280,42 +10139,6 @@ msgstr "Не вдалося надрукувати пов╕домлення"
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: my-evolution/metar.c:29
-msgid "╟F"
-msgstr ""
-
-#: my-evolution/metar.c:29
-msgid "╟C"
-msgstr ""
-
-#: my-evolution/metar.c:33
-#, fuzzy
-msgid "knots"
-msgstr "Шрифти"
-
-#: my-evolution/metar.c:33
-msgid "kph"
-msgstr ""
-
-#: my-evolution/metar.c:38
-#, fuzzy
-msgid "inHg"
-msgstr "Перенесення"
-
-#: my-evolution/metar.c:38
-msgid "mmHg"
-msgstr ""
-
-#: my-evolution/metar.c:41
-#, fuzzy
-msgid "miles"
-msgstr "Ф╕льтри"
-
-#: my-evolution/metar.c:41
-#, fuzzy
-msgid "kilometers"
-msgstr "Ф╕льтри"
-
 #: my-evolution/metar.c:44
 #, fuzzy
 msgid "Clear sky"
@@ -11650,21 +11473,6 @@ msgstr "Подробиц╕"
 msgid "Cancel Operation"
 msgstr "Скасувати зустр╕ч"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
-#, fuzzy
-msgid "Inbox"
-msgstr "mbox"
-
-#: shell/e-local-storage.c:176
-#, fuzzy
-msgid "Outbox"
-msgstr "mbox"
-
-#: shell/e-local-storage.c:624
-#, fuzzy
-msgid "Local Folders"
-msgstr "В╕ртуальн╕ теки"
-
 #: shell/e-setup.c:125
 msgid "Evolution installation"
 msgstr "╤нсталяц╕я Evolution"
@@ -12135,7 +11943,7 @@ msgstr ""
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1710 shell/e-storage.c:496
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -12273,6 +12081,11 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "Панель ярлик╕в"
 
+#: shell/e-shortcuts.c:1053
+#, fuzzy
+msgid "Inbox"
+msgstr "mbox"
+
 #: shell/e-storage-set-view.c:645
 #, fuzzy, c-format
 msgid ""
@@ -12286,48 +12099,48 @@ msgstr ""
 msgid "(No name)"
 msgstr "(Без назви)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:494
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:498
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:500
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:502
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:504
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:506
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:508
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:512
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:514
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:521
+#: shell/e-storage.c:516
 #, fuzzy
 msgid "The specified folder cannot be modified or removed"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:518
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
@@ -12337,7 +12150,7 @@ msgid "%s (...)"
 msgstr ""
 
 #: shell/e-task-widget.c:197
-#, fuzzy, c-format
+#, fuzzy
 msgid "%s (%d%% complete)"
 msgstr "% завершення:"
 
@@ -14205,7 +14018,7 @@ msgstr ""
 msgid "Other..."
 msgstr "╤нша"
 
-#: widgets/misc/e-charset-picker.c:396
+#: widgets/misc/e-charset-picker.c:394
 msgid "Character Encoding"
 msgstr ""
 
@@ -14221,16 +14034,6 @@ msgstr "Редактор пошук╕в"
 msgid "Save Search"
 msgstr "Зберегти пошук"
 
-#: widgets/misc/e-filter-bar.h:94
-#, fuzzy
-msgid "Add to Saved Searches"
-msgstr "Зберегти пошук"
-
-#: widgets/misc/e-filter-bar.h:95
-#, fuzzy
-msgid "Clear"
-msgstr "Календар"
-
 #: widgets/misc/e-filter-bar.h:102
 msgid "Show All"
 msgstr "Показати все"
@@ -14287,8 +14090,103 @@ msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
 #, fuzzy
-#~ msgid "Sent By:"
-#~ msgstr "В╕д╕слано"
+#~ msgid "Other Contacts"
+#~ msgstr "Контакт"
+
+#, fuzzy
+#~ msgid "(none)"
+#~ msgstr "(Без назви)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr "Ви впевнен╕, що хочете стерти завдання"
+
+#, fuzzy
+#~ msgid "Click here to add an attendee"
+#~ msgstr "* Клацн╕ть тут щоб додати контакт *"
+
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Нема╓ ╕нформац╕╖"
+
+#, fuzzy
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "Опис:"
+
+#, fuzzy
+#~ msgid "Unsupported operation: search by uids: for %s"
+#~ msgstr ""
+#~ "Помилка у ре╜улярному вираз╕ \"%s\":\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Cannot attach file %s: %s"
+#~ msgstr "Не вдалося отримати теку: %s: %s"
+
+#, fuzzy
+#~ msgid "Cannot attach file %s: not a regular file"
+#~ msgstr "\"%s\" не ╓ звичайним файлом."
+
+#, fuzzy
+#~ msgid "Cannot connect to store: %s"
+#~ msgstr "Створити новий календар"
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Електронна адреса м╕стить"
+
+#, fuzzy
+#~ msgid "%s: Inbox"
+#~ msgstr "mbox"
+
+#, fuzzy
+#~ msgid "Bcc"
+#~ msgstr "Bcc:"
+
+#, fuzzy
+#~ msgid "Cannot copy a folder `%s' to itself"
+#~ msgstr ""
+#~ "Неможливо скоп╕ювати файли в\n"
+#~ "\"%s\"."
+
+#, fuzzy
+#~ msgid "Trash"
+#~ msgstr "Завдання"
+
+#, fuzzy
+#~ msgid "VFolders"
+#~ msgstr "Теки"
 
-#~ msgid "Couldn't create temporary mbox `%s': %s"
-#~ msgstr "Не вдалося створити тимчасову поштову скриньку \"%s\": %s"
+#, fuzzy
+#~ msgid "knots"
+#~ msgstr "Шрифти"
+
+#, fuzzy
+#~ msgid "inHg"
+#~ msgstr "Перенесення"
+
+#, fuzzy
+#~ msgid "miles"
+#~ msgstr "Ф╕льтри"
+
+#, fuzzy
+#~ msgid "kilometers"
+#~ msgstr "Ф╕льтри"
+
+#, fuzzy
+#~ msgid "Outbox"
+#~ msgstr "mbox"
+
+#, fuzzy
+#~ msgid "Local Folders"
+#~ msgstr "В╕ртуальн╕ теки"
+
+#, fuzzy
+#~ msgid "Add to Saved Searches"
+#~ msgstr "Зберегти пошук"
+
+#, fuzzy
+#~ msgid "Clear"
+#~ msgstr "Календар"