Updated Ukrainian translation

svn path=/trunk/; revision=5430

1 files changed, 1349 insertions, 1553 deletions

diff --git a/po/uk.po b/po/uk.po
index a70e3c40ef..05cfff93e7 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-08-14 12:45+0300\n"
+"POT-Creation-Date: 2000-09-14 18:19+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"
@@ -13,15 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/backend/ebook/test-client-list.c:29
-#: addressbook/backend/ebook/test-client.c:54
-#: addressbook/demo/addressbook-factory.c:32
-#: addressbook/gui/component/addressbook-factory.c:59
-#: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1669
-#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:68
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:16
+#: addressbook/backend/ebook/test-client-list.c:18
+#: addressbook/backend/ebook/test-client.c:29
+#: addressbook/conduit/address-conduit.c:1215
+#: addressbook/gui/component/addressbook-factory.c:37
+#: calendar/conduits/calendar/calendar-conduit.c:1673
+#: calendar/conduits/todo/todo-conduit.c:1176 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -31,43 +30,43 @@ msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 #.
 #: addressbook/conduit/address-conduit-control-applet.c:54
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+#: calendar/conduits/todo/todo-conduit-control-applet.c:51
 msgid "Disabled"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:55
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+#: calendar/conduits/todo/todo-conduit-control-applet.c:52
 msgid "Synchronize"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:56
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:57
+#: calendar/conduits/todo/todo-conduit-control-applet.c:53
 msgid "Copy From Pilot"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:57
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:58
+#: calendar/conduits/todo/todo-conduit-control-applet.c:54
 msgid "Copy To Pilot"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:58
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:59
+#: calendar/conduits/todo/todo-conduit-control-applet.c:55
 msgid "Merge From Pilot"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:59
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:60
+#: calendar/conduits/todo/todo-conduit-control-applet.c:56
 msgid "Merge To Pilot"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:143
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:144
+#: calendar/conduits/todo/todo-conduit-control-applet.c:94
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr ""
 
@@ -77,7 +76,7 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:146
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:147
+#: calendar/conduits/todo/todo-conduit-control-applet.c:97
 msgid "(C) 1998 the Free Software Foundation"
 msgstr ""
 
@@ -87,19 +86,19 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:149
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:150
+#: calendar/conduits/todo/todo-conduit-control-applet.c:100
 msgid "gnome-unknown.xpm"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:190
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:191
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "Synchronize Action"
 msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:261
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
-#: calendar/conduits/todo/todo-conduit-control-applet.c:262
+#: calendar/conduits/todo/todo-conduit-control-applet.c:190
 msgid "Conduit state"
 msgstr ""
 
@@ -107,8 +106,8 @@ msgstr ""
 #: addressbook/conduit/address-conduit-control-applet.c:328
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
-#: calendar/conduits/todo/todo-conduit-control-applet.c:316
-#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+#: calendar/conduits/todo/todo-conduit-control-applet.c:242
+#: calendar/conduits/todo/todo-conduit-control-applet.c:255
 msgid ""
 "No pilot configured, please choose the\n"
 "'Pilot Link Properties' capplet first."
@@ -116,39 +115,39 @@ msgstr ""
 
 #: addressbook/conduit/address-conduit-control-applet.c:334
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:335
+#: calendar/conduits/todo/todo-conduit-control-applet.c:261
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Нема╓ з'╓днання з демоном gnome-pilot."
 
 #: addressbook/conduit/address-conduit-control-applet.c:339
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
-#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
 msgid ""
 "An error occured when trying to fetch\n"
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:125
-#: addressbook/conduit/address-conduit.c:139
+#: addressbook/conduit/address-conduit.c:127
+#: addressbook/conduit/address-conduit.c:141
 msgid "BLARG\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:456
+#: addressbook/conduit/address-conduit.c:471
 #, c-format
 msgid "Address holds %ld address entries"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:482
-#: addressbook/conduit/address-conduit.c:484
+#: addressbook/conduit/address-conduit.c:497
+#: addressbook/conduit/address-conduit.c:499
 msgid "Could not start addressbook server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:500
+#: addressbook/conduit/address-conduit.c:512
+#: addressbook/conduit/address-conduit.c:515
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:838
+#: addressbook/conduit/address-conduit.c:853
 msgid "Error while communicating with address server"
 msgstr ""
 
@@ -169,473 +168,464 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Доступн╕ категор╕╖:"
 
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1168
+#: addressbook/contact-editor/e-contact-editor.c:705
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1155
 msgid "FIXME: _Appointment"
 msgstr "Зустр╕ч"
 
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1169
+#: addressbook/contact-editor/e-contact-editor.c:706
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1156
 msgid "FIXME: Meeting Re_quest"
 msgstr "Запит зустр╕ч╕"
 
-#: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1171
+#: addressbook/contact-editor/e-contact-editor.c:708
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1158
 msgid "FIXME: _Mail Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1172
+#: addressbook/contact-editor/e-contact-editor.c:709
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1159
 msgid "FIXME: _Contact"
 msgstr "Контакт"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/dialogs/task-editor.c:213
-#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1173
+#: addressbook/contact-editor/e-contact-editor.c:710
+#: calendar/gui/dialogs/task-editor.c:427
+#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1160
 msgid "FIXME: _Task"
 msgstr "Завдання"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/dialogs/task-editor.c:214
-#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1174
+#: addressbook/contact-editor/e-contact-editor.c:711
+#: calendar/gui/dialogs/task-editor.c:428
+#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1161
 msgid "FIXME: Task _Request"
 msgstr "Запит завдання"
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1175
+#: addressbook/contact-editor/e-contact-editor.c:712
+#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1162
 msgid "FIXME: _Journal Entry"
 msgstr "Журнальний рядок"
 
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1176
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1163
 msgid "FIXME: _Note"
 msgstr "Нотатка"
 
-#: addressbook/contact-editor/e-contact-editor.c:653
-#: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1178
-#: calendar/gui/event-editor.c:1285
+#: addressbook/contact-editor/e-contact-editor.c:715
+#: addressbook/contact-editor/e-contact-editor.c:820
+#: calendar/gui/dialogs/task-editor.c:439
+#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1165
+#: calendar/gui/event-editor.c:1273
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:720
+#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1170
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1185
+#: addressbook/contact-editor/e-contact-editor.c:722
+#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1172
 msgid "FIXME: Define Print _Styles..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1192
+#: addressbook/contact-editor/e-contact-editor.c:729
+#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1179
 msgid "FIXME: S_end"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1196
+#: addressbook/contact-editor/e-contact-editor.c:733
+#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1183
 msgid "FIXME: Save Attac_hments..."
 msgstr "."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:735
+#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1185
 msgid "_Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1199
+#: addressbook/contact-editor/e-contact-editor.c:736
+#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1187
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1200
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1188
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1202
+#: addressbook/contact-editor/e-contact-editor.c:739
+#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1190
 msgid "Page Set_up"
 msgstr "Париметри стор╕нки"
 
-#: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1203
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1191
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:761
+#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1212
 msgid "FIXME: Paste _Special..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:766
+#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1217
 msgid "FIXME: Mark as U_nread"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:770
+#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1221
 msgid "_Object"
 msgstr "Об'╓кт"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/dialogs/task-editor.c:285
-#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1238
-#: calendar/gui/event-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:775
+#: addressbook/contact-editor/e-contact-editor.c:782
+#: calendar/gui/dialogs/task-editor.c:500
+#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1226
+#: calendar/gui/event-editor.c:1233
 msgid "FIXME: _Item"
 msgstr "Елемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:286
-#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1239
-#: calendar/gui/event-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:776
+#: addressbook/contact-editor/e-contact-editor.c:783
+#: calendar/gui/dialogs/task-editor.c:501
+#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1227
+#: calendar/gui/event-editor.c:1234
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:777
+#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1228
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:784
+#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1235
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1252
+#: addressbook/contact-editor/e-contact-editor.c:789
+#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1240
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:791
+#: calendar/gui/dialogs/task-editor.c:518 calendar/gui/event-editor.c:1242
 msgid "FIXME: __Formatting"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1257
+#: addressbook/contact-editor/e-contact-editor.c:794
+#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1245
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:799
+#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1250
 msgid "Pre_vious"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1263
+#: addressbook/contact-editor/e-contact-editor.c:800
+#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1251
 msgid "Ne_xt"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:802
+#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1255
 msgid "_Toolbars"
 msgstr "Панель ╕нструмент╕в"
 
-#: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:807
+#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1260
 msgid "FIXME: _File..."
 msgstr "Файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1261
 msgid "FIXME: It_em..."
 msgstr "Елемент..."
 
-#: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:809
+#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1262
 msgid "FIXME: _Object..."
 msgstr "Об'╓кт..."
 
-#: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:814
+#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1267
 msgid "FIXME: _Font..."
 msgstr "Шрифт..."
 
-#: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:815
+#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1268
 msgid "FIXME: _Paragraph..."
 msgstr "Параграф..."
 
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:822
+#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1275
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1288
+#: addressbook/contact-editor/e-contact-editor.c:823
+#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1276
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:825
+#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1278
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:826
+#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1279
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1293
+#: addressbook/contact-editor/e-contact-editor.c:828
+#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1281
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1298
+#: addressbook/contact-editor/e-contact-editor.c:833
+#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1286
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1303
+#: addressbook/contact-editor/e-contact-editor.c:835
+#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1291
 msgid "_Forms"
 msgstr "Форми"
 
-#: addressbook/contact-editor/e-contact-editor.c:778
+#: addressbook/contact-editor/e-contact-editor.c:840
 msgid "FIXME: _New Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:841
 msgid "FIXME: New _Contact from Same Company"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:843
 msgid "FIXME: New _Letter to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:844
 msgid "FIXME: New _Message to Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:783
+#: addressbook/contact-editor/e-contact-editor.c:845
 msgid "FIXME: New Meetin_g with Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:784
+#: addressbook/contact-editor/e-contact-editor.c:846
 msgid "FIXME: _Plan a Meeting..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
+#: addressbook/contact-editor/e-contact-editor.c:847
 msgid "FIXME: New _Task for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
+#: addressbook/contact-editor/e-contact-editor.c:848
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
+#: addressbook/contact-editor/e-contact-editor.c:850
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:789
+#: addressbook/contact-editor/e-contact-editor.c:851
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:790
+#: addressbook/contact-editor/e-contact-editor.c:852
 msgid "FIXME: _Open Web Page"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:792
+#: addressbook/contact-editor/e-contact-editor.c:854
 msgid "FIXME: Forward as _vCard"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1316
+#: addressbook/contact-editor/e-contact-editor.c:855
+#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1304
 msgid "FIXME: For_ward"
 msgstr "Переслати"
 
-#: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:867
+#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1317
 msgid "_Insert"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:868
+#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1318
+#: composer/e-msg-composer.c:1022
 msgid "F_ormat"
 msgstr "Формат"
 
-#: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1331
-#: shell/e-shell-view-menu.c:513
+#: addressbook/contact-editor/e-contact-editor.c:869
+#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1319
 msgid "_Tools"
 msgstr "╤нструменти"
 
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1332
+#: addressbook/contact-editor/e-contact-editor.c:870
+#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1320
 msgid "Actio_ns"
 msgstr "Д╕╖"
 
-#: addressbook/contact-editor/e-contact-editor.c:839
+#: addressbook/contact-editor/e-contact-editor.c:901
+#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1345
 msgid "Save and Close"
 msgstr "Зберегти та закрити"
 
-#: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:902
 msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:844
-#: calendar/gui/calendar-commands.c:654
+#: addressbook/contact-editor/e-contact-editor.c:906
 msgid "Print..."
 msgstr "Друкувати..."
 
-#: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1376
+#: addressbook/contact-editor/e-contact-editor.c:907
+#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1363
 msgid "Print this item"
 msgstr "Надрукувати цей елемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1377
+#: addressbook/contact-editor/e-contact-editor.c:910
+#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1368
 msgid "FIXME: Insert File..."
 msgstr "Вставити файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1378
+#: addressbook/contact-editor/e-contact-editor.c:911
+#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1369
 msgid "Insert a file as an attachment"
 msgstr ""
 
-#. Delete
-#: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/demo/addressbook.c:84
-#: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/e-calendar-table.c:375
-#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:508
-#: mail/folder-browser-factory.c:49 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:147
+#: addressbook/contact-editor/e-contact-editor.c:914
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
+#: calendar/gui/event-editor.c:1350 mail/mail-view.c:160
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1387
-#: calendar/gui/gncal-todo.c:336
+#: addressbook/contact-editor/e-contact-editor.c:915
 msgid "Delete this item"
 msgstr "Стерти це пов╕домлення"
 
-#: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1389
+#: addressbook/contact-editor/e-contact-editor.c:919
+#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1379
 msgid "FIXME: Previous"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:858
-#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1390
+#: addressbook/contact-editor/e-contact-editor.c:920
+#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1380
 msgid "Go to the previous item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1391
+#: addressbook/contact-editor/e-contact-editor.c:922
+#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1382
 msgid "FIXME: Next"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:861
-#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1392
+#: addressbook/contact-editor/e-contact-editor.c:923
+#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1383
 msgid "Go to the next item"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:864
-#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1393
+#: addressbook/contact-editor/e-contact-editor.c:926
+#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1385
 msgid "FIXME: Help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:865
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1394
+#: addressbook/contact-editor/e-contact-editor.c:927
+#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1386
 msgid "See online help"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1320
+#: addressbook/contact-editor/e-contact-editor.c:1418
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1321
-#: addressbook/contact-editor/e-contact-editor.c:1425
+#: addressbook/contact-editor/e-contact-editor.c:1419
+#: addressbook/contact-editor/e-contact-editor.c:1523
 msgid "Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/e-contact-editor.c:1322
+#: addressbook/contact-editor/e-contact-editor.c:1420
 msgid "Business 2"
 msgstr "Робоча 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1323
+#: addressbook/contact-editor/e-contact-editor.c:1421
 msgid "Business Fax"
 msgstr "Робочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1324
+#: addressbook/contact-editor/e-contact-editor.c:1422
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1325
+#: addressbook/contact-editor/e-contact-editor.c:1423
 msgid "Car"
 msgstr "Авто"
 
-#: addressbook/contact-editor/e-contact-editor.c:1326
+#: addressbook/contact-editor/e-contact-editor.c:1424
 msgid "Company"
 msgstr "Компан╕я"
 
-#: addressbook/contact-editor/e-contact-editor.c:1327
-#: addressbook/contact-editor/e-contact-editor.c:1426
+#: addressbook/contact-editor/e-contact-editor.c:1425
+#: addressbook/contact-editor/e-contact-editor.c:1524
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1426
 msgid "Home 2"
 msgstr "Домашня 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1427
 msgid "Home Fax"
 msgstr "Домашн╕й факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1428
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1331
+#: addressbook/contact-editor/e-contact-editor.c:1429
 msgid "Mobile"
 msgstr "Моб╕льний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1332
-#: addressbook/contact-editor/e-contact-editor.c:1427
-#: mail/mail-config.glade.h:27
+#: addressbook/contact-editor/e-contact-editor.c:1430
+#: addressbook/contact-editor/e-contact-editor.c:1525
 msgid "Other"
 msgstr "╤нша"
 
-#: addressbook/contact-editor/e-contact-editor.c:1333
+#: addressbook/contact-editor/e-contact-editor.c:1431
 msgid "Other Fax"
 msgstr "╤нший факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1334
+#: addressbook/contact-editor/e-contact-editor.c:1432
 msgid "Pager"
 msgstr "Пейджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1335
+#: addressbook/contact-editor/e-contact-editor.c:1433
 msgid "Primary"
 msgstr "Первинний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1336
+#: addressbook/contact-editor/e-contact-editor.c:1434
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/contact-editor/e-contact-editor.c:1435
 msgid "Telex"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/contact-editor/e-contact-editor.c:1436
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1382
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1480
 msgid "Primary Email"
 msgstr "Первинна е-пошта"
 
-#: addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:1481
 msgid "Email 2"
 msgstr "Е-пошта 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/contact-editor/e-contact-editor.c:1482
 msgid "Email 3"
 msgstr "Е-пошта 3"
 
@@ -675,8 +665,6 @@ 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.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
 msgid "Add"
 msgstr "Додати"
 
@@ -701,52 +689,51 @@ msgid "Wants to receive _HTML mail"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "Адреса:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr "Робоча"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "Домашня"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "Зв'язки..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "Посада:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "Компан╕я:"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr "Адреса..."
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "General"
 msgstr ""
 
@@ -791,7 +778,7 @@ msgid "No_tes:"
 msgstr "Нотатки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
 msgid "Details"
 msgstr "Подробиц╕"
 
@@ -805,26 +792,6 @@ msgid "Check Full Name"
 msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
-msgstr ""
-
-#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Mr.\n"
@@ -836,7 +803,7 @@ msgstr ""
 "Пан╕\n"
 "Доктор\n"
 
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -847,67 +814,35 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/demo/addressbook.c:78
-#: addressbook/gui/component/addressbook.c:418
-#: calendar/gui/calendar-commands.c:511 notes/component-factory.c:27
-msgid "New"
-msgstr "Новий"
-
-#: addressbook/demo/addressbook.c:78
-#: addressbook/gui/component/addressbook.c:418
-msgid "Create a new contact"
-msgstr "Створити новий запис"
-
-#: addressbook/demo/addressbook.c:82
-#: addressbook/gui/component/addressbook.c:422
-msgid "Find"
-msgstr "Шукати"
-
-#: addressbook/demo/addressbook.c:82
-#: addressbook/gui/component/addressbook.c:422
-msgid "Find a contact"
-msgstr "Знайти контактну ╕нформац╕ю"
-
-#: addressbook/demo/addressbook.c:83
-#: addressbook/gui/component/addressbook.c:423
-#: calendar/gui/calendar-commands.c:516 mail/folder-browser-factory.c:47
-#: mail/mail-view.c:145
-msgid "Print"
-msgstr "Друкувати"
-
-#: addressbook/demo/addressbook.c:83
-#: addressbook/gui/component/addressbook.c:423
-msgid "Print contacts"
-msgstr "Надрукувати контактну ╕нформац╕ю"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr ""
 
-#: addressbook/demo/addressbook.c:84
-#: addressbook/gui/component/addressbook.c:424
-msgid "Delete a contact"
-msgstr "Стерти контактну ╕нформац╕ю"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr ""
 
-#: addressbook/demo/addressbook.c:103
-#: addressbook/gui/component/addressbook.c:509
-msgid "_New Contact"
-msgstr "Нова ╕нформац╕я"
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:492
-msgid "_Print Contacts..."
-msgstr "Надрукувати контактну ╕нформац╕ю..."
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:502
-#: addressbook/gui/component/addressbook.c:972
-msgid "As _Table"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:508
 msgid "N_ew Directory Server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:586
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:605
+#: addressbook/gui/component/addressbook.c:591
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -919,20 +854,24 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:876
-#: addressbook/gui/minicard/e-minicard.c:330
+#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/widgets/e-minicard.c:334
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/component/addressbook.c:943
+#: addressbook/gui/component/addressbook.c:976
 msgid "* Click here to add a contact *"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:979
+#: addressbook/gui/component/addressbook.c:1006
+msgid "As _Table"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:1013
 msgid "As _Minicards"
 msgstr "Як _Minicards"
 
-#: addressbook/gui/component/addressbook.c:1030
+#: addressbook/gui/component/addressbook.c:1064
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
@@ -978,7 +917,7 @@ msgid "g"
 msgstr ""
 
 #: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:131
+#: calendar/cal-util/timeutil.c:100
 msgid "h"
 msgstr ""
 
@@ -1099,20 +1038,18 @@ msgid "Find..."
 msgstr "Шукати..."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:9
-#, fuzzy
 msgid "Select name from List:"
-msgstr "Вибрати назви"
+msgstr "Вибер╕ть назву з списку:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
 msgid "Message Recipients"
 msgstr "Адресати пов╕домлення"
 
-#: addressbook/gui/minicard/e-minicard-control.c:276
-#, fuzzy
+#: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
-msgstr "Не вдалося в╕дкрити адресну книгу"
+msgstr "Зберегти у адресн╕й книз╕"
 
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:110
 msgid ""
 "\n"
 "\n"
@@ -1121,18 +1058,11 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/minicard/test-minicard-view.c:101
-#, fuzzy
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
+#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: mail/folder-browser.c:404
+msgid "Search"
+msgstr "Пошук"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -1237,7 +1167,6 @@ msgstr "Тип:"
 
 #: addressbook/printing/e-contact-print.glade.h:31
 #: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:81
 msgid "label26"
 msgstr ""
 
@@ -1316,11 +1245,11 @@ msgstr ""
 msgid "Header/Footer"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:544
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
 msgid "am"
 msgstr "дп"
 
-#: calendar/cal-util/timeutil.c:129 calendar/gui/print.c:543
+#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:603
 msgid "pm"
 msgstr "пп"
 
@@ -1332,35 +1261,35 @@ msgstr ""
 msgid "Configuration utility for the calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:399
-#: calendar/conduits/calendar/calendar-conduit.c:1109
-#: calendar/conduits/todo/todo-conduit.c:443
-#: calendar/conduits/todo/todo-conduit.c:1025
+#: calendar/conduits/calendar/calendar-conduit.c:398
+#: calendar/conduits/calendar/calendar-conduit.c:1111
+#: calendar/conduits/todo/todo-conduit.c:406
+#: calendar/conduits/todo/todo-conduit.c:902
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:776
 #: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:707
-#: calendar/conduits/todo/todo-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:780
+#: calendar/conduits/todo/todo-conduit.c:605
+#: calendar/conduits/todo/todo-conduit.c:607
 msgid "Could not start gnomecal server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:806
-#: calendar/conduits/calendar/calendar-conduit.c:809
+#: calendar/conduits/calendar/calendar-conduit.c:808
+#: calendar/conduits/calendar/calendar-conduit.c:811
 msgid "Could not read pilot's DateBook application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:146
+#: calendar/conduits/todo/todo-conduit-control-applet.c:96
 msgid "Gpilotd todo conduit"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:149
+#: calendar/conduits/todo/todo-conduit-control-applet.c:99
 msgid "Configuration utility for the todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:737
-#: calendar/conduits/todo/todo-conduit.c:740
+#: calendar/conduits/todo/todo-conduit.c:630
+#: calendar/conduits/todo/todo-conduit.c:633
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1412,189 +1341,100 @@ msgstr ""
 msgid "The GNOME personal calendar and schedule manager."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:392
 msgid "File not found"
 msgstr "Файлу не знайдено"
 
-#: calendar/gui/calendar-commands.c:423
+#: calendar/gui/calendar-commands.c:416
 msgid "Open calendar"
 msgstr "В╕дкрити календар"
 
-#: calendar/gui/calendar-commands.c:462
+#: calendar/gui/calendar-commands.c:455
 msgid "Save calendar"
 msgstr "Зберегти календар"
 
-#: calendar/gui/calendar-commands.c:489 calendar/gui/gncal-todo.c:722
-#: calendar/gui/gncal-todo.c:726
+#: calendar/gui/calendar-commands.c:486
 msgid "Day"
 msgstr "День"
 
-#: calendar/gui/calendar-commands.c:489
+#: calendar/gui/calendar-commands.c:486
 msgid "Show 1 day"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:492
+#: calendar/gui/calendar-commands.c:489
 msgid "5 Days"
 msgstr "5 Дн╕в"
 
-#: calendar/gui/calendar-commands.c:492
+#: calendar/gui/calendar-commands.c:489
 msgid "Show the working week"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:495 calendar/gui/gncal-todo.c:721
+#: calendar/gui/calendar-commands.c:492
 msgid "Week"
 msgstr "Тиждень"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:492
 msgid "Show 1 week"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:498
+#: calendar/gui/calendar-commands.c:495
 msgid "Month"
 msgstr "М╕сяць"
 
-#: calendar/gui/calendar-commands.c:498
+#: calendar/gui/calendar-commands.c:495
 msgid "Show 1 month"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:502
+#: calendar/gui/calendar-commands.c:499
 msgid "Year"
 msgstr "Р╕к"
 
-#: calendar/gui/calendar-commands.c:502
+#: calendar/gui/calendar-commands.c:499
 msgid "Show 1 year"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:663
-msgid "Create a new appointment"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:516 calendar/gui/calendar-commands.c:655
-msgid "Print this calendar"
-msgstr "Надрукувати цей календар"
-
-#: calendar/gui/calendar-commands.c:520
-msgid "Prev"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:520
-msgid "Go back in time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:521
-#, fuzzy
-msgid "Today"
-msgstr "Т╕ло"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to present time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:522
-msgid "Next"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:522
-msgid "Go forward in time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:526
-msgid "Go to"
-msgstr "Перейти"
-
-#: calendar/gui/calendar-commands.c:526
-msgid "Go to a specific date"
-msgstr "Перейти до вказано╖ дати"
-
-#. file menu
-#: calendar/gui/calendar-commands.c:640
-msgid "New Ca_lendar"
-msgstr "Новий календар"
-
-#: calendar/gui/calendar-commands.c:641
-msgid "Create a new calendar"
-msgstr "Створити новий календар"
-
-#: calendar/gui/calendar-commands.c:644
-msgid "Open Ca_lendar"
-msgstr "В╕дкрити календар"
-
-#: calendar/gui/calendar-commands.c:645
-msgid "Open a calendar"
-msgstr "В╕дкрити календар"
-
-#: calendar/gui/calendar-commands.c:649 calendar/gui/calendar-commands.c:650
-msgid "Save Calendar As"
-msgstr "Зберегти календар як"
-
-#: calendar/gui/calendar-commands.c:663
-msgid "_New appointment..."
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:671 calendar/gui/prop.c:716
-msgid "Preferences"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:678 calendar/gui/calendar-commands.c:679
-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:721
-#, c-format
-msgid "%s%s"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:721
-msgid "'s calendar"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:323
+#: calendar/gui/calendar-model.c:330
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:326
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#, fuzzy
+#: calendar/gui/calendar-model.c:333
 msgid "Private"
-msgstr "Вставити"
+msgstr ""
 
-#: calendar/gui/calendar-model.c:329
+#: calendar/gui/calendar-model.c:336
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:499
+#: calendar/gui/calendar-model.c:339 calendar/gui/calendar-model.c:506
 #, fuzzy
 msgid "Unknown"
 msgstr "Нев╕дома помилка"
 
-#: calendar/gui/calendar-model.c:419
+#: calendar/gui/calendar-model.c:426
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:419
+#: calendar/gui/calendar-model.c:426
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421
+#: calendar/gui/calendar-model.c:428
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:421
+#: calendar/gui/calendar-model.c:428
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:493
+#: calendar/gui/calendar-model.c:500
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:496
+#: calendar/gui/calendar-model.c:503
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:747
+#: calendar/gui/calendar-model.c:727
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1602,22 +1442,22 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:820
+#: calendar/gui/calendar-model.c:901
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:865
-msgid "The percent value must be between 0 and 100"
+#: calendar/gui/calendar-model.c:941
+msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:898
-msgid "The priority must be between 0 and 10"
+#: calendar/gui/calendar-model.c:981
+msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/control-factory.c:132
+#: calendar/gui/control-factory.c:126
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
@@ -1640,10 +1480,11 @@ msgstr ""
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/event-editor.c:1355
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
 #, fuzzy
 msgid "Snooze"
 msgstr "Розм╕р"
@@ -1657,93 +1498,100 @@ msgstr "Зустр╕ч"
 msgid "Snooze time (minutes)"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1198
-msgid "FIXME: _Delete"
-msgstr "Стерти"
-
-#: calendar/gui/dialogs/task-editor.c:287
-#: calendar/gui/dialogs/task-editor.c:295
+#: calendar/gui/dialogs/task-editor.c:502
+#: calendar/gui/dialogs/task-editor.c:510
 #, fuzzy
 msgid "FIXME: In_complete Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1300
+#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1288
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1301
+#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1289
 msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:355
+#: calendar/gui/dialogs/task-editor.c:570
 #, fuzzy
 msgid "FIXME: _New Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor.c:357
+#: calendar/gui/dialogs/task-editor.c:572
 msgid "FIXME: S_end Status Report"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:358
+#: calendar/gui/dialogs/task-editor.c:573
 #, fuzzy
 msgid "FIXME: _Mark Complete"
 msgstr "Стерти"
 
-#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1310
+#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1298
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:361
+#: calendar/gui/dialogs/task-editor.c:576
 msgid "FIXME: S_kip Occurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:363
+#: calendar/gui/dialogs/task-editor.c:578
 #, fuzzy
 msgid "FIXME: Assig_n Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor.c:365
+#: calendar/gui/dialogs/task-editor.c:580
 #, fuzzy
 msgid "FIXME: _Reply"
 msgstr "Стерти"
 
-#: calendar/gui/dialogs/task-editor.c:366
+#: calendar/gui/dialogs/task-editor.c:581
 #, fuzzy
 msgid "FIXME: Reply to A_ll"
 msgstr "В╕дпов╕сти вс╕м"
 
-#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1370
-msgid "FIXME: Save and Close"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:410
+#: calendar/gui/dialogs/task-editor.c:625
 msgid "Save the task and close the dialog box"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1375
+#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1362
 msgid "FIXME: Print..."
 msgstr "Друкувати..."
 
-#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1380
-msgid "FIXME: Recurrence..."
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1381
-msgid "Configure recurrence rules"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:422
+#: calendar/gui/dialogs/task-editor.c:639
 #, fuzzy
 msgid "FIXME: Assign Task..."
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor.c:423
+#: calendar/gui/dialogs/task-editor.c:640
 msgid "Assign the task to someone"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1386
-msgid "FIXME: Delete"
-msgstr "Стерти"
+#: calendar/gui/dialogs/task-editor.c:645
+msgid "Delete this task"
+msgstr "Стерти це завдання"
+
+#: calendar/gui/dialogs/task-editor.c:913
+msgid "Edit Task"
+msgstr "Виправити завдання"
+
+#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:284
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:290
+#, c-format
+msgid "Appointment - %s"
+msgstr "Зустр╕ч - %s"
+
+#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:293
+#, c-format
+msgid "Task - %s"
+msgstr "Завдання - %s"
+
+#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:296
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальний рядок - %s"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -1751,12 +1599,11 @@ msgstr "Стерти"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#, fuzzy
-msgid "S_ubject:"
-msgstr "Тема:"
+msgid "task-editor-dialog"
+msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Owner:"
+msgid "S_ummary"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:9
@@ -1769,25 +1616,28 @@ msgid "_Due Date:"
 msgstr "Дата"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "_Status:"
+msgid "% Comp_lete:"
 msgstr ""
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+msgid "_Status:"
+msgstr "Стан:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid ""
 "Not Started\n"
 "In Progress\n"
 "Completed\n"
 "Cancelled\n"
 msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "Not Started"
-msgstr ""
+"Не запущено\n"
+"Викону╓ться\n"
+"Виконано\n"
+"В╕дм╕нено\n"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
 msgid "_Priority:"
-msgstr "Приор╕тет"
+msgstr "Приор╕тет:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid ""
@@ -1795,542 +1645,235 @@ msgid ""
 "Normal\n"
 "Low\n"
 msgstr ""
+"Високий\n"
+"Звичайний\n"
+"Низький\n"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-#, fuzzy
-msgid "High"
-msgstr "Висота:"
+msgid "C_lassification:"
+msgstr "Класиф╕кац╕я:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "% Comp_lete:"
+msgid ""
+"None\n"
+"Public\n"
+"Private\n"
+"Confidential\n"
 msgstr ""
+"Нема╓\n"
+"Публ╕чне\n"
+"Приватне\n"
+"Конфеденц╕йне\n"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#, fuzzy
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Contacts..."
 msgstr "Зв'язки..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#, fuzzy
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
 msgid "Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
 msgid "Date Completed:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "Location:"
-msgstr ""
+msgstr "Дата виконання:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
 msgid "URL:"
-msgstr ""
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "Resources:"
-msgstr ""
+#. Create the header columns
+#: calendar/gui/e-calendar-table.c:196
+msgid "Categories"
+msgstr "Категор╕╖"
 
-#: calendar/gui/e-calendar-table.c:189
-msgid "Comment"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:197
+msgid "Classification"
+msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/e-calendar-table.c:194
-msgid "Completed"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:198
+msgid "Completion date"
+msgstr "Дата виконання"
 
 #: calendar/gui/e-calendar-table.c:199
-msgid "Created"
-msgstr ""
+msgid "End date"
+msgstr "К╕нцева дата"
 
-#: calendar/gui/e-calendar-table.c:204
-#, fuzzy
-msgid "Description"
-msgstr "Опис:"
+#: calendar/gui/e-calendar-table.c:200
+msgid "Start date"
+msgstr "Початкова дата"
 
-#: calendar/gui/e-calendar-table.c:209
-msgid "Timestamp"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:214
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:219
+#: calendar/gui/e-calendar-table.c:201
 #, fuzzy
-msgid "End Date"
+msgid "Due date"
 msgstr "Дата"
 
-#: calendar/gui/e-calendar-table.c:224
-msgid "Geographical Position"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:202
+msgid "Geographical position"
+msgstr "Географ╕чне положення"
 
-#: calendar/gui/e-calendar-table.c:229
-msgid "Last Modification Date"
-msgstr ""
+#: calendar/gui/e-calendar-table.c:203
+msgid "Percent complete"
+msgstr "В╕дсоток виконання"
 
-#: calendar/gui/e-calendar-table.c:234
-#, fuzzy
-msgid "Location"
-msgstr "Д╕╖"
-
-#: calendar/gui/e-calendar-table.c:239
-#, fuzzy
-msgid "Organizer"
-msgstr "Ор╕╓нтац╕я"
-
-#: calendar/gui/e-calendar-table.c:244
-msgid "% Complete"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.c:249 calendar/gui/gncal-todo.c:436
-#: calendar/gui/prop.c:609 mail/message-list.c:507
+#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
+#: mail/message-list.c:663
 msgid "Priority"
 msgstr "Приор╕тет"
 
-#: calendar/gui/e-calendar-table.c:260
-#, fuzzy
-msgid "TaskPad"
-msgstr "Завдання"
+#: calendar/gui/e-calendar-table.c:212
+msgid "Summary"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:265
-msgid "URL"
+#: calendar/gui/e-calendar-table.c:216
+msgid "Transparency"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:270
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Reminder"
+#: calendar/gui/e-calendar-table.c:217
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
+msgid "Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:369
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:318
 msgid "Open..."
-msgstr "В╕дкрити"
+msgstr "В╕дкрити..."
 
-#: calendar/gui/e-calendar-table.c:370
+#: calendar/gui/e-calendar-table.c:319
 msgid "Open the task"
-msgstr ""
+msgstr "В╕дкрити завдання"
 
-#: calendar/gui/e-calendar-table.c:372
+#: calendar/gui/e-calendar-table.c:321
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:322
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:376
-#, fuzzy
+#: calendar/gui/e-calendar-table.c:325
 msgid "Delete the task"
-msgstr "Стерти це пов╕домлення"
+msgstr "Стерти завдання"
 
-#: calendar/gui/e-day-view-time-item.c:391
+#: calendar/gui/e-day-view-time-item.c:393
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
-#: 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
+#: calendar/gui/e-day-view.c:2508 calendar/gui/e-day-view.c:2515
+#: calendar/gui/e-day-view.c:2524 calendar/gui/e-week-view.c:2958
+#: calendar/gui/e-week-view.c:2965 calendar/gui/e-week-view.c:2974
 msgid "New appointment..."
-msgstr "Зустр╕ч"
+msgstr "Нова зустр╕ч..."
 
-#: 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
+#: calendar/gui/e-day-view.c:2512 calendar/gui/e-day-view.c:2519
+#: calendar/gui/e-week-view.c:2962 calendar/gui/e-week-view.c:2969
 msgid "Edit this appointment..."
-msgstr ""
+msgstr "Виправити зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
-#, fuzzy
+#: calendar/gui/e-day-view.c:2513 calendar/gui/e-week-view.c:2963
+#: calendar/gui/event-editor.c:1351
 msgid "Delete this appointment"
-msgstr "Стерти це пов╕домлення"
+msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
+#: calendar/gui/e-day-view.c:2520 calendar/gui/e-week-view.c:2970
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: calendar/gui/e-day-view.c:2521 calendar/gui/e-week-view.c:2971
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Стерти це пов╕домлення"
 
-#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
+#: calendar/gui/e-day-view.c:2522 calendar/gui/e-week-view.c:2972
 msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:291
+#: calendar/gui/event-editor.c:278
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "Зустр╕ч"
 
-#: calendar/gui/event-editor.c:296
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/event-editor.c:300
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Зустр╕ч"
-
-#: calendar/gui/event-editor.c:303
-#, c-format
-msgid "Task - %s"
-msgstr ""
-
-#: calendar/gui/event-editor.c:306
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальний рядок"
-
-#. Owner, summary
-#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
-msgid "?"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1265
+#: calendar/gui/event-editor.c:1253
 msgid "FIXME: Ca_lendar..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1308
+#: calendar/gui/event-editor.c:1296
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "Зустр╕ч"
 
-#: calendar/gui/event-editor.c:1312
+#: calendar/gui/event-editor.c:1300
 #, fuzzy
 msgid "FIXME: Invite _Attendees..."
 msgstr "."
 
-#: calendar/gui/event-editor.c:1313
+#: calendar/gui/event-editor.c:1301
 msgid "FIXME: C_ancel Invitation..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1315
+#: calendar/gui/event-editor.c:1303
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1383
-msgid "FIXME: Invite Attendees..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1384
-msgid "Invite attendees to a meeting"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1828
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "_Owner:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Start time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "End time:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "A_ll day event"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Classification"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pu_blic"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-#, fuzzy
-msgid "Pri_vate"
-msgstr "Вставити"
-
-#: calendar/gui/event-editor-dialog.glade.h:17
-msgid "_Confidential"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:27
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-#, fuzzy
-msgid "_Audio"
-msgstr "Додати"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:38
-#, fuzzy
-msgid "_Mail"
-msgstr "Моб╕льний телефон"
-
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "Mail _to:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "_Run program:"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Recurrence rule"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:865
-#, fuzzy
-msgid "None"
-msgstr "Нотатка"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-#, fuzzy
-msgid "Daily"
-msgstr "Подробиц╕"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Weekly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Monthly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Yearly"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:48
-#, fuzzy
-msgid "label23"
-msgstr "позначка2"
-
-#: calendar/gui/event-editor-dialog.glade.h:49
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:82
-msgid "Every "
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "day(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:51
-#, fuzzy
-msgid "label24"
-msgstr "позначка2"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-msgid "week(s)"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr ""
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:61
+#: calendar/gui/event-editor.c:1346
 #, fuzzy
-msgid "label25"
-msgstr "позначка2"
-
-#: calendar/gui/event-editor-dialog.glade.h:62
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "Recur on the"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid "th day of the month"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:71
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "Every"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:80
-#, fuzzy
-msgid "month(s)"
-msgstr "Шрифти"
-
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "year(s)"
-msgstr ""
+msgid "Save and close this appointment"
+msgstr "Стерти це пов╕домлення"
 
-#: calendar/gui/event-editor-dialog.glade.h:84
+#: calendar/gui/event-editor.c:1356
 #, fuzzy
-msgid "label27"
-msgstr "позначка2"
-
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Ending date"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "Repeat forever"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End on "
-msgstr ""
+msgid "Close this appointment"
+msgstr "Стерти це пов╕домлення"
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "End after"
+#: calendar/gui/event-editor.c:1372
+msgid "FIXME: Invite Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "occurrence(s)"
+#: calendar/gui/event-editor.c:1373
+msgid "Invite attendees to a meeting"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:90
-#, fuzzy
-msgid "Exceptions"
-msgstr "Параметри"
-
-#: calendar/gui/event-editor-dialog.glade.h:92
-#, fuzzy
-msgid "Change"
-msgstr "Стор╕нка"
-
-#: calendar/gui/event-editor-dialog.glade.h:94
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:1930
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
 msgid "january"
-msgstr ""
+msgstr "с╕чня"
 
 #: calendar/gui/getdate.y:392
 msgid "february"
-msgstr ""
+msgstr "лютого"
 
 #: calendar/gui/getdate.y:393
 msgid "march"
-msgstr ""
+msgstr "березня"
 
 #: calendar/gui/getdate.y:394
-#, fuzzy
 msgid "april"
-msgstr "Пап╕р"
+msgstr "кв╕тня"
 
 #: calendar/gui/getdate.y:395
 msgid "may"
-msgstr ""
+msgstr "травня"
 
 #: calendar/gui/getdate.y:396
 msgid "june"
-msgstr ""
+msgstr "червня"
 
 #: calendar/gui/getdate.y:397
 msgid "july"
-msgstr ""
+msgstr "липня"
 
 #: calendar/gui/getdate.y:398
 msgid "august"
-msgstr ""
+msgstr "серпня"
 
 #: calendar/gui/getdate.y:399
 msgid "september"
-msgstr ""
+msgstr "вересня"
 
 #: calendar/gui/getdate.y:400
 msgid "sept"
@@ -2338,28 +1881,27 @@ msgstr ""
 
 #: calendar/gui/getdate.y:401
 msgid "october"
-msgstr ""
+msgstr "жовтня"
 
 #: calendar/gui/getdate.y:402
 msgid "november"
-msgstr ""
+msgstr "листопада"
 
 #: calendar/gui/getdate.y:403
 msgid "december"
-msgstr ""
+msgstr "грудня"
 
 #: calendar/gui/getdate.y:404
 msgid "sunday"
-msgstr ""
+msgstr "нед╕ля"
 
 #: calendar/gui/getdate.y:405
-#, fuzzy
 msgid "monday"
-msgstr "Т╕ло"
+msgstr "понед╕лок"
 
 #: calendar/gui/getdate.y:406
 msgid "tuesday"
-msgstr ""
+msgstr "в╕второк"
 
 #: calendar/gui/getdate.y:407
 msgid "tues"
@@ -2367,7 +1909,7 @@ msgstr ""
 
 #: calendar/gui/getdate.y:408
 msgid "wednesday"
-msgstr ""
+msgstr "середа"
 
 #: calendar/gui/getdate.y:409
 msgid "wednes"
@@ -2375,7 +1917,7 @@ msgstr ""
 
 #: calendar/gui/getdate.y:410
 msgid "thursday"
-msgstr ""
+msgstr "четвер"
 
 #: calendar/gui/getdate.y:411
 msgid "thur"
@@ -2387,72 +1929,68 @@ msgstr ""
 
 #: calendar/gui/getdate.y:413
 msgid "friday"
-msgstr ""
+msgstr "п'ятниця"
 
 #: calendar/gui/getdate.y:414
 msgid "saturday"
-msgstr ""
+msgstr "субота"
 
-#: calendar/gui/getdate.y:420
-#, fuzzy
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
 msgid "year"
-msgstr "Заголовок"
+msgstr "р╕к"
 
-#: calendar/gui/getdate.y:421
-#, fuzzy
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
 msgid "month"
-msgstr "Шрифти"
+msgstr "м╕сяць"
 
 #: calendar/gui/getdate.y:422
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
 msgid "week"
-msgstr ""
+msgstr "тиждень"
 
-#: calendar/gui/getdate.y:424
+#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
 msgid "day"
-msgstr ""
+msgstr "день"
 
-#: calendar/gui/getdate.y:425
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
 msgid "hour"
-msgstr ""
+msgstr "година"
 
-#: calendar/gui/getdate.y:426
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
 msgid "minute"
-msgstr ""
+msgstr "хвилина"
 
 #: calendar/gui/getdate.y:427
 msgid "min"
-msgstr ""
+msgstr "хв"
 
-#: calendar/gui/getdate.y:428
-#, fuzzy
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
 msgid "second"
-msgstr "В╕д╕слати"
+msgstr "секунда"
 
 #: calendar/gui/getdate.y:429
 msgid "sec"
-msgstr ""
+msgstr "с"
 
 #: calendar/gui/getdate.y:435
 msgid "tomorrow"
-msgstr ""
+msgstr "завтра"
 
 #: calendar/gui/getdate.y:436
 msgid "yesterday"
-msgstr ""
+msgstr "вчора"
 
 #: calendar/gui/getdate.y:437
-#, fuzzy
 msgid "today"
-msgstr "Т╕ло"
+msgstr "сьогодн╕"
 
-#: calendar/gui/getdate.y:438
-#, fuzzy
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
+#: filter/filter-datespec.c:664
 msgid "now"
-msgstr "в╕кно1"
+msgstr "зараз"
 
 #: calendar/gui/getdate.y:439
 #, fuzzy
@@ -2519,15 +2057,15 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:140
+#: calendar/gui/gncal-todo.c:139
 msgid "Create to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:140
+#: calendar/gui/gncal-todo.c:139
 msgid "Edit to-do item"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:176
+#: calendar/gui/gncal-todo.c:175
 msgid "Summary:"
 msgstr ""
 
@@ -2536,360 +2074,330 @@ msgstr ""
 msgid "Due Date:"
 msgstr "Дата"
 
-#: calendar/gui/gncal-todo.c:195
-#, fuzzy
+#: calendar/gui/gncal-todo.c:201
 msgid "Priority:"
-msgstr "Приор╕тет"
+msgstr "Приор╕тет:"
 
-#: calendar/gui/gncal-todo.c:212
+#: calendar/gui/gncal-todo.c:219
 msgid "Item Comments:"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:334
-msgid "Add to-do item..."
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:335
-msgid "Edit this item..."
+#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
+#: calendar/gui/gnome-cal.c:1491
+msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:434
-msgid "Summary"
+#: calendar/gui/gnome-cal.c:1131
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:608
-#, fuzzy
-msgid "Due Date"
-msgstr "Дата"
+#: calendar/gui/gnome-cal.c:1142
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Створити новий календар"
 
-#: calendar/gui/gncal-todo.c:437
-msgid "Time Left"
+#: calendar/gui/gnome-cal.c:1153
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#. Label
-#: calendar/gui/gncal-todo.c:449
-#, fuzzy
-msgid "To-do list"
-msgstr "╤нструменти"
-
-#. Add
-#: calendar/gui/gncal-todo.c:488
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Додати..."
-
-#. Edit
-#: calendar/gui/gncal-todo.c:497
-#, fuzzy
-msgid "Edit..."
-msgstr "Додати..."
+#. Idea: we need Snooze option :-)
+#: calendar/gui/gnome-cal.c:1440 calendar/gui/gnome-cal.c:1495
+msgid "Ok"
+msgstr "Гаразд"
 
-#: calendar/gui/gncal-todo.c:721
-msgid "Weeks"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Days"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-msgid "Hours"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-msgid "Hour"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
-msgid "Minutes"
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
-msgid "Minute"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
-#, fuzzy
-msgid "Seconds"
-msgstr "В╕д╕слати"
-
-#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
-#, fuzzy
-msgid "Second"
-msgstr "В╕д╕слати"
-
-#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
-#: calendar/gui/gnome-cal.c:1134
-msgid "Reminder of your appointment at "
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1083 calendar/gui/gnome-cal.c:1138
-msgid "Ok"
-msgstr "Гаразд"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "Р╕к:"
 
-#: calendar/gui/goto.c:264
+#: calendar/gui/goto.c:270
 msgid "Go to date"
 msgstr ""
 
 #. Instructions
-#: calendar/gui/goto.c:275
+#: calendar/gui/goto.c:281
 msgid ""
 "Please select the date you want to go to.\n"
 "When you click on a day, you will be taken\n"
 "to that date."
 msgstr ""
 
-#: calendar/gui/goto.c:312
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr "1"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr "2"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr "3"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr "4"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr "5"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr "7"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr "8"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr "9"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr "10"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr "11"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr "12"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr "13"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr "14"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr "15"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr "16"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr "17"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr "18"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr "19"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr "20"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr "21"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr "22"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr "23"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr "24"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr "25"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "30"
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr "Ндл"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr "Пнд"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr "Втр"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr "Срд"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr "Чтв"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Fr"
 msgstr "Птн"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr "Сбт"
 
-#: calendar/gui/print.c:868
+#: calendar/gui/print.c:951
 msgid "TODO Items"
 msgstr ""
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1052
 msgid "Current day (%a %b %d %Y)"
 msgstr "Поточний день (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
+#: calendar/gui/print.c:1072 calendar/gui/print.c:1086
+#: calendar/gui/print.c:1087
 msgid "%a"
 msgstr "%a"
 
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
+#: calendar/gui/print.c:1073 calendar/gui/print.c:1074
+#: calendar/gui/print.c:1088 calendar/gui/print.c:1089
 msgid "%b"
 msgstr "%b"
 
-#: calendar/gui/print.c:1004
+#: calendar/gui/print.c:1076
 #, c-format
 msgid "Current week (%s %s %d - %s %d %d)"
 msgstr "Поточний тиждень (%s %s %d - %s %d %d)"
 
-#: calendar/gui/print.c:1021
+#: calendar/gui/print.c:1093
 #, c-format
 msgid "Current week (%s %s %d - %s %s %d %d)"
 msgstr "Поточний тиждень (%s %s %d - %s %s %d %d)"
 
-#: calendar/gui/print.c:1027
+#: calendar/gui/print.c:1099
 #, c-format
 msgid "Current week (%s %s %d %d - %s %s %d %d)"
 msgstr "Поточний тиждень (%s %s %d %d - %s %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1040
+#: calendar/gui/print.c:1112
 msgid "Current month (%a %Y)"
 msgstr "Поточний м╕сяць (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1119
 msgid "Current year (%Y)"
 msgstr "Поточний р╕к (%Y)"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1156
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1321
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/prop.c:334
+#: calendar/gui/prop.c:336
 msgid "Time display"
 msgstr ""
 
 #. Time format
-#: calendar/gui/prop.c:338
+#: calendar/gui/prop.c:340
 msgid "Time format"
 msgstr ""
 
-#: calendar/gui/prop.c:339
+#: calendar/gui/prop.c:341
 msgid "12-hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/prop.c:340
+#: calendar/gui/prop.c:342
 msgid "24-hour"
 msgstr ""
 
 #. Weeks start on
-#: calendar/gui/prop.c:350
+#: calendar/gui/prop.c:352
 msgid "Weeks start on"
 msgstr ""
 
-#: calendar/gui/prop.c:351
+#: calendar/gui/prop.c:353
 #, fuzzy
 msgid "Sunday"
 msgstr "В╕д╕слати"
 
-#: calendar/gui/prop.c:352
+#: calendar/gui/prop.c:354
 #, fuzzy
 msgid "Monday"
 msgstr "Т╕ло"
 
 #. Day range
-#: calendar/gui/prop.c:362
+#: calendar/gui/prop.c:364
 msgid "Day range"
 msgstr ""
 
-#: calendar/gui/prop.c:373
+#: calendar/gui/prop.c:375
 msgid ""
 "Please select the start and end hours you want\n"
 "to be displayed in the day view and week view.\n"
@@ -2897,113 +2405,118 @@ msgid ""
 "by default."
 msgstr ""
 
-#: calendar/gui/prop.c:389
+#: calendar/gui/prop.c:391
 msgid "Day start:"
 msgstr ""
 
-#: calendar/gui/prop.c:400
+#: calendar/gui/prop.c:402
 msgid "Day end:"
 msgstr ""
 
-#: calendar/gui/prop.c:523
+#: calendar/gui/prop.c:525
 msgid "Colors for display"
 msgstr ""
 
-#: calendar/gui/prop.c:526
+#: calendar/gui/prop.c:528
 msgid "Colors"
 msgstr ""
 
-#: calendar/gui/prop.c:603
+#: calendar/gui/prop.c:605
 msgid "Show on TODO List:"
 msgstr ""
 
 #: calendar/gui/prop.c:610
+#, fuzzy
+msgid "Due Date"
+msgstr "Дата"
+
+#: calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/prop.c:641
+#: calendar/gui/prop.c:643
 msgid "To Do List style options:"
 msgstr ""
 
-#: calendar/gui/prop.c:646
+#: calendar/gui/prop.c:648
 msgid "Highlight overdue items"
 msgstr ""
 
-#: calendar/gui/prop.c:649
+#: calendar/gui/prop.c:651
 msgid "Highlight not yet due items"
 msgstr ""
 
-#: calendar/gui/prop.c:652
+#: calendar/gui/prop.c:654
 msgid "Highlight items due today"
 msgstr ""
 
-#: calendar/gui/prop.c:682
+#: calendar/gui/prop.c:684
 msgid "To Do List Properties"
 msgstr ""
 
-#: calendar/gui/prop.c:685
+#: calendar/gui/prop.c:687
 msgid "To Do List"
 msgstr ""
 
-#: calendar/gui/prop.c:784
-msgid "Alarms"
+#: calendar/gui/prop.c:718
+msgid "Preferences"
 msgstr ""
 
 #. build miscellaneous box
-#: calendar/gui/prop.c:787
+#: calendar/gui/prop.c:789
 #, fuzzy
 msgid "Alarm Properties"
 msgstr "Властивост╕ долучення"
 
-#: calendar/gui/prop.c:797
+#: calendar/gui/prop.c:799
 msgid "Beep on display alarms"
 msgstr ""
 
-#: calendar/gui/prop.c:807
+#: calendar/gui/prop.c:809
 msgid "Audio alarms timeout after"
 msgstr ""
 
-#: calendar/gui/prop.c:818 calendar/gui/prop.c:835
+#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
 msgid " seconds"
 msgstr ""
 
-#: calendar/gui/prop.c:824
+#: calendar/gui/prop.c:826
 msgid "Enable snoozing for "
 msgstr ""
 
 #. populate default frame/box
-#: calendar/gui/prop.c:840
+#: calendar/gui/prop.c:842
 #, fuzzy
 msgid "Defaults"
 msgstr "Подробиц╕"
 
-#: composer/e-msg-composer-address-dialog.c:182
+#: composer/e-msg-composer-address-dialog.c:186
 msgid "Cut"
 msgstr "Вир╕зати"
 
-#: composer/e-msg-composer-address-dialog.c:183
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Cut selected item into clipboard"
 msgstr "Вир╕зати вибраний елемент в буфер обм╕ну"
 
-#: composer/e-msg-composer-address-dialog.c:186
+#: composer/e-msg-composer-address-dialog.c:190
 msgid "Copy"
 msgstr "Скоп╕ювати"
 
-#: composer/e-msg-composer-address-dialog.c:187
+#: composer/e-msg-composer-address-dialog.c:191
 msgid "Copy selected item into clipboard"
 msgstr "Скоп╕ювати вибраний елемент в буфер обм╕ну"
 
-#: composer/e-msg-composer-address-dialog.c:190
-#: composer/e-msg-composer-address-dialog.c:198
+#: composer/e-msg-composer-address-dialog.c:194
+#: composer/e-msg-composer-address-dialog.c:202
 msgid "Paste"
 msgstr "Вставити"
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
+#: composer/e-msg-composer-address-dialog.c:195
+#: composer/e-msg-composer-address-dialog.c:203
 msgid "Paste item from clipboard"
 msgstr "Вставити елемент з буферу обм╕ну"
 
-#: composer/e-msg-composer-address-dialog.c:525
+#: composer/e-msg-composer-address-dialog.c:529
 msgid "Select recipients' addresses"
 msgstr "Вибрати адреси адресат╕в"
 
@@ -3025,7 +2538,6 @@ msgid "Name"
 msgstr "╤м'я"
 
 #: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Адреса"
 
@@ -3033,6 +2545,10 @@ msgstr "Адреса"
 msgid "Properties..."
 msgstr "Властивост╕..."
 
+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Додати..."
+
 #: composer/e-msg-composer-address-dialog.glade.h:14
 msgid "To: >>"
 msgstr "До: >>"
@@ -3081,23 +2597,23 @@ msgstr "%.1fМ"
 msgid "%.1fG"
 msgstr "%.1fГ"
 
-#: composer/e-msg-composer-attachment-bar.c:299
+#: composer/e-msg-composer-attachment-bar.c:301
 msgid "Add attachment"
 msgstr "Долучити"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:364 shell/e-shortcuts-view.c:333
 msgid "Remove"
 msgstr "Видалити"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:365
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:396
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:397
 msgid "Attach a file to the message"
 msgstr "Долучити файл до пов╕домлення"
 
@@ -3118,41 +2634,41 @@ msgstr "Тип MIME:"
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
 #, fuzzy
 msgid "From:"
 msgstr "В╕д"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:244
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:297
 #, fuzzy
 msgid "Enter the identitiy you wish to send this message from"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:300
+#: composer/e-msg-composer-hdrs.c:301
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:302
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:307
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:312
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:313
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3160,422 +2676,449 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:320
 msgid "Enter the subject of the mail"
 msgstr "Введ╕ть тему послання"
 
-#: composer/e-msg-composer.c:451
+#: composer/e-msg-composer.c:468
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:462
+#: composer/e-msg-composer.c:479
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:482
+#: composer/e-msg-composer.c:499
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:504
+#: composer/e-msg-composer.c:521
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "В╕д╕слати пов╕домлення"
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:523
 #, fuzzy
 msgid "About to save changes to message..."
 msgstr "Долучити файл до пов╕домлення"
 
-#: composer/e-msg-composer.c:590 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:608 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:596
+#: composer/e-msg-composer.c:614
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:618
+#: composer/e-msg-composer.c:636
 msgid "Open file"
 msgstr "В╕дкрити файл"
 
-#: composer/e-msg-composer.c:730
+#: composer/e-msg-composer.c:755
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:740
+#: composer/e-msg-composer.c:765
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:750
+#: composer/e-msg-composer.c:775
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:760
+#: composer/e-msg-composer.c:785
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:807
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:803
+#: composer/e-msg-composer.c:828
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:899 shell/e-shell-view-menu.c:434
+#: composer/e-msg-composer.c:924
 msgid "_File"
 msgstr "Файл"
 
-#: composer/e-msg-composer.c:905
+#: composer/e-msg-composer.c:930
 msgid "_Open..."
 msgstr "В╕дкрити..."
 
-#: composer/e-msg-composer.c:906
+#: composer/e-msg-composer.c:931
 msgid "Load a previously saved message"
 msgstr ""
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:939
 msgid "_Save..."
 msgstr "Зберегти..."
 
-#: composer/e-msg-composer.c:915
+#: composer/e-msg-composer.c:940
 #, fuzzy
 msgid "Save message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:948
 #, fuzzy
 msgid "_Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:949
 #, fuzzy
 msgid "Save message with a different name"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: composer/e-msg-composer.c:932
+#: composer/e-msg-composer.c:957
 msgid "Save in _folder..."
 msgstr "Зберегти у тец╕..."
 
-#: composer/e-msg-composer.c:933
+#: composer/e-msg-composer.c:958
 msgid "Save the message in a specified folder"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: composer/e-msg-composer.c:942
+#: composer/e-msg-composer.c:967
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: composer/e-msg-composer.c:943
+#: composer/e-msg-composer.c:968
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Долучити файл до пов╕домлення"
 
-#: composer/e-msg-composer.c:952
+#: composer/e-msg-composer.c:977
 #, fuzzy
-msgid "_Send"
+msgid "Send _Now"
 msgstr "В╕д╕слати"
 
-#: composer/e-msg-composer.c:953
-msgid "Send the message"
+#: composer/e-msg-composer.c:978
+#, fuzzy
+msgid "Send the message now"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: composer/e-msg-composer.c:986
+#, fuzzy
+msgid "Send _Later"
+msgstr "Дата"
+
+#: composer/e-msg-composer.c:987
+#, fuzzy
+msgid "Send the message later"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: composer/e-msg-composer.c:963
+#: composer/e-msg-composer.c:997
 msgid "_Close..."
 msgstr "Закрити..."
 
-#: composer/e-msg-composer.c:964
+#: composer/e-msg-composer.c:998
 msgid "Quit the message composer"
 msgstr ""
 
-#: composer/e-msg-composer.c:977 shell/e-shell-view-menu.c:478
+#: composer/e-msg-composer.c:1011
 #, fuzzy
 msgid "_Edit"
 msgstr "Додати..."
 
-#: composer/e-msg-composer.c:988
-msgid "_Format"
-msgstr "Формат"
-
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:1028
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1029
 msgid "Send the mail in HTML format"
 msgstr "В╕д╕слати кореспонденц╕ю в формат╕ HTML"
 
-#: composer/e-msg-composer.c:1008 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:242
+#: composer/e-msg-composer.c:1042 shell/e-storage-set-view.c:223
 #, fuzzy
 msgid "_View"
 msgstr "Новий"
 
-#: composer/e-msg-composer.c:1014
+#: composer/e-msg-composer.c:1048
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Показати долучення"
 
-#: composer/e-msg-composer.c:1015
+#: composer/e-msg-composer.c:1049
 #, fuzzy
 msgid "Show/hide attachments"
 msgstr "Показати/прибрати долучення"
 
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1082
 msgid "Send"
 msgstr "В╕д╕слати"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1083
 msgid "Send this message"
 msgstr "В╕д╕слати це пов╕домлення"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1092
 msgid "Attach"
 msgstr "Долучити"
 
-#: composer/e-msg-composer.c:1059
+#: composer/e-msg-composer.c:1093
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer.c:1246
+#: composer/e-msg-composer.c:1280
 #, fuzzy
 msgid "Compose a message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: filter/filter-folder.c:183 filter/vfolder-rule.c:269
+#: filter/filter-datespec.c:61
 #, fuzzy
-msgid "Select Folder"
-msgstr "Вибрати назви"
+msgid "years"
+msgstr "Заголовок"
 
-#: filter/filter-folder.c:245
-msgid "<click here to select a folder>"
-msgstr ""
+#: filter/filter-datespec.c:62
+#, fuzzy
+msgid "months"
+msgstr "Шрифти"
 
-#: mail/component-factory.c:187
+#: filter/filter-datespec.c:63
 #, fuzzy
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+msgid "weeks"
+msgstr "Тиждень"
 
-#: mail/folder-browser-factory.c:33
-msgid "Get mail"
-msgstr ""
+#: filter/filter-datespec.c:64
+#, fuzzy
+msgid "days"
+msgstr "Т╕ло"
 
-#: mail/folder-browser-factory.c:33
-msgid "Check for new mail"
+#: filter/filter-datespec.c:65
+msgid "hours"
 msgstr ""
 
-#: mail/folder-browser-factory.c:34
-msgid "Compose"
+#: filter/filter-datespec.c:66
+msgid "minutes"
 msgstr ""
 
-#: mail/folder-browser-factory.c:34
+#: filter/filter-datespec.c:67
 #, fuzzy
-msgid "Compose a new message"
-msgstr "П╕дготувати нове поштове пов╕домлення"
-
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
-msgid "Reply"
-msgstr "В╕дпов╕сти"
+msgid "seconds"
+msgstr "В╕д╕слати"
 
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:135
-msgid "Reply to the sender of this message"
+#: filter/filter-datespec.c:232
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
 msgstr ""
 
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
-msgid "Reply to All"
-msgstr "В╕дпов╕сти вс╕м"
-
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:138
-msgid "Reply to all recipients of this message"
+#: filter/filter-datespec.c:254
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
 msgstr ""
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
-msgid "Forward"
-msgstr "Переслати"
+#: filter/filter-datespec.c:293
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:141
-msgid "Forward this message"
-msgstr "Переслати це пов╕домлення"
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:328
+msgid "the current time"
+msgstr ""
 
-#: mail/folder-browser-factory.c:45
-#, fuzzy
-msgid "Move"
-msgstr "Моб╕льний"
+#: filter/filter-datespec.c:328
+msgid "a time you specify"
+msgstr ""
 
-#: mail/folder-browser-factory.c:45
-#, fuzzy
-msgid "Move message to a new folder"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+#: filter/filter-datespec.c:329
+msgid "a time relative to the current time"
+msgstr ""
 
-#: mail/folder-browser-factory.c:47 mail/mail-view.c:145
-msgid "Print the selected message"
-msgstr "Надрукувати вибране пов╕домлення"
+#. The label
+#: filter/filter-datespec.c:387
+msgid "Compare against"
+msgstr ""
 
-#: mail/folder-browser-factory.c:49 mail/mail-view.c:147
-msgid "Delete this message"
-msgstr "Стерти це пов╕домлення"
+#: filter/filter-datespec.c:661
+msgid "<click here to select a date>"
+msgstr ""
 
-#: mail/folder-browser-factory.c:73
-msgid "_Threaded Message List"
+#: filter/filter-editor.c:157 filter/score-editor.c:127
+#: filter/vfolder-editor.c:153
+msgid "Add Rule"
 msgstr ""
 
-#: mail/folder-browser-factory.c:83
+#: filter/filter-editor.c:191
 #, fuzzy
-msgid "_Print message"
-msgstr "В╕д╕слати пов╕домлення"
+msgid "Edit Rule"
+msgstr "Редагування"
 
-#: mail/folder-browser-factory.c:91
+#: filter/filter-filter.c:401 filter/filter-rule.c:539
+msgid "Less"
+msgstr ""
+
+#: filter/filter-filter.c:404 filter/filter-rule.c:542
 #, fuzzy
-msgid "E_dit Message"
-msgstr "В╕д╕слати пов╕домлення"
+msgid "More"
+msgstr "Моб╕льний"
 
-#: mail/folder-browser-factory.c:98
+#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
 #, fuzzy
-msgid "_View Message"
-msgstr "В╕д╕слати пов╕домлення"
+msgid "Select Folder"
+msgstr "Вибрати назви"
 
-#: mail/folder-browser-factory.c:107
-msgid "_Mark all messages seen"
+#: filter/filter-folder.c:209
+msgid "Enter folder URI"
 msgstr ""
 
-#: mail/folder-browser-factory.c:111
-msgid "_Expunge"
+#: filter/filter-folder.c:253
+msgid "<click here to select a folder>"
 msgstr ""
 
-#: mail/folder-browser-factory.c:117
-#, fuzzy
-msgid "Mail _Filters ..."
-msgstr "Файл..."
-
-#: mail/folder-browser-factory.c:123
-msgid "_vFolder Editor ..."
+#: filter/filter-part.c:420
+msgid "Test"
 msgstr ""
 
-#: mail/folder-browser-factory.c:129
-msgid "_Mail Configuration ..."
+#: filter/score-editor.c:165
+msgid "Edit Score Rule"
 msgstr ""
 
-#: mail/folder-browser-factory.c:135
-msgid "Forget _Passwords"
+#: filter/vfolder-editor.c:192
+msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/folder-browser-factory.c:142
-msgid "_Configure Folder"
-msgstr ""
+#: mail/component-factory.c:198
+#, fuzzy
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: mail/folder-browser.c:349
-msgid "Search"
-msgstr "Пошук"
+#: mail/folder-browser-factory.c:50
+#, c-format
+msgid "Run filter \"%s\""
+msgstr ""
 
-#: mail/folder-browser.c:352
+#: mail/folder-browser.c:407
 msgid "Save"
 msgstr "Зберегти"
 
-#: mail/mail-callbacks.c:134
+#: mail/mail-callbacks.c:84
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"You need to configure the mail client\n"
+"before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:166
+#: mail/mail-callbacks.c:97
 msgid ""
 "You need to configure an identity\n"
-"before you can send mail."
+"before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:182
+#: mail/mail-callbacks.c:111
 msgid ""
 "You need to configure a mail transport\n"
-"before you can send mail."
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+msgid ""
+"This message has no subject.\n"
+"Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:477
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:430
+#: mail/mail-callbacks.c:479
+#, fuzzy
+msgid "Copy message(s) to"
+msgstr "В╕д╕слан╕ пов╕домлення"
+
+#: mail/mail-callbacks.c:548
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:518
+#: mail/mail-callbacks.c:639
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-config-gui.c:430
+#: mail/mail-config-gui.c:435
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:443
+#: mail/mail-config-gui.c:448
 msgid "Full name:"
 msgstr "Повна назва:"
 
-#: mail/mail-config-gui.c:467
+#: mail/mail-config-gui.c:472
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config-gui.c:482
+#: mail/mail-config-gui.c:487
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я:"
 
-#: mail/mail-config-gui.c:493
+#: mail/mail-config-gui.c:498
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config-gui.c:498 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:503
 msgid "Signature File"
 msgstr "Файл п╕дпису"
 
-#: mail/mail-config-gui.c:897
+#: mail/mail-config-gui.c:927
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config-gui.c:903
+#: mail/mail-config-gui.c:933
+#, fuzzy
+msgid "Port:"
+msgstr "Приор╕тет"
+
+#: mail/mail-config-gui.c:947
+msgid "Use default port"
+msgstr ""
+
+#: mail/mail-config-gui.c:961
 msgid "Username:"
 msgstr "Назва користувача:"
 
-#: mail/mail-config-gui.c:909
+#: mail/mail-config-gui.c:967
 msgid "Path:"
 msgstr "Шлях:"
 
-#: mail/mail-config-gui.c:917
+#: mail/mail-config-gui.c:976
 msgid "Authentication:"
 msgstr "Аутенф╕кац╕я:"
 
-#: mail/mail-config-gui.c:929
+#: mail/mail-config-gui.c:988
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config-gui.c:952
+#: mail/mail-config-gui.c:1015
 msgid "Don't delete messages from server"
 msgstr ""
 
-#: mail/mail-config-gui.c:964
+#: mail/mail-config-gui.c:1027
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config-gui.c:1094 mail/mail-config-gui.c:1142
+#: mail/mail-config-gui.c:1159 mail/mail-config-gui.c:1207
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3584,7 +3127,7 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1118
+#: mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3593,194 +3136,580 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1192
-msgid "Edit Identity"
+#: mail/mail-config-gui.c:1202
+msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1194
+#: mail/mail-config-gui.c:1257
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1288
-msgid "Edit Source"
+#: mail/mail-config-gui.c:1259
+msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1290
+#: mail/mail-config-gui.c:1351
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1387
-msgid "Edit News Server"
+#: mail/mail-config-gui.c:1353
+msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1389
+#: mail/mail-config-gui.c:1448
 msgid "Add News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:2217
+#: mail/mail-config-gui.c:1450
+msgid "Edit News Server"
+msgstr ""
+
+#: mail/mail-config-gui.c:2321
 msgid "The connection was successful!"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
+#: mail/mail-config-gui.c:2371
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Ор╕╓нтац╕я"
+#: mail/mail-config-gui.c:2373
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Редагування"
+#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
+
+#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+msgid "No password provided."
+msgstr ""
+
+#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/mail-crypto.c:600
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/mail-local.c:257
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-ops.c:75
+#, c-format
+msgid "Fetching email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:77
+#, c-format
+msgid "Fetch email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:88
+msgid "You have no remote mail source configured to fetch mail from."
+msgstr ""
+
+#: mail/mail-ops.c:98
+msgid "Bad folder passed to fetch_mail"
+msgstr ""
+
+#: mail/mail-ops.c:269
+#, c-format
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:333
+msgid "Filtering email on demand"
+msgstr ""
 
-#: mail/mail-config.glade.h:15
-msgid "Sources"
+#: mail/mail-ops.c:335
+msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Mail Sources"
+#: mail/mail-ops.c:346
+msgid "Bad filter context specified"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
+#: mail/mail-ops.c:355
+msgid "Bad input source defined for filtering"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-ops.c:364
+msgid "Bad default destination folder"
+msgstr ""
+
+#: mail/mail-ops.c:517
+#, c-format
+msgid "Sending \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:522
+msgid "Sending a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:525
+#, fuzzy, c-format
+msgid "Send \"%s\""
+msgstr "В╕д╕слати"
+
+#: mail/mail-ops.c:528
 #, fuzzy
-msgid "News Servers"
-msgstr "Сервер LDAP:"
+msgid "Send a message without a subject"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-config.glade.h:25
-msgid "News Sources"
+#: mail/mail-ops.c:709
+msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
-msgid "Send messages in HTML format"
+#: mail/mail-ops.c:711
+msgid "Send queue"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
+#: mail/mail-ops.c:865 mail/mail-ops.c:872
+#, c-format
+msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
+#: mail/mail-ops.c:869 mail/mail-ops.c:875
+msgid "Appending a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:970
+#, c-format
+msgid "Expunging \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:972
+#, c-format
+msgid "Expunge \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1044
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1046
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1049
+#, fuzzy, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr "В╕д╕слан╕ пов╕домлення"
+
+#: mail/mail-ops.c:1051
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1109
+#, fuzzy
+msgid "Moving"
+msgstr "Моб╕льний"
+
+#: mail/mail-ops.c:1112
+#, fuzzy
+msgid "Copying"
+msgstr "Скоп╕ювати"
+
+#: mail/mail-ops.c:1124
+#, c-format
+msgid "%s message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-ops.c:1205
+#, fuzzy, c-format
+msgid "Marking messages in folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:1208
+#, fuzzy, c-format
+msgid "Mark messages in folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:1367
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1370
+#, c-format
+msgid "Scan folders in \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1425
+#, c-format
+msgid "Found subfolder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1459
+#, fuzzy
+msgid "(No description)"
+msgstr "Опис:"
+
+#: mail/mail-ops.c:1522
+#, c-format
+msgid "Attaching messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1525
+#, c-format
+msgid "Attach messages from \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1651
+#, fuzzy, c-format
+msgid "Forwarding messages \"%s\""
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-ops.c:1656
+msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
+#: mail/mail-ops.c:1659
+#, fuzzy, c-format
+msgid "Forward message \"%s\""
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-ops.c:1664
+msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
+#: mail/mail-ops.c:1718
+#, c-format
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:17
+#: mail/mail-ops.c:1731
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-crypto.c:338 mail/mail-crypto.c:418
-msgid "Please enter your PGP/GPG passphrase."
+#: mail/mail-ops.c:1820
+#, c-format
+msgid "Loading \"%s\""
 msgstr ""
 
-#: mail/mail-crypto.c:342 mail/mail-crypto.c:422
-msgid "No password provided."
+#: mail/mail-ops.c:1822
+#, c-format
+msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:428
+#: mail/mail-ops.c:1942
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-local.c:256
+#: mail/mail-ops.c:1944
 #, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
+msgid "Create \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2015
+msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-local.c:260
+#: mail/mail-ops.c:2068
 #, c-format
-msgid "Change folder \"%s\" to \"%s\" format"
+msgid "Synchronizing \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2070
+#, c-format
+msgid "Synchronize \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2146
+#, c-format
+msgid "Displaying message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2149
+msgid "Clearing message display"
+msgstr ""
+
+#: mail/mail-ops.c:2152
+#, c-format
+msgid "Display message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2155
+msgid "Clear message display"
+msgstr ""
+
+#: mail/mail-ops.c:2282
+#, c-format
+msgid "Opening messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2285
+#, fuzzy, c-format
+msgid "Open messages from \"%s\""
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/mail-ops.c:2406
+#, c-format
+msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-threads.c:669
+#: mail/mail-ops.c:2408
+#, c-format
+msgid "Load %s Folder"
+msgstr ""
+
+#: mail/mail-ops.c:2483
+#, c-format
+msgid "Viewing messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2486
+#, fuzzy, c-format
+msgid "View messages from \"%s\""
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/mail-ops.c:2532
+#, c-format
+msgid "Retrieving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-threads.c:274
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:623
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:676
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:673
+#: mail/mail-threads.c:680
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:738
+#: mail/mail-threads.c:745
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:846
+#: mail/mail-threads.c:856
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:857
+#: mail/mail-threads.c:865
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/message-list.c:489
+#: mail/mail-tools.c:206
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#: mail/mail-tools.c:294
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#: mail/mail-tools.c:387
+#, c-format
+msgid "[%s] %s"
+msgstr ""
+
+#: mail/mail-tools.c:389
+#, fuzzy, c-format
+msgid "[%s] (forwarded message)"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-tools.c:398
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:435
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-tools.c:437
+#, fuzzy
+msgid "Forwarded message (no subject)"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-tools.c:545
+#, c-format
+msgid "Don't know protocol to open URI `%s'"
+msgstr ""
+
+#: mail/mail-tools.c:574
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-vfolder.c:302
+#, fuzzy
+msgid "New VFolder"
+msgstr "Вибрати назви"
+
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/mail-view.c:148
+msgid "Reply"
+msgstr "В╕дпов╕сти"
+
+#: mail/mail-view.c:148
+msgid "Reply to the sender of this message"
+msgstr ""
+
+#: mail/mail-view.c:151 mail/message-list.c:1240
+msgid "Reply to All"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: mail/mail-view.c:151
+msgid "Reply to all recipients of this message"
+msgstr ""
+
+#: mail/mail-view.c:154
+msgid "Forward"
+msgstr "Переслати"
+
+#: mail/mail-view.c:154
+msgid "Forward this message"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/mail-view.c:158
+msgid "Print"
+msgstr "Друкувати"
+
+#: mail/mail-view.c:158
+msgid "Print the selected message"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: mail/mail-view.c:160
+msgid "Delete this message"
+msgstr "Стерти це пов╕домлення"
+
+#: mail/message-list.c:645
 msgid "Online Status"
 msgstr "Стан на л╕н╕╖"
 
-#: mail/message-list.c:525
+#: mail/message-list.c:681
 msgid "From"
 msgstr "В╕д"
 
-#: mail/message-list.c:532
+#: mail/message-list.c:688
 msgid "Subject"
 msgstr "Тема"
 
-#: mail/message-list.c:539
+#: mail/message-list.c:695
 msgid "Date"
 msgstr "Дата"
 
-#: mail/message-list.c:546
+#: mail/message-list.c:702
 msgid "Received"
 msgstr "Отримано"
 
-#: mail/message-list.c:553
+#: mail/message-list.c:709
 msgid "To"
 msgstr "До"
 
-#: mail/message-list.c:560
+#: mail/message-list.c:716
 msgid "Size"
 msgstr "Розм╕р"
 
-#: notes/component-factory.c:27
+#: mail/message-list.c:1235
+msgid "Open in New Window"
+msgstr ""
+
+#: mail/message-list.c:1236
 #, fuzzy
-msgid "Create a new note"
-msgstr "Створити новий календар"
+msgid "Edit Message"
+msgstr "В╕д╕слати пов╕домлення"
 
-#: notes/component-factory.c:148
+#: mail/message-list.c:1237
 #, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+msgid "Print Message"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/message-list.c:1239
+#, fuzzy
+msgid "Reply to Sender"
+msgstr "В╕дпов╕сти вс╕м"
 
-#: notes/main.c:30
+#: mail/message-list.c:1241
 #, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Поштовий компонент: не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+msgid "Forward Message"
+msgstr "Переслати це пов╕домлення"
+
+#: mail/message-list.c:1243
+#, fuzzy
+msgid "Delete Message"
+msgstr "Стерти це пов╕домлення"
+
+#: mail/message-list.c:1244
+#, fuzzy
+msgid "Move Message"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: mail/message-list.c:1245
+#, fuzzy
+msgid "Copy Message"
+msgstr "П╕дготувати нове поштове пов╕домлення"
+
+#: mail/message-list.c:1247
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/message-list.c:1248
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/message-list.c:1249
+#, fuzzy
+msgid "VFolder on Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: mail/message-list.c:1251
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/message-list.c:1252
+#, fuzzy
+msgid "Filter on Sender"
+msgstr "Файлу не знайдено"
+
+#: mail/message-list.c:1253
+#, fuzzy
+msgid "Filter on Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: mail/message-list.c:1254 mail/message-list.c:1277
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/message-list.c:1279
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
 #: shell/e-setup.c:47
 msgid "Evolution installation"
@@ -3829,7 +3758,7 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:81
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -3838,11 +3767,11 @@ msgstr ""
 "Неможливо створити вказану теку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:133
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:223
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -3852,174 +3781,61 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:274
 #, fuzzy
 msgid "New..."
 msgstr "Новий"
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
 msgid "(Untitled)"
 msgstr ""
 
 #. you might have to call gnome_dialog_run() on the
 #. * dialog returned here, I don't remember...
 #.
-#: shell/e-shell-view-menu.c:113
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
 #. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:168
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:170
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:325
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "Новий"
-
-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "Фолдер"
-
-#: shell/e-shell-view-menu.c:395
-#, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Л╕н╕йка ярлик╕в Evolution"
-
-#: shell/e-shell-view-menu.c:404
-#, fuzzy
-msgid "_Mail message (FIXME)"
-msgstr "В╕д╕слати пов╕домлення"
-
-#: shell/e-shell-view-menu.c:410
-#, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
-
-#: shell/e-shell-view-menu.c:416
-#, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Контакт"
-
-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:444
-#, fuzzy
-msgid "_Go to folder..."
-msgstr "Перейти на теку..."
-
-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:452
-#, fuzzy
-msgid "_Create new folder..."
-msgstr "Зберегти у тец╕..."
-
-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-#, fuzzy
-msgid "Create a new folder"
-msgstr "Створити новий календар"
-
-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "Вийти..."
-
-#: shell/e-shell-view-menu.c:495
-msgid "Show _shortcut bar"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:501
-msgid "Show _folder bar"
-msgstr "Показувати панель тек"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "Показувати панель тек"
-
-#: shell/e-shell-view-menu.c:524
-msgid "_Actions"
-msgstr "Д╕╖"
-
-#: shell/e-shell-view-menu.c:535
-msgid "_Help"
-msgstr "Дов╕дка"
-
-#: shell/e-shell-view-menu.c:541
-msgid "Help _index"
-msgstr "Покажчик дов╕дки"
-
-#: shell/e-shell-view-menu.c:548
-#, fuzzy
-msgid "Getting _started"
-msgstr "Час початку зустр╕ч╕:"
-
-#: shell/e-shell-view-menu.c:555
-msgid "Using the _mailer"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:562
-#, fuzzy
-msgid "Using the _calendar"
-msgstr "Надрукувати цей календар"
-
-#: shell/e-shell-view-menu.c:569
-msgid "Using the c_ontact manager"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:579
-msgid "_Submit bug report"
-msgstr "П╕дготувати зв╕т про помилку"
-
-#: shell/e-shell-view-menu.c:580
-#, fuzzy
-msgid "Submit bug report using Bug Buddy"
-msgstr "П╕дготувати зв╕т про помилку в bug-buddy"
-
-#: shell/e-shell-view-menu.c:589
-msgid "_About Evolution..."
-msgstr "Про Evolution..."
-
-#: shell/e-shell-view-menu.c:590
-msgid "Show information about Evolution"
-msgstr "Показати ╕нформац╕ю про Evolution"
-
-#: shell/e-shell-view.c:122
+#: shell/e-shell-view.c:127
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:350
+#: shell/e-shell-view.c:406
 msgid "Folders"
 msgstr "Теки"
 
-#: shell/e-shell-view.c:869
+#: shell/e-shell-view.c:995
+#, fuzzy
+msgid "None"
+msgstr "Нотатка"
+
+#: shell/e-shell-view.c:999
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:293
+#: shell/e-shell.c:315
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
@@ -4056,64 +3872,64 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:217
+#: shell/e-storage.c:127
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:412
+#: shell/e-storage.c:318
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:414
+#: shell/e-storage.c:320
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:416
+#: shell/e-storage.c:322
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:418
+#: shell/e-storage.c:324
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:420
+#: shell/e-storage.c:326
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:422
+#: shell/e-storage.c:328
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:424
+#: shell/e-storage.c:330
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:426
+#: shell/e-storage.c:332
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:428
+#: shell/e-storage.c:334
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:430
+#: shell/e-storage.c:336
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:432
+#: shell/e-storage.c:338
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:434
+#: shell/e-storage.c:340
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
-#: shell/e-storage-set-view.c:242
+#: shell/e-storage-set-view.c:223
 #, fuzzy
 msgid "View the selected folder"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: shell/main.c:66
+#: shell/main.c:68
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4135,40 +3951,20 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:93
+#: shell/main.c:95
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:121
+#: shell/main.c:123
 msgid "Cannot initialize the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:156
+#: shell/main.c:160
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
-msgstr ""
-
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
-msgstr ""
-
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
-msgstr ""
-
-#: tests/ui-tests/message-browser.c:710
-#, fuzzy
-msgid "Open Mime Message"
-msgstr "В╕д╕слати пов╕домлення"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -4359,7 +4155,7 @@ msgstr ""
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:281
+#: widgets/misc/e-calendar-item.c:422
 msgid "MTWTFSS"
 msgstr "ПВСЧПСН"