Update for 0.2.

svn path=/trunk/; revision=4086

1 files changed, 448 insertions, 599 deletions

diff --git a/po/uk.po b/po/uk.po
index dfadfcb9b1..b7c79b9427 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-06-29 20:37+0300\n"
+"POT-Creation-Date: 2000-07-10 21:51-0400\n"
 "PO-Revision-Date: 2000-04-04 15:25+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -14,8 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:57
-#: calendar/gui/evolution-calendar-control.c:64 calendar/gui/main.c:68
+#: addressbook/gui/component/addressbook-factory.c:58
+#: calendar/gui/calendar-pilot-sync.c:138 calendar/gui/main.c:68
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -36,477 +36,457 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Доступн╕ категор╕╖:"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:579
 #: calendar/gui/event-editor.c:1118
 msgid "FIXME: _Appointment"
 msgstr "Зустр╕ч"
 
-#: addressbook/contact-editor/e-contact-editor.c:579
+#: addressbook/contact-editor/e-contact-editor.c:580
 #: calendar/gui/event-editor.c:1119
 msgid "FIXME: Meeting Re_quest"
 msgstr "Запит зустр╕ч╕"
 
-#: addressbook/contact-editor/e-contact-editor.c:581
+#: addressbook/contact-editor/e-contact-editor.c:582
 #: calendar/gui/event-editor.c:1121
 msgid "FIXME: _Mail Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
+#: addressbook/contact-editor/e-contact-editor.c:583
 #: calendar/gui/event-editor.c:1122
 msgid "FIXME: _Contact"
 msgstr "Контакт"
 
-#: addressbook/contact-editor/e-contact-editor.c:583
+#: addressbook/contact-editor/e-contact-editor.c:584
 #: calendar/gui/event-editor.c:1123
 msgid "FIXME: _Task"
 msgstr "Завдання"
 
-#: addressbook/contact-editor/e-contact-editor.c:584
+#: addressbook/contact-editor/e-contact-editor.c:585
 #: calendar/gui/event-editor.c:1124
 msgid "FIXME: Task _Request"
 msgstr "Запит завдання"
 
-#: addressbook/contact-editor/e-contact-editor.c:585
+#: addressbook/contact-editor/e-contact-editor.c:586
 #: calendar/gui/event-editor.c:1125
 msgid "FIXME: _Journal Entry"
 msgstr "Журнальний рядок"
 
-#: addressbook/contact-editor/e-contact-editor.c:586
+#: addressbook/contact-editor/e-contact-editor.c:587
 #: calendar/gui/event-editor.c:1126
 msgid "FIXME: _Note"
 msgstr "Нотатка"
 
-#: addressbook/contact-editor/e-contact-editor.c:588
-#: addressbook/contact-editor/e-contact-editor.c:693
+#: addressbook/contact-editor/e-contact-editor.c:589
+#: addressbook/contact-editor/e-contact-editor.c:694
 #: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:593
+#: addressbook/contact-editor/e-contact-editor.c:594
 #: calendar/gui/event-editor.c:1133
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:595
+#: addressbook/contact-editor/e-contact-editor.c:596
 #: calendar/gui/event-editor.c:1135
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:602
+#: addressbook/contact-editor/e-contact-editor.c:603
 #: calendar/gui/event-editor.c:1142
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:606
+#: addressbook/contact-editor/e-contact-editor.c:607
 #: calendar/gui/event-editor.c:1146
 msgid "FIXME: Save Attac_hments..."
 msgstr "."
 
-#: addressbook/contact-editor/e-contact-editor.c:608
+#: addressbook/contact-editor/e-contact-editor.c:609
 #: calendar/gui/event-editor.c:1148
 msgid "FIXME: _Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/e-contact-editor.c:609
+#: addressbook/contact-editor/e-contact-editor.c:610
 #: calendar/gui/event-editor.c:1149
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:610
+#: addressbook/contact-editor/e-contact-editor.c:611
 #: calendar/gui/event-editor.c:1150
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:612
+#: addressbook/contact-editor/e-contact-editor.c:613
 #: calendar/gui/event-editor.c:1152
 msgid "Page Set_up"
 msgstr "Париметри стор╕нки"
 
-#: addressbook/contact-editor/e-contact-editor.c:613
+#: addressbook/contact-editor/e-contact-editor.c:614
 #: calendar/gui/event-editor.c:1153
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:634
+#: addressbook/contact-editor/e-contact-editor.c:635
 #: calendar/gui/event-editor.c:1174
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:639
+#: addressbook/contact-editor/e-contact-editor.c:640
 #: calendar/gui/event-editor.c:1179
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:643
+#: addressbook/contact-editor/e-contact-editor.c:644
 #: calendar/gui/event-editor.c:1183
 msgid "_Object"
 msgstr "Об'╓кт"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: addressbook/contact-editor/e-contact-editor.c:655
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: addressbook/contact-editor/e-contact-editor.c:656
 #: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
 msgid "FIXME: _Item"
 msgstr "Елемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:657
 #: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:651
 #: calendar/gui/event-editor.c:1190
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:657
+#: addressbook/contact-editor/e-contact-editor.c:658
 #: calendar/gui/event-editor.c:1197
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:662
+#: addressbook/contact-editor/e-contact-editor.c:663
 #: calendar/gui/event-editor.c:1202
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:664
+#: addressbook/contact-editor/e-contact-editor.c:665
 #: calendar/gui/event-editor.c:1204
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
+#: addressbook/contact-editor/e-contact-editor.c:668
 #: calendar/gui/event-editor.c:1207
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:672
+#: addressbook/contact-editor/e-contact-editor.c:673
 #: calendar/gui/event-editor.c:1212
 msgid "Pre_vious"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:674
 #: calendar/gui/event-editor.c:1213
 msgid "Ne_xt"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:675
+#: addressbook/contact-editor/e-contact-editor.c:676
 #: calendar/gui/event-editor.c:1217
 msgid "_Toolbars"
 msgstr "Панель ╕нструмент╕в"
 
-#: addressbook/contact-editor/e-contact-editor.c:680
+#: addressbook/contact-editor/e-contact-editor.c:681
 #: calendar/gui/event-editor.c:1222
 msgid "FIXME: _File..."
 msgstr "Файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:681
+#: addressbook/contact-editor/e-contact-editor.c:682
 #: calendar/gui/event-editor.c:1223
 msgid "FIXME: It_em..."
 msgstr "Елемент..."
 
-#: addressbook/contact-editor/e-contact-editor.c:682
+#: addressbook/contact-editor/e-contact-editor.c:683
 #: calendar/gui/event-editor.c:1224
 msgid "FIXME: _Object..."
 msgstr "Об'╓кт..."
 
-#: addressbook/contact-editor/e-contact-editor.c:687
+#: addressbook/contact-editor/e-contact-editor.c:688
 #: calendar/gui/event-editor.c:1229
 msgid "FIXME: _Font..."
 msgstr "Шрифт..."
 
-#: addressbook/contact-editor/e-contact-editor.c:688
+#: addressbook/contact-editor/e-contact-editor.c:689
 #: calendar/gui/event-editor.c:1230
 msgid "FIXME: _Paragraph..."
 msgstr "Параграф..."
 
-#: addressbook/contact-editor/e-contact-editor.c:695
+#: addressbook/contact-editor/e-contact-editor.c:696
 #: calendar/gui/event-editor.c:1237
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:696
+#: addressbook/contact-editor/e-contact-editor.c:697
 #: calendar/gui/event-editor.c:1238
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:698
+#: addressbook/contact-editor/e-contact-editor.c:699
 #: calendar/gui/event-editor.c:1240
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
+#: addressbook/contact-editor/e-contact-editor.c:700
 #: calendar/gui/event-editor.c:1241
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:701
+#: addressbook/contact-editor/e-contact-editor.c:702
 #: calendar/gui/event-editor.c:1243
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:706
+#: addressbook/contact-editor/e-contact-editor.c:707
 #: calendar/gui/event-editor.c:1248
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
+#: addressbook/contact-editor/e-contact-editor.c:709
 #: calendar/gui/event-editor.c:1253
 msgid "_Forms"
 msgstr "Форми"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:714
 msgid "FIXME: _New Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:715
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:717
 msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:717
+#: addressbook/contact-editor/e-contact-editor.c:718
 msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:718
+#: addressbook/contact-editor/e-contact-editor.c:719
 msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:719
+#: addressbook/contact-editor/e-contact-editor.c:720
 msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:720
+#: addressbook/contact-editor/e-contact-editor.c:721
 msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:721
+#: addressbook/contact-editor/e-contact-editor.c:722
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:723
+#: addressbook/contact-editor/e-contact-editor.c:724
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
+#: addressbook/contact-editor/e-contact-editor.c:725
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:725
+#: addressbook/contact-editor/e-contact-editor.c:726
 msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:727
+#: addressbook/contact-editor/e-contact-editor.c:728
 msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:728
+#: addressbook/contact-editor/e-contact-editor.c:729
 #: calendar/gui/event-editor.c:1266
 msgid "FIXME: For_ward"
 msgstr "Переслати"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
+#: addressbook/contact-editor/e-contact-editor.c:741
 #: calendar/gui/event-editor.c:1279
 msgid "_Insert"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:741
+#: addressbook/contact-editor/e-contact-editor.c:742
 #: calendar/gui/event-editor.c:1280
 msgid "F_ormat"
 msgstr "Формат"
 
 #. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:468
+#: addressbook/contact-editor/e-contact-editor.c:743
+#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
 msgid "_Tools"
 msgstr "╤нструменти"
 
-#: addressbook/contact-editor/e-contact-editor.c:743
+#: addressbook/contact-editor/e-contact-editor.c:744
 #: calendar/gui/event-editor.c:1282
 msgid "Actio_ns"
 msgstr "Д╕╖"
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
-msgstr ""
-
 #: addressbook/contact-editor/e-contact-editor.c:775
+#, fuzzy
+msgid "Save and Close"
+msgstr "Зберегти календар як"
+
+#: addressbook/contact-editor/e-contact-editor.c:776
 #: calendar/gui/event-editor.c:1321
 msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:780
 #: calendar/gui/event-editor.c:1325
 msgid "FIXME: Print..."
 msgstr "Друкувати..."
 
-#: addressbook/contact-editor/e-contact-editor.c:780
+#: addressbook/contact-editor/e-contact-editor.c:781
 #: calendar/gui/event-editor.c:1326
 msgid "Print this item"
 msgstr "Надрукувати цей елемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:782
 #: calendar/gui/event-editor.c:1327
 msgid "FIXME: Insert File..."
 msgstr "Вставити файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:783
 #: calendar/gui/event-editor.c:1328
 msgid "Insert a file as an attachment"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
-msgstr ""
-
 #: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:787
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1336
 msgid "FIXME: Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/e-contact-editor.c:791
+#: addressbook/contact-editor/e-contact-editor.c:786
 #: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
 msgid "Delete this item"
 msgstr "Стерти це пов╕домлення"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
+#: addressbook/contact-editor/e-contact-editor.c:788
 #: calendar/gui/event-editor.c:1339
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:794
+#: addressbook/contact-editor/e-contact-editor.c:789
 #: calendar/gui/event-editor.c:1340
 msgid "Go to the previous item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:795
+#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1341
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:796
+#: addressbook/contact-editor/e-contact-editor.c:791
 #: calendar/gui/event-editor.c:1342
 msgid "Go to the next item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:797
+#: addressbook/contact-editor/e-contact-editor.c:792
 #: calendar/gui/event-editor.c:1343
 msgid "FIXME: Help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:798
+#: addressbook/contact-editor/e-contact-editor.c:793
 #: calendar/gui/event-editor.c:1344
 msgid "See online help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1208
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#: addressbook/contact-editor/e-contact-editor.c:1318
+#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1313
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1210
 msgid "Business 2"
 msgstr "Робоча 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1211
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1212
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1213
 msgid "Car"
 msgstr "Авто"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1214
 msgid "Company"
 msgstr "Компан╕я"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1314
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1216
 msgid "Home 2"
 msgstr "Домашня 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1217
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1219
 msgid "Mobile"
 msgstr "Моб╕льний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1320 mail/mail-config.c:2039
+#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1315
 msgid "Other"
 msgstr "╤нша"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Other Fax"
 msgstr "╤нший факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1223
 msgid "Primary"
 msgstr "Первинний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1225
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Primary Email"
 msgstr "Первинна е-пошта"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
@@ -533,8 +513,7 @@ msgid "New phone type"
 msgstr "Новий тип телефона"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.c:1847
-#: mail/mail-config.c:1943
+#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "Add"
 msgstr "Додати"
 
@@ -703,80 +682,62 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:697
-msgid "To"
-msgstr "До"
-
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:669
-msgid "From"
-msgstr "В╕д"
-
-#: addressbook/gui/component/addressbook.c:419
-msgid "Cc"
-msgstr "Cc"
-
-#: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/calendar-commands.c:544 notes/component-factory.c:27
+#: addressbook/gui/component/addressbook.c:415
+#: calendar/gui/calendar-commands.c:544
 msgid "New"
 msgstr "Новий"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/gui/component/addressbook.c:415
 msgid "Create a new contact"
 msgstr "Створити новий запис"
 
-#: addressbook/gui/component/addressbook.c:428
-#: mail/folder-browser-factory.c:37
+#: addressbook/gui/component/addressbook.c:419
 msgid "Find"
 msgstr "Шукати"
 
-#: addressbook/gui/component/addressbook.c:428
+#: addressbook/gui/component/addressbook.c:419
 msgid "Find a contact"
 msgstr "Знайти контактну ╕нформац╕ю"
 
-#: addressbook/gui/component/addressbook.c:429
-#: addressbook/gui/component/addressbook.c:496
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:48
+#: addressbook/gui/component/addressbook.c:420
+#: addressbook/gui/component/addressbook.c:487
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/component/addressbook.c:429
+#: addressbook/gui/component/addressbook.c:420
 msgid "Print contacts"
 msgstr "Надрукувати контактну ╕нформац╕ю"
 
 #. Delete
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:421
 #: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
-#: mail/mail-config.c:1961
+#: mail/folder-browser-factory.c:45
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:421
 msgid "Delete a contact"
 msgstr "Стерти контактну ╕нформац╕ю"
 
-#: addressbook/gui/component/addressbook.c:503
-msgid "Test Select Names"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1056
+#: addressbook/gui/component/addressbook.c:494
+#: addressbook/gui/component/addressbook.c:1034
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:501
 msgid "_New Contact"
 msgstr "Нова ╕нформац╕я"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:509
 msgid "N_ew Directory Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:588
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:593
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -788,20 +749,20 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:960
+#: addressbook/gui/component/addressbook.c:938
 #: addressbook/gui/minicard/e-minicard.c:329
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/component/addressbook.c:1027
+#: addressbook/gui/component/addressbook.c:1005
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1063
+#: addressbook/gui/component/addressbook.c:1041
 msgid "As _Minicards"
 msgstr "Як _Minicards"
 
-#: addressbook/gui/component/addressbook.c:1114
+#: addressbook/gui/component/addressbook.c:1092
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
@@ -945,26 +906,10 @@ msgstr "Номер порта:"
 msgid "Root DN:"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Вибрати назви"
-
-#: addressbook/gui/component/select-names.glade.h:8
-msgid "Find..."
-msgstr "Шукати..."
-
-#: addressbook/gui/component/select-names.glade.h:9
-msgid "T_ype name or select from List:"
-msgstr ""
-
-#: addressbook/gui/component/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "╤м'я:"
 
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
@@ -1266,7 +1211,7 @@ msgstr "Р╕к"
 msgid "Show 1 year"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
 msgid "Create a new appointment"
 msgstr ""
 
@@ -1291,7 +1236,7 @@ msgstr "Т╕ло"
 msgid "Go to present time"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:213
+#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
 msgid "Next"
 msgstr ""
 
@@ -1332,219 +1277,99 @@ msgstr "Зберегти календар як"
 msgid "Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/calendar-commands.c:679
-msgid "_Close Calendar"
-msgstr "Закрити календар"
-
-#: calendar/gui/calendar-commands.c:680
-msgid "Close current calendar"
-msgstr "Закрити поточний календар"
-
-#: calendar/gui/calendar-commands.c:690
+#: calendar/gui/calendar-commands.c:682
 msgid "_New appointment..."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:695
+#: calendar/gui/calendar-commands.c:687
 msgid "New appointment for _today..."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:696
+#: calendar/gui/calendar-commands.c:688
 msgid "Create a new appointment for today"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:704 calendar/gui/prop.c:712
+#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
 msgid "Preferences"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:711 calendar/gui/calendar-commands.c:712
+#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
 msgid "About Calendar"
 msgstr ""
 
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
 #.
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 #, c-format
 msgid "%s%s"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/calendar-commands.c:746
 msgid "'s calendar"
 msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: calendar/gui/calendar-conduit-control-applet.c:51
-msgid "Disabled"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:52
-msgid "Synchronize"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:53
-msgid "Copy From Pilot"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:54
-msgid "Copy To Pilot"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:55
-msgid "Merge From Pilot"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:56
-msgid "Merge To Pilot"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:142
-#: calendar/gui/todo-conduit-control-applet.c:110
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:144
-msgid "GnomeCalendar Conduit"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:145
-msgid "(C) 1998"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:147
-msgid "Configuration utility for the calendar conduit.\n"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:148
-msgid "gnome-calendar-conduit.png"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:190
-msgid "Synchronize Action"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:261
-#: calendar/gui/todo-conduit-control-applet.c:194
-msgid "Conduit state"
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:305
-#: calendar/gui/calendar-conduit-control-applet.c:316
-#: calendar/gui/todo-conduit-control-applet.c:235
-#: calendar/gui/todo-conduit-control-applet.c:246
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
-msgstr ""
-
-#: calendar/gui/calendar-conduit-control-applet.c:332
-#: calendar/gui/calendar-conduit-control-applet.c:333
-#: calendar/gui/todo-conduit-control-applet.c:265
-#: calendar/gui/todo-conduit-control-applet.c:266
-#, fuzzy
-msgid "Cannot initialze the GnomePilot Daemon"
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
-
-#: calendar/gui/calendar-conduit-control-applet.c:339
-#: calendar/gui/calendar-conduit-control-applet.c:340
-#: calendar/gui/todo-conduit-control-applet.c:272
-#: calendar/gui/todo-conduit-control-applet.c:273
-msgid "Cannot connect to the GnomePilot Daemon"
-msgstr ""
-
-#: calendar/gui/calendar-conduit.c:116 calendar/gui/calendar-conduit.c:156
-#: calendar/gui/calendar-conduit.c:239 calendar/gui/calendar-conduit.c:279
-#: calendar/gui/calendar-conduit.c:501 calendar/gui/calendar-conduit.c:542
-#: calendar/gui/calendar-conduit.c:858 calendar/gui/calendar-conduit.c:910
-#: calendar/gui/calendar-conduit.c:1332
-msgid "Error while communicating with calendar server"
-msgstr ""
-
-#: calendar/gui/calendar-conduit.c:546
-#, c-format
-msgid "Calendar holds %d entries"
-msgstr ""
-
-#: calendar/gui/calendar-conduit.c:568 calendar/gui/calendar-conduit.c:570
-msgid "Could not start gnomecal server"
-msgstr ""
-
-#: calendar/gui/calendar-conduit.c:598 calendar/gui/calendar-conduit.c:601
-msgid "Could not read pilot's DateBook application block"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:60
+#: calendar/gui/calendar-pilot-sync.c:68
 msgid "Specifies the port on which the Pilot is"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:60
+#: calendar/gui/calendar-pilot-sync.c:68
 msgid "PORT"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:62
+#: calendar/gui/calendar-pilot-sync.c:70
 msgid "If you want to debug the attributes on records"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:64
+#: calendar/gui/calendar-pilot-sync.c:72
 msgid "Only syncs from desktop to pilot"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:66
+#: calendar/gui/calendar-pilot-sync.c:74
 msgid "Only syncs from pilot to desktop"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:89
+#: calendar/gui/calendar-pilot-sync.c:97
 msgid "Can not create Pilot socket\n"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:96
+#: calendar/gui/calendar-pilot-sync.c:104
 #, c-format
 msgid "Can not bind to device %s\n"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:99
+#: calendar/gui/calendar-pilot-sync.c:107
 msgid "Failed to get a connection from the Pilot device"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:102
+#: calendar/gui/calendar-pilot-sync.c:111
 msgid "pi_accept failed"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:167
-msgid "\tObject did not exist, creating a new one\n"
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:174
+#: calendar/gui/calendar-pilot-sync.c:211
 msgid ""
 "\tObject has been modified on desktop and on the pilot, desktop takes "
 "precedence\n"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:475
+#: calendar/gui/calendar-pilot-sync.c:531
 #, fuzzy
 msgid "No description"
 msgstr "Опис:"
 
-#: calendar/gui/calendar-pilot-sync.c:547
-msgid "Syncing with the pilot..."
-msgstr ""
-
-#: calendar/gui/calendar-pilot-sync.c:554
+#: calendar/gui/calendar-pilot-sync.c:692
 msgid "Could not open DatebookDB on the Pilot"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:555
+#: calendar/gui/calendar-pilot-sync.c:693
 msgid "Unable to open DatebookDB"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:617
+#: calendar/gui/calendar-pilot-sync.c:728
 msgid "Synced DateBook from Pilot to GnomeCal"
 msgstr ""
 
 #: calendar/gui/control-factory.c:136
-#: calendar/gui/evolution-calendar-control.c:131
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
@@ -1585,33 +1410,33 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2271 calendar/gui/e-day-view.c:2278
-#: calendar/gui/e-day-view.c:2287 calendar/gui/e-week-view.c:2629
-#: calendar/gui/e-week-view.c:2636 calendar/gui/e-week-view.c:2645
+#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
 #, fuzzy
 msgid "New appointment..."
 msgstr "Зустр╕ч"
 
-#: calendar/gui/e-day-view.c:2275 calendar/gui/e-day-view.c:2282
-#: calendar/gui/e-week-view.c:2633 calendar/gui/e-week-view.c:2640
+#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2634
+#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "Стерти це пов╕домлення"
 
-#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2641
+#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2642
+#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Стерти це пов╕домлення"
 
-#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1677,6 +1502,26 @@ msgstr ""
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
+#: calendar/gui/event-editor.c:1320
+msgid "FIXME: Save and Close"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1330
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1331
+msgid "Configure recurrence rules"
+msgstr ""
+
+#: calendar/gui/event-editor.c:1333
+msgid "FIXME: Invite Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1334
+msgid "Invite attendees to a meeting"
+msgstr ""
+
 #: calendar/gui/event-editor.c:1745
 msgid "%a %b %d %Y"
 msgstr ""
@@ -1790,7 +1635,7 @@ msgstr ""
 msgid "Recurrence rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:574
+#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:596
 #, fuzzy
 msgid "None"
 msgstr "Нотатка"
@@ -2226,7 +2071,7 @@ msgid "Due Date"
 msgstr "Дата"
 
 #: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
-#: mail/message-list.c:655
+#: mail/message-list.c:474
 msgid "Priority"
 msgstr "Приор╕тет"
 
@@ -2643,27 +2488,7 @@ msgstr ""
 msgid "Defaults"
 msgstr "Подробиц╕"
 
-#: calendar/gui/todo-conduit-control-applet.c:112
-msgid "Gpilotd todo conduit"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:113
-msgid "(C) 1998 the Free Software Foundation"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:115
-msgid "Configuration utility for the todo conduit.\n"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:116
-msgid "gnome-unknown.xpm"
-msgstr ""
-
-#: calendar/gui/todo-conduit-control-applet.c:141
-msgid "Enabled"
-msgstr ""
-
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:752
+#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:766
 msgid "Cut"
 msgstr "Вир╕зати"
 
@@ -2671,7 +2496,7 @@ msgstr "Вир╕зати"
 msgid "Cut selected item into clipboard"
 msgstr "Вир╕зати вибраний елемент в буфер обм╕ну"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:753
+#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:767
 msgid "Copy"
 msgstr "Скоп╕ювати"
 
@@ -2680,7 +2505,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Скоп╕ювати вибраний елемент в буфер обм╕ну"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:754
+#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:768
 msgid "Paste"
 msgstr "Вставити"
 
@@ -2702,19 +2527,15 @@ msgstr "Вибрати адреси адресат╕в"
 msgid "Recipient list:"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "╤м'я:"
-
 #: composer/e-msg-composer-address-dialog.glade.h:9
 msgid "Search..."
 msgstr "Пошук..."
 
-#: composer/e-msg-composer-address-dialog.glade.h:10 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:10
 msgid "Name"
 msgstr "╤м'я"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:11
 msgid "Address"
 msgstr "Адреса"
 
@@ -2807,31 +2628,31 @@ msgstr "Тип MIME:"
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-hdrs.c:89
+#: composer/e-msg-composer-hdrs.c:174
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:216
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:217
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:221
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:222
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:135
+#: composer/e-msg-composer-hdrs.c:227
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:228
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2839,264 +2660,276 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/e-msg-composer-hdrs.c:142
+#: composer/e-msg-composer-hdrs.c:234
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:235
 msgid "Enter the subject of the mail"
 msgstr "Введ╕ть тему послання"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:463
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:470
+#: composer/e-msg-composer.c:474
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:490
+#: composer/e-msg-composer.c:494
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:539
-msgid "Open file"
-msgstr "В╕дкрити файл"
-
-#: composer/e-msg-composer.c:605
+#: composer/e-msg-composer.c:513
 msgid "Discard this message?"
 msgstr ""
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:561
+msgid "Open file"
+msgstr "В╕дкрити файл"
+
+#: composer/e-msg-composer.c:718
 msgid "Save in _folder..."
 msgstr "Зберегти у тец╕..."
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:718
 msgid "Save the message in a specified folder"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: composer/e-msg-composer.c:713 composer/e-msg-composer.c:750
-#: mail/folder-browser-factory.c:36
+#: composer/e-msg-composer.c:721 composer/e-msg-composer.c:763
 msgid "Send"
 msgstr "В╕д╕слати"
 
-#: composer/e-msg-composer.c:713
+#: composer/e-msg-composer.c:721
 msgid "Send the message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:733
 msgid "View _attachments"
 msgstr "Показати долучення"
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:733
 msgid "View/hide attachments"
 msgstr "Показати/прибрати долучення"
 
-#: composer/e-msg-composer.c:750
+#: composer/e-msg-composer.c:763
 msgid "Send this message"
 msgstr "В╕д╕слати це пов╕домлення"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:766
 msgid "Cut selected region into the clipboard"
 msgstr "Вир╕зати вибрану частину у буфер обм╕ну"
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:767
 msgid "Copy selected region into the clipboard"
 msgstr "Скоп╕ювати вибрану частину у буфер обм╕ну"
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:768
 msgid "Paste selected region into the clipboard"
 msgstr "Вставити вибрану частину в буфер обм╕ну"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:769
 msgid "Undo"
 msgstr "В╕дм╕нити"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:769
 msgid "Undo last operation"
 msgstr "В╕дм╕нити останню операц╕ю"
 
-#: composer/e-msg-composer.c:757
+#: composer/e-msg-composer.c:772
 msgid "Attach"
 msgstr "Долучити"
 
-#: composer/e-msg-composer.c:757
+#: composer/e-msg-composer.c:772
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:948
 #, fuzzy
 msgid "Compose a message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 #, fuzzy
 msgid "Edit Filter"
 msgstr "Ф╕льтр"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 msgid "Create filter"
 msgstr ""
 
-#: filter/filter-editor.c:212
+#: filter/filter-editor.c:209
 msgid "Back"
 msgstr ""
 
-#: filter/filter-editor.c:214
+#: filter/filter-editor.c:211
 msgid "Finish"
 msgstr ""
 
-#: filter/filter-editor.c:215
+#: filter/filter-editor.c:212
 msgid "Cancel"
 msgstr ""
 
-#: filter/filter-editor.c:219
+#: filter/filter-editor.c:216
 #, fuzzy
 msgid "Apply"
 msgstr "В╕дпов╕сти"
 
-#: filter/filter-editor.c:236
+#: filter/filter-editor.c:233
 msgid ""
 "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 "continue forwards to customise it.</p>"
 msgstr ""
 
-#: mail/component-factory.c:206
+#: mail/component-factory.c:196
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Get mail"
 msgstr ""
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Check for new mail"
 msgstr ""
 
-#: mail/folder-browser-factory.c:36
-#, fuzzy
-msgid "Send a new message"
-msgstr "В╕д╕слати пов╕домлення"
+#: mail/folder-browser-factory.c:30
+msgid "Compose"
+msgstr ""
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser-factory.c:30
 #, fuzzy
-msgid "Find messages"
-msgstr "В╕д╕слан╕ пов╕домлення"
+msgid "Compose a new message"
+msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply"
 msgstr "В╕дпов╕сти"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to All"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward"
 msgstr "Переслати"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward this message"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser-factory.c:41
+#, fuzzy
+msgid "Refile"
+msgstr "В╕дкрити файл"
+
+#: mail/folder-browser-factory.c:41
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/folder-browser-factory.c:43
 msgid "Print the selected message"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser-factory.c:45
 msgid "Delete this message"
 msgstr "Стерти це пов╕домлення"
 
-#: mail/folder-browser-factory.c:69
+#: mail/folder-browser-factory.c:65
+msgid "_Threaded Message List"
+msgstr ""
+
+#: mail/folder-browser-factory.c:77
 msgid "_Expunge"
 msgstr ""
 
-#: mail/folder-browser-factory.c:75
+#: mail/folder-browser-factory.c:83
 msgid "_Filter Druid ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:81
+#: mail/folder-browser-factory.c:89
 msgid "_Virtual Folder Druid ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:87
+#: mail/folder-browser-factory.c:95
 msgid "_Mail Configuration ..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:93
+#: mail/folder-browser-factory.c:101
 msgid "Forget _Passwords"
 msgstr ""
 
-#: mail/mail-config.c:258
+#: mail/mail-config.c:259
 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.c:273
+#: mail/mail-config.c:274
 #, fuzzy
 msgid "Full name:"
 msgstr "Назва файлу:"
 
-#: mail/mail-config.c:301
+#: mail/mail-config.c:302
 #, fuzzy
 msgid "Email address:"
 msgstr "Адреса:"
 
-#: mail/mail-config.c:324
+#: mail/mail-config.c:325
 #, fuzzy
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я"
 
-#: mail/mail-config.c:336
+#: mail/mail-config.c:337
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.c:341
+#: mail/mail-config.c:342
 msgid "Signature File"
 msgstr ""
 
-#: mail/mail-config.c:698 mail/mail-config.c:789
+#: mail/mail-config.c:699 mail/mail-config.c:790
 #, fuzzy
 msgid "Server:"
 msgstr "Сервер LDAP:"
 
-#: mail/mail-config.c:704
+#: mail/mail-config.c:705
 #, fuzzy
 msgid "Username:"
 msgstr "Назва файлу:"
 
-#: mail/mail-config.c:710
+#: mail/mail-config.c:711
 #, fuzzy
 msgid "Path:"
 msgstr "Вставити"
 
-#: mail/mail-config.c:716 mail/mail-config.c:795
+#: mail/mail-config.c:717 mail/mail-config.c:796
 #, fuzzy
 msgid "Authentication:"
 msgstr "Ор╕╓нтац╕я"
 
-#: mail/mail-config.c:728 mail/mail-config.c:807
+#: mail/mail-config.c:729 mail/mail-config.c:808
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config.c:754 mail/mail-config.c:829
+#: mail/mail-config.c:755 mail/mail-config.c:830
 msgid "Test these values before continuing"
 msgstr ""
 
-#: mail/mail-config.c:936
+#: mail/mail-config.c:937
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3105,92 +2938,60 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:954
+#: mail/mail-config.c:955
 msgid "Select the method you would like to use to deliver your mail."
 msgstr ""
 
-#: mail/mail-config.c:1128 mail/mail-config.c:1207
+#: mail/mail-config.c:1129 mail/mail-config.c:1208
 msgid "Mail Configuration"
 msgstr ""
 
 #. Identity page
-#: mail/mail-config.c:1145 mail/mail-config.c:1874
+#: mail/mail-config.c:1146
 msgid "Identity"
 msgstr ""
 
 #. Source page
-#: mail/mail-config.c:1164
+#: mail/mail-config.c:1165
 msgid "Mail Source"
 msgstr ""
 
 #. Transport page
-#: mail/mail-config.c:1185
+#: mail/mail-config.c:1186
 msgid "Mail Transport"
 msgstr ""
 
-#: mail/mail-config.c:1307
+#: mail/mail-config.c:1308
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config.c:1309
+#: mail/mail-config.c:1310
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config.c:1452
+#: mail/mail-config.c:1453
 msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config.c:1454
+#: mail/mail-config.c:1455
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-config.c:1716
-#, fuzzy
-msgid "Organization"
-msgstr "Ор╕╓нтац╕я"
-
-#: mail/mail-config.c:1716
-msgid "Signature file"
-msgstr ""
-
-#: mail/mail-config.c:1742
-msgid "Camel Providers Configuration"
-msgstr ""
-
-#: mail/mail-config.c:1831
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.c:1856 mail/mail-config.c:1952
-msgid "Edit"
-msgstr ""
-
-#: mail/mail-config.c:1927
-msgid "Mail sources"
-msgstr ""
-
-#: mail/mail-config.c:1970
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-config.c:2009
-msgid "Transports"
-msgstr ""
-
-#: mail/mail-config.c:2030
-msgid "Send messages in HTML format"
-msgstr ""
-
-#: mail/mail-ops.c:334
+#: mail/mail-ops.c:372
 msgid "Fetching mail"
 msgstr ""
 
-#: mail/mail-ops.c:346
+#: mail/mail-ops.c:384
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
+#: mail/mail-ops.c:732
+#, fuzzy
+msgid "Refile message(s) to"
+msgstr "В╕д╕слан╕ пов╕домлення"
+
 #: mail/mail-threads.c:483
 msgid "Currently pending operations:"
 msgstr ""
@@ -3215,45 +3016,39 @@ msgstr ""
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/main.c:61
+#: mail/main.c:62
 msgid "Mail Component: I could not initialize Bonobo"
 msgstr "Поштовий компонент: не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:460
 msgid "Online Status"
 msgstr "Стан на л╕н╕╖"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:488
+msgid "From"
+msgstr "В╕д"
+
+#: mail/message-list.c:495
 msgid "Subject"
 msgstr "Тема"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:502
 msgid "Date"
 msgstr "Дата"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:509
 #, fuzzy
 msgid "Received"
 msgstr "Отримано"
 
-#: mail/message-list.c:704
+#: mail/message-list.c:516
+msgid "To"
+msgstr "До"
+
+#: mail/message-list.c:523
 msgid "Size"
 msgstr "Розм╕р"
 
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr ""
-
-#: notes/component-factory.c:147
-#, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: notes/main.c:30
-#, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Поштовий компонент: не вдалось ╕н╕ц╕ал╕зувати Bonobo"
-
 #: shell/e-init.c:25
 msgid "Evolution can not create its local folders"
 msgstr ""
@@ -3314,12 +3109,18 @@ msgstr ""
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:155
+#: shell/e-shell-folder-selection-dialog.c:95
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:236
 #, fuzzy
 msgid "New..."
 msgstr "Новий"
 
-#: shell/e-shell-folder-title-bar.c:353
+#: shell/e-shell-folder-title-bar.c:355
 msgid "(Untitled)"
 msgstr ""
 
@@ -3350,145 +3151,136 @@ msgid ""
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:302 shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:301
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:343
+#: shell/e-shell-view-menu.c:365
 msgid "_Folder"
 msgstr "Фолдер"
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:369
 msgid "Evolution _Bar Shortcut"
 msgstr "Л╕н╕йка ярлик╕в Evolution"
 
-#: shell/e-shell-view-menu.c:353
-msgid "_Mail message"
+#: shell/e-shell-view-menu.c:375
+#, fuzzy
+msgid "_Mail message (FIXME)"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: shell/e-shell-view-menu.c:354 shell/e-shell-view-menu.c:357
+#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
 msgid "Composes a new mail message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: shell/e-shell-view-menu.c:356
-msgid "_Appointment"
+#: shell/e-shell-view-menu.c:378
+#, fuzzy
+msgid "_Appointment (FIXME)"
 msgstr "Зустр╕ч"
 
-#: shell/e-shell-view-menu.c:359
-msgid "Meeting Re_quest"
-msgstr "Запит зустр╕ч╕"
-
-#: shell/e-shell-view-menu.c:362
-msgid "_Contact"
+#: shell/e-shell-view-menu.c:381
+#, fuzzy
+msgid "_Contact (FIXME)"
 msgstr "Контакт"
 
-#: shell/e-shell-view-menu.c:365
-msgid "_Task"
-msgstr "Завдання"
+#: shell/e-shell-view-menu.c:384
+msgid "_Task (FIXME)"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:368
-msgid "Task _Request"
+#: shell/e-shell-view-menu.c:387
+#, fuzzy
+msgid "Task _Request (FIXME)"
 msgstr "Запит завдання"
 
-#: shell/e-shell-view-menu.c:371
-msgid "_Journal Entry"
+#: shell/e-shell-view-menu.c:390
+#, fuzzy
+msgid "_Journal Entry (FIXME)"
 msgstr "Журнальний рядок"
 
-#: shell/e-shell-view-menu.c:374
-msgid "_Note"
-msgstr "Нотатка"
-
-#: shell/e-shell-view-menu.c:384
-msgid "_Selected Items"
-msgstr "Вибран╕ елементи"
-
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:398
 msgid "_New"
 msgstr "Новий"
 
-#: shell/e-shell-view-menu.c:393
-msgid "_Open"
-msgstr "В╕дкрити"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Clos_e All Items"
-msgstr "Закрити вс╕ елементи"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Closes all the open items"
-msgstr "Закрива╓ вс╕ в╕дкрит╕ елементи"
+#: shell/e-shell-view-menu.c:402
+#, fuzzy
+msgid "_Go to folder..."
+msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:402
 msgid "Display a different folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:414
+#: shell/e-shell-view-menu.c:404
+#, fuzzy
+msgid "_Create new folder..."
+msgstr "Зберегти у тец╕..."
+
+#: shell/e-shell-view-menu.c:404
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Створити новий календар"
+
+#: shell/e-shell-view-menu.c:419
 msgid "Show _shortcut bar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:415
+#: shell/e-shell-view-menu.c:420
 msgid "Show the shortcut bar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:417
+#: shell/e-shell-view-menu.c:422
 msgid "Show _folder bar"
 msgstr "Показувати панель тек"
 
-#: shell/e-shell-view-menu.c:418
+#: shell/e-shell-view-menu.c:423
 msgid "Show the folder bar"
 msgstr "Показувати панель тек"
 
-#: shell/e-shell-view-menu.c:435
+#: shell/e-shell-view-menu.c:440
 msgid "Help _Index"
 msgstr "Покажчик дов╕дки"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:443
 msgid "Getting _Started"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:441
+#: shell/e-shell-view-menu.c:446
 msgid "Using the _Mailer"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:449
 msgid "Using the _Calendar"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:452
 msgid "Using the Cont_act Manager"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:452
+#: shell/e-shell-view-menu.c:457
 msgid "_Submit bug report"
 msgstr "П╕дготувати зв╕т про помилку"
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:458
 msgid "Submit bug-report via bug-buddy"
 msgstr "П╕дготувати зв╕т про помилку в bug-buddy"
 
-#: shell/e-shell-view-menu.c:469
+#: shell/e-shell-view-menu.c:474
 msgid "_Actions"
 msgstr "Д╕╖"
 
-#: shell/e-shell-view.c:112
+#: shell/e-shell-view.c:113
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:207
+#: shell/e-shell-view.c:208
 msgid "Folders"
 msgstr "Теки"
 
-#: shell/e-shell-view.c:578
+#: shell/e-shell-view.c:600
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:646
-#, c-format
-msgid "Cannot open location: %s"
-msgstr ""
-
-#: shell/e-shell.c:258
+#: shell/e-shell.c:299
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
@@ -3583,29 +3375,27 @@ msgstr "Нев╕дома помилка"
 
 #: shell/main.c:99
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
+"Over the last month and a half, our focus has been on making\n"
+"Evolution usable. Many of the Evolution developers are now using\n"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
 "\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\n"
-"\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
 "\n"
 "We hope that you enjoy the results of our hard work, and we eagerly\n"
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:128
+#: shell/main.c:126
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3772,7 +3562,66 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/shortcut-bar/e-group-bar.c:631
+#: widgets/shortcut-bar/e-group-bar.c:633
 #, c-format
 msgid "Group %i"
 msgstr "Група %i"
+
+#~ msgid "Cc"
+#~ msgstr "Cc"
+
+#~ msgid "Select Names"
+#~ msgstr "Вибрати назви"
+
+#~ msgid "Find..."
+#~ msgstr "Шукати..."
+
+#~ msgid "Message Recipients"
+#~ msgstr "Адресати пов╕домлення"
+
+#~ msgid "_Close Calendar"
+#~ msgstr "Закрити календар"
+
+#~ msgid "Close current calendar"
+#~ msgstr "Закрити поточний календар"
+
+#, fuzzy
+#~ msgid "Cannot initialze the GnomePilot Daemon"
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
+
+#, fuzzy
+#~ msgid "Send a new message"
+#~ msgstr "В╕д╕слати пов╕домлення"
+
+#, fuzzy
+#~ msgid "Organization"
+#~ msgstr "Ор╕╓нтац╕я"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's notes component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#, fuzzy
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "Поштовий компонент: не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#~ msgid "Meeting Re_quest"
+#~ msgstr "Запит зустр╕ч╕"
+
+#~ msgid "_Task"
+#~ msgstr "Завдання"
+
+#~ msgid "_Note"
+#~ msgstr "Нотатка"
+
+#~ msgid "_Selected Items"
+#~ msgstr "Вибран╕ елементи"
+
+#~ msgid "_Open"
+#~ msgstr "В╕дкрити"
+
+#~ msgid "Clos_e All Items"
+#~ msgstr "Закрити вс╕ елементи"
+
+#~ msgid "Closes all the open items"
+#~ msgstr "Закрива╓ вс╕ в╕дкрит╕ елементи"