Updated russian translation.

svn path=/trunk/; revision=5614

2 files changed, 593 insertions, 697 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 90f1266d18..89d3fcfde6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-28  Valek Filippov  <frob@df.ru>
+
+	* ru.po: updated russian translation.
+
 2000-09-27  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/ru.po b/po/ru.po
index 8a906b320e..6232ae4313 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-09-20 16:31+0400\n"
-"PO-Revision-Date: 2000-09-20 18:31+04:00\n"
+"POT-Creation-Date: 2000-09-28 15:27+0400\n"
+"PO-Revision-Date: 2000-09-28 15:31+04:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8-bit\n"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1215
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1172 calendar/gui/main.c:55
+#: calendar/conduits/todo/todo-conduit.c:1173 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -170,468 +170,96 @@ msgstr "Элементы принадлежащие этим категориям:"
 msgid "Available Categories:"
 msgstr "Доступные категории:"
 
-#: addressbook/contact-editor/e-contact-editor.c:706
-#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1155
-msgid "FIXME: _Appointment"
-msgstr "FIXME: Встреча"
-
-#: addressbook/contact-editor/e-contact-editor.c:707
-#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1156
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: Запрос встречи"
-
-#: addressbook/contact-editor/e-contact-editor.c:709
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1158
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: Почтовое сообщение"
-
-#: addressbook/contact-editor/e-contact-editor.c:710
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1159
-msgid "FIXME: _Contact"
-msgstr "FIXME: Контакт"
-
-#: addressbook/contact-editor/e-contact-editor.c:711
-#: calendar/gui/dialogs/task-editor.c:427
-#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1160
-msgid "FIXME: _Task"
-msgstr "FIXME: Задание"
-
-#: addressbook/contact-editor/e-contact-editor.c:712
-#: 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 "FIXME: Запрос задания"
-
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1162
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: Журнальная запись"
-
-#: addressbook/contact-editor/e-contact-editor.c:714
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1163
-msgid "FIXME: _Note"
-msgstr "FIXME: Заметка"
-
-#: addressbook/contact-editor/e-contact-editor.c:716
-#: addressbook/contact-editor/e-contact-editor.c:821
-#: 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 "FIXME: Выбрать из..."
-
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1170
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: Стиль памятки"
-
-#: addressbook/contact-editor/e-contact-editor.c:723
-#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1172
-msgid "FIXME: Define Print _Styles..."
-msgstr "FIXME: Определить стили печати..."
-
-#: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1179
-msgid "FIXME: S_end"
-msgstr "FIXME: Отправить"
-
-#: addressbook/contact-editor/e-contact-editor.c:734
-#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1183
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Сохранить вложения..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:736
-#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1185
-msgid "_Delete"
-msgstr "Удалить"
-
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1187
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: Переместить в папку..."
-
-#: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1188
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Скопировать в папку..."
-
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: 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:741
-#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1191
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Просмотр печати"
-
-#: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1212
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: Специальная вставка..."
-
-#: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1217
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Пометить как непрочтенное"
-
-#: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1221
-msgid "_Object"
-msgstr "Объект"
-
-#: addressbook/contact-editor/e-contact-editor.c:776
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: 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 "FIXME: Элемент"
-
-#: addressbook/contact-editor/e-contact-editor.c:777
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: 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 "FIXME: Непрочтенный элемент"
-
-#: addressbook/contact-editor/e-contact-editor.c:778
-#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1228
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: Первый элемент в папке"
-
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1235
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: Последний элемент в папке"
-
-#: addressbook/contact-editor/e-contact-editor.c:790
-#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1240
-msgid "FIXME: _Standard"
-msgstr "FIXME: Стандарт"
-
-#: addressbook/contact-editor/e-contact-editor.c:792
-#: calendar/gui/dialogs/task-editor.c:518 calendar/gui/event-editor.c:1242
-msgid "FIXME: __Formatting"
-msgstr "FIXME: Форматирование"
-
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1245
-msgid "FIXME: _Customize..."
-msgstr "FIXME: Настройка..."
-
-#: addressbook/contact-editor/e-contact-editor.c:800
-#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1250
-msgid "Pre_vious"
-msgstr "Пред."
-
-#: addressbook/contact-editor/e-contact-editor.c:801
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1251
-msgid "Ne_xt"
-msgstr "След."
-
-#: addressbook/contact-editor/e-contact-editor.c:803
-#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1255
-msgid "_Toolbars"
-msgstr "Панели инструментов"
-
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1260
-msgid "FIXME: _File..."
-msgstr "FIXME: Файл..."
-
-#: addressbook/contact-editor/e-contact-editor.c:809
-#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1261
-msgid "FIXME: It_em..."
-msgstr "FIXME: Элемент..."
-
-#: addressbook/contact-editor/e-contact-editor.c:810
-#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1262
-msgid "FIXME: _Object..."
-msgstr "FIXME: Объект..."
-
-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1267
-msgid "FIXME: _Font..."
-msgstr "FIXME: Шрифт..."
-
-#: addressbook/contact-editor/e-contact-editor.c:816
-#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1268
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: Параграф..."
-
-#: addressbook/contact-editor/e-contact-editor.c:823
-#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1275
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Конструкция этой формы"
-
-#: addressbook/contact-editor/e-contact-editor.c:824
-#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1276
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: Создать форму..."
-
-#: addressbook/contact-editor/e-contact-editor.c:826
-#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1278
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Опубликовать форму..."
-
-#: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1279
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: Опубликовать форму как..."
-
-#: addressbook/contact-editor/e-contact-editor.c:829
-#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1281
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Отладчик скрипта"
-
-#: addressbook/contact-editor/e-contact-editor.c:834
-#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1286
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: Проверка правописания..."
-
-#: addressbook/contact-editor/e-contact-editor.c:836
-#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1291
-msgid "_Forms"
-msgstr "Формы"
-
-#: addressbook/contact-editor/e-contact-editor.c:841
-msgid "FIXME: _New Contact"
-msgstr "FIXME: Новый контакт"
-
-#: addressbook/contact-editor/e-contact-editor.c:842
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: Новый контакт в той же компании"
-
-#: addressbook/contact-editor/e-contact-editor.c:844
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: Новое письмо для контакта"
-
-#: addressbook/contact-editor/e-contact-editor.c:845
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: Новое сообщение для контакта"
-
-#: addressbook/contact-editor/e-contact-editor.c:846
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Новая встреча с контактом"
-
-#: addressbook/contact-editor/e-contact-editor.c:847
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: План встречи..."
-
-#: addressbook/contact-editor/e-contact-editor.c:848
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: Новая задача для контакта"
-
-#: addressbook/contact-editor/e-contact-editor.c:849
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: Новая журнальная запись для контакта"
-
-#: addressbook/contact-editor/e-contact-editor.c:851
-msgid "FIXME: _Flag for Follow Up..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:852
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: Отобразить карту адресов"
-
-#: addressbook/contact-editor/e-contact-editor.c:853
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: Открыть Web-страницу"
-
-#: addressbook/contact-editor/e-contact-editor.c:855
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: Переслать как vCard"
-
-#: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1304
-msgid "FIXME: For_ward"
-msgstr "FIXME: Переслать"
-
-#: addressbook/contact-editor/e-contact-editor.c:868
-#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1317
-msgid "_Insert"
-msgstr "Вставить"
-
-#: addressbook/contact-editor/e-contact-editor.c:869
-#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1318
-#: composer/e-msg-composer.c:1005
-msgid "F_ormat"
-msgstr "Формат"
-
-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1319
-msgid "_Tools"
-msgstr "Инструменты"
-
-#: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1320
-msgid "Actio_ns"
-msgstr "Действия"
-
-#: addressbook/contact-editor/e-contact-editor.c:902
-#: 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:903
-msgid "Save the appointment and close the dialog box"
-msgstr "Сохранить встречу и закрыть окно диалога"
-
-#: addressbook/contact-editor/e-contact-editor.c:907
-msgid "Print..."
-msgstr "Печать..."
-
-#: addressbook/contact-editor/e-contact-editor.c:908
-#: 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:911
-#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1368
-msgid "FIXME: Insert File..."
-msgstr "FIXME: Вставить файл..."
-
-#: addressbook/contact-editor/e-contact-editor.c:912
-#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1369
-msgid "Insert a file as an attachment"
-msgstr "Вставить файл как вложение"
-
-#: addressbook/contact-editor/e-contact-editor.c:915
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
-#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1350 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163
-msgid "Delete"
-msgstr "Удалить"
-
-#: addressbook/contact-editor/e-contact-editor.c:916
-msgid "Delete this item"
-msgstr "Удалить этот элемент"
-
-#: addressbook/contact-editor/e-contact-editor.c:920
-#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1379
-msgid "FIXME: Previous"
-msgstr "FIXME: Пред."
-
-#: addressbook/contact-editor/e-contact-editor.c:921
-#: 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:923
-#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1382
-msgid "FIXME: Next"
-msgstr "FIXME: След."
-
-#: addressbook/contact-editor/e-contact-editor.c:924
-#: 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:927
-#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1385
-msgid "FIXME: Help"
-msgstr "FIXME: Справка"
-
-#: addressbook/contact-editor/e-contact-editor.c:928
-#: 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:1419
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1420
-#: addressbook/contact-editor/e-contact-editor.c:1524
+#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1323
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor.c:1421
+#: addressbook/contact-editor/e-contact-editor.c:1220
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1422
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1423
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1424
+#: addressbook/contact-editor/e-contact-editor.c:1223
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/contact-editor/e-contact-editor.c:1425
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/contact-editor/e-contact-editor.c:1426
-#: addressbook/contact-editor/e-contact-editor.c:1525
+#: addressbook/contact-editor/e-contact-editor.c:1225
+#: addressbook/contact-editor/e-contact-editor.c:1324
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1427
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1428
+#: addressbook/contact-editor/e-contact-editor.c:1227
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1429
+#: addressbook/contact-editor/e-contact-editor.c:1228
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1430
+#: addressbook/contact-editor/e-contact-editor.c:1229
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor.c:1431
-#: addressbook/contact-editor/e-contact-editor.c:1526
+#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1325
 #: mail/mail-config.glade.h:28
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/contact-editor/e-contact-editor.c:1432
+#: addressbook/contact-editor/e-contact-editor.c:1231
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1433
+#: addressbook/contact-editor/e-contact-editor.c:1232
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1434
+#: addressbook/contact-editor/e-contact-editor.c:1233
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/contact-editor/e-contact-editor.c:1435
+#: addressbook/contact-editor/e-contact-editor.c:1234
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/contact-editor/e-contact-editor.c:1436
+#: addressbook/contact-editor/e-contact-editor.c:1235
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1437
+#: addressbook/contact-editor/e-contact-editor.c:1236
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1481
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Primary Email"
 msgstr "Первый эл.адрес"
 
-#: addressbook/contact-editor/e-contact-editor.c:1482
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1483
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
@@ -661,6 +289,11 @@ msgstr "Удалить контакт?"
 msgid "_Add"
 msgstr "Добавить"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1200
+msgid "_Delete"
+msgstr "Удалить"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Тип телефона"
@@ -725,7 +358,7 @@ msgid "C_ontacts..."
 msgstr "Контакты..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "Ca_tegories..."
 msgstr "Категории..."
 
@@ -787,7 +420,7 @@ msgid "No_tes:"
 msgstr "Заметки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
 msgid "Details"
 msgstr "Детали"
 
@@ -897,15 +530,11 @@ msgstr "Фамилия:"
 msgid "_Suffix:"
 msgstr "Суффикс:"
 
-#: addressbook/gui/component/addressbook.c:345
-msgid "N_ew Directory Server"
-msgstr "Новый сервер каталогов"
-
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:426
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:431
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -925,15 +554,15 @@ msgstr ""
 "использовать LDAP, вам надо скачать и установить \n"
 "OpenLDAP и перекомпилировать и установить evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:547
+#: addressbook/gui/component/addressbook.c:548
 msgid "As _Minicards"
 msgstr "Как миникарточки"
 
-#: addressbook/gui/component/addressbook.c:552
+#: addressbook/gui/component/addressbook.c:553
 msgid "As _Table"
 msgstr "Как таблица"
 
-#: addressbook/gui/component/addressbook.c:592
+#: addressbook/gui/component/addressbook.c:593
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -989,33 +618,6 @@ msgstr "Выбрать имена из списка:"
 msgid "Message Recipients"
 msgstr "Получатели сообщения"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:416
-#: addressbook/gui/widgets/e-minicard.c:334
-msgid "Save as VCard"
-msgstr "Сохранить как VCard"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:541
-msgid "* Click here to add a contact *"
-msgstr "* Щелкните здесь чтобы добавить контакт *"
-
-#: addressbook/gui/widgets/e-minicard-control.c:278
-msgid "Save in addressbook"
-msgstr "Сохранить в адресной книге"
-
-#: addressbook/gui/widgets/e-minicard-view.c:110
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Нет элементов для отображения в этом окне\n"
-"\n"
-"Дважды щелкните здесь для создания нового контакта."
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -1134,6 +736,33 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:334
+msgid "Save as VCard"
+msgstr "Сохранить как VCard"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:543
+msgid "* Click here to add a contact *"
+msgstr "* Щелкните здесь чтобы добавить контакт *"
+
+#: addressbook/gui/widgets/e-minicard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сохранить в адресной книге"
+
+#: addressbook/gui/widgets/e-minicard-view.c:111
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Нет элементов для отображения в этом окне\n"
+"\n"
+"Дважды щелкните здесь для создания нового контакта."
+
 #. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
 #: addressbook/gui/search/e-addressbook-search-dialog.c:151
 #: mail/folder-browser.c:404
@@ -1340,7 +969,7 @@ msgstr "Средство настройки для кондуита календаря.\n"
 
 #: calendar/conduits/calendar/calendar-conduit.c:398
 #: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:559
+#: calendar/conduits/todo/todo-conduit.c:554
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
@@ -1374,16 +1003,16 @@ msgstr "(C) 1998-2000 the Free Software Foundation и Helix Code"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Средство настройки для кондуита заданий Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:604
+#: calendar/conduits/todo/todo-conduit.c:599
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
-#: calendar/conduits/todo/todo-conduit.c:605
+#: calendar/conduits/todo/todo-conduit.c:600
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
-#: calendar/conduits/todo/todo-conduit.c:660
-#: calendar/conduits/todo/todo-conduit.c:663
+#: calendar/conduits/todo/todo-conduit.c:658
+#: calendar/conduits/todo/todo-conduit.c:661
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
@@ -1427,75 +1056,70 @@ msgstr "Задания, которые должны быть выполнены сегодня:"
 msgid "To-Do item that is overdue:"
 msgstr "Просроченные задания:"
 
-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr "Календарь Gnome"
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr "Личный календарь и диспетчер расписания Gnome."
-
-#: calendar/gui/calendar-commands.c:392
+#: calendar/gui/calendar-commands.c:370
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: calendar/gui/calendar-commands.c:416
+#: calendar/gui/calendar-commands.c:394
 msgid "Open calendar"
 msgstr "Открыть календарь"
 
-#: calendar/gui/calendar-commands.c:455
+#: calendar/gui/calendar-commands.c:433
 msgid "Save calendar"
 msgstr "Сохранить календарь"
 
-#: calendar/gui/calendar-commands.c:486
+#: calendar/gui/calendar-commands.c:464
 msgid "Day"
 msgstr "День"
 
-#: calendar/gui/calendar-commands.c:486
+#: calendar/gui/calendar-commands.c:464
 msgid "Show 1 day"
 msgstr "Показать 1 день"
 
-#: calendar/gui/calendar-commands.c:489
+#: calendar/gui/calendar-commands.c:467
 msgid "5 Days"
 msgstr "5 дней"
 
-#: calendar/gui/calendar-commands.c:489
+#: calendar/gui/calendar-commands.c:467
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: calendar/gui/calendar-commands.c:492
+#: calendar/gui/calendar-commands.c:470
 msgid "Week"
 msgstr "Неделя"
 
-#: calendar/gui/calendar-commands.c:492
+#: calendar/gui/calendar-commands.c:470
 msgid "Show 1 week"
 msgstr "Показать 1 неделю"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:473
 msgid "Month"
 msgstr "Месяц"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:473
 msgid "Show 1 month"
 msgstr "Показать 1 месяц"
 
-#: calendar/gui/calendar-commands.c:499
+#: calendar/gui/calendar-commands.c:477
 msgid "Year"
 msgstr "Год"
 
-#: calendar/gui/calendar-commands.c:499
+#: calendar/gui/calendar-commands.c:477
 msgid "Show 1 year"
 msgstr "Показать 1 год"
 
 #: calendar/gui/calendar-model.c:330
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Public"
 msgstr "Общее"
 
 #: calendar/gui/calendar-model.c:333
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Личное"
 
 #: calendar/gui/calendar-model.c:336
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
@@ -1578,7 +1202,7 @@ msgstr "Итог не доступен."
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1355
+#: calendar/gui/event-editor.c:1369
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1594,19 +1218,195 @@ msgstr "Правка встречи"
 msgid "Snooze time (minutes)"
 msgstr "Время дремания (минут)"
 
+#: calendar/gui/dialogs/task-editor.c:427
+#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1175
+msgid "FIXME: _Task"
+msgstr "FIXME: Задание"
+
+#: calendar/gui/dialogs/task-editor.c:428
+#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1176
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Запрос задания"
+
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1173
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Почтовое сообщение"
+
+#: calendar/gui/dialogs/task-editor.c:431
+msgid "FIXME: _Appointment"
+msgstr "FIXME: Встреча"
+
+#: calendar/gui/dialogs/task-editor.c:432
+msgid "FIXME: Meeting Re_quest"
+msgstr "FIXME: Запрос встречи"
+
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1174
+msgid "FIXME: _Contact"
+msgstr "FIXME: Контакт"
+
+#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1177
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Журнальная запись"
+
+#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1178
+msgid "FIXME: _Note"
+msgstr "FIXME: Заметка"
+
+#: calendar/gui/dialogs/task-editor.c:439
+#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1180
+#: calendar/gui/event-editor.c:1288
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Выбрать из..."
+
+#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1185
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Стиль памятки"
+
+#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1187
+msgid "FIXME: Define Print _Styles..."
+msgstr "FIXME: Определить стили печати..."
+
+#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1194
+msgid "FIXME: S_end"
+msgstr "FIXME: Отправить"
+
+#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1198
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Сохранить вложения..."
+
+#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1202
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: Переместить в папку..."
+
+#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1203
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Скопировать в папку..."
+
+#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1205
+msgid "Page Set_up"
+msgstr "Настройка страницы:"
+
+#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1206
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Просмотр печати"
+
+#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1227
+msgid "FIXME: Paste _Special..."
+msgstr "FIXME: Специальная вставка..."
+
+#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1232
+msgid "FIXME: Mark as U_nread"
+msgstr "FIXME: Пометить как непрочтенное"
+
+#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1236
+msgid "_Object"
+msgstr "Объект"
+
+#: calendar/gui/dialogs/task-editor.c:500
+#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1241
+#: calendar/gui/event-editor.c:1248
+msgid "FIXME: _Item"
+msgstr "FIXME: Элемент"
+
+#: calendar/gui/dialogs/task-editor.c:501
+#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1242
+#: calendar/gui/event-editor.c:1249
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Непрочтенный элемент"
+
 #: calendar/gui/dialogs/task-editor.c:502
 #: calendar/gui/dialogs/task-editor.c:510
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Невыполненное Задание"
 
-#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1288
+#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1243
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: Первый элемент в папке"
+
+#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1250
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: Последний элемент в папке"
+
+#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1255
+msgid "FIXME: _Standard"
+msgstr "FIXME: Стандарт"
+
+#: calendar/gui/dialogs/task-editor.c:518
+msgid "FIXME: __Formatting"
+msgstr "FIXME: Форматирование"
+
+#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1260
+msgid "FIXME: _Customize..."
+msgstr "FIXME: Настройка..."
+
+#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1265
+msgid "Pre_vious"
+msgstr "Пред."
+
+#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1266
+msgid "Ne_xt"
+msgstr "След."
+
+#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1270
+msgid "_Toolbars"
+msgstr "Панели инструментов"
+
+#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1275
+msgid "FIXME: _File..."
+msgstr "FIXME: Файл..."
+
+#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1276
+msgid "FIXME: It_em..."
+msgstr "FIXME: Элемент..."
+
+#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1277
+msgid "FIXME: _Object..."
+msgstr "FIXME: Объект..."
+
+#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1282
+msgid "FIXME: _Font..."
+msgstr "FIXME: Шрифт..."
+
+#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1283
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: Параграф..."
+
+#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1290
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Конструкция этой формы"
+
+#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1291
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: Создать форму..."
+
+#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1293
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Опубликовать форму..."
+
+#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1294
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Опубликовать форму как..."
+
+#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1296
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Отладчик скрипта"
+
+#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1301
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: Проверка правописания..."
+
+#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1303
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Проверка имен"
 
-#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1289
+#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1304
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Адресная книга..."
 
+#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1306
+msgid "_Forms"
+msgstr "Формы"
+
 #: calendar/gui/dialogs/task-editor.c:570
 msgid "FIXME: _New Task"
 msgstr "FIXME: Новое Задание"
@@ -1619,7 +1419,7 @@ msgstr "FIXME: Отправить отчет о состоянии"
 msgid "FIXME: _Mark Complete"
 msgstr "FIXME: Пометить как выполненное"
 
-#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1298
+#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1313
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Повторение..."
 
@@ -1639,14 +1439,51 @@ msgstr "FIXME: Ответить"
 msgid "FIXME: Reply to A_ll"
 msgstr "FIXME: Ответить всем"
 
+#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1318
+msgid "FIXME: For_ward"
+msgstr "FIXME: Переслать"
+
+#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1331
+msgid "_Insert"
+msgstr "Вставить"
+
+#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1332
+#: composer/e-msg-composer.c:992
+msgid "F_ormat"
+msgstr "Формат"
+
+#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1333
+msgid "_Tools"
+msgstr "Инструменты"
+
+#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1334
+msgid "Actio_ns"
+msgstr "Действия"
+
+#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1359
+msgid "Save and Close"
+msgstr "Сохранить и закрыть"
+
 #: calendar/gui/dialogs/task-editor.c:625
 msgid "Save the task and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1362
+#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1376
 msgid "FIXME: Print..."
 msgstr "FIXME: Печать..."
 
+#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1377
+msgid "Print this item"
+msgstr "Печать этого элемента"
+
+#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1382
+msgid "FIXME: Insert File..."
+msgstr "FIXME: Вставить файл..."
+
+#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1383
+msgid "Insert a file as an attachment"
+msgstr "Вставить файл как вложение"
+
 #: calendar/gui/dialogs/task-editor.c:639
 msgid "FIXME: Assign Task..."
 msgstr "FIXME: Назначить задание..."
@@ -1655,29 +1492,61 @@ msgstr "FIXME: Назначить задание..."
 msgid "Assign the task to someone"
 msgstr "Назначить задание кому-либо"
 
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
+#: calendar/gui/event-editor-dialog.glade.h:92
+#: calendar/gui/event-editor.c:1364 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:163
+msgid "Delete"
+msgstr "Удалить"
+
 #: calendar/gui/dialogs/task-editor.c:645
 msgid "Delete this task"
 msgstr "Удалить это задание"
 
+#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1393
+msgid "FIXME: Previous"
+msgstr "FIXME: Пред."
+
+#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1394
+msgid "Go to the previous item"
+msgstr "Перейти к предыдущему элементу"
+
+#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1396
+msgid "FIXME: Next"
+msgstr "FIXME: След."
+
+#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1397
+msgid "Go to the next item"
+msgstr "Перейти к следующему элементу"
+
+#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1399
+msgid "FIXME: Help"
+msgstr "FIXME: Справка"
+
+#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1400
+msgid "See online help"
+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
+#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:285
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:290
+#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:291
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:294
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:296
+#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:297
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
@@ -1712,60 +1581,61 @@ msgid "_Status:"
 msgstr "Состояние:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Cancelled\n"
-msgstr ""
-"Не начато\n"
-"В процессе\n"
-"Завершено\n"
-"Отменено\n"
+msgid "Not Started"
+msgstr "Не начато"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+msgid "In Progress"
+msgstr "В работе"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+msgid "Completed"
+msgstr "Выполнено"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "_Priority:"
 msgstr "Приоритет:"
 
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+msgid "High"
+msgstr "Высокий"
+
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
-msgstr ""
-"Высокий\n"
-"Нормальный\n"
-"Низкий\n"
+msgid "Normal"
+msgstr "Обычный"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+msgid "Low"
+msgstr "Низкий"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "C_lassification:"
 msgstr "Классификация:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid ""
-"None\n"
-"Public\n"
-"Private\n"
-"Confidential\n"
-msgstr ""
-"Нет\n"
-"Публичное\n"
-"Частное\n"
-"Конфиденциальное\n"
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:977
+#: widgets/misc/e-dateedit.c:332 widgets/misc/e-dateedit.c:702
+#: widgets/misc/e-dateedit.c:1021
+msgid "None"
+msgstr "Нет"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "Контакты..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "Task"
 msgstr "Задание"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "Date Completed:"
 msgstr "Дата выполнения:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "URL:"
 msgstr "URL:"
 
@@ -1860,7 +1730,7 @@ msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
 #: calendar/gui/e-day-view.c:2513 calendar/gui/e-week-view.c:2963
-#: calendar/gui/event-editor.c:1351
+#: calendar/gui/event-editor.c:1365
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
@@ -1876,47 +1746,47 @@ msgstr "Удалить этот случай"
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
-#: calendar/gui/event-editor.c:278
+#: calendar/gui/event-editor.c:279
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/event-editor.c:1253
+#: calendar/gui/event-editor.c:1257
+msgid "FIXME: _Formatting"
+msgstr "FIXME: Форматирование"
+
+#: calendar/gui/event-editor.c:1268
 msgid "FIXME: Ca_lendar..."
 msgstr "FIXME: Календарь..."
 
-#: calendar/gui/event-editor.c:1296
+#: calendar/gui/event-editor.c:1311
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: Новая встреча"
 
-#: calendar/gui/event-editor.c:1300
-msgid "FIXME: Invite _Attendees..."
-msgstr ""
-
-#: calendar/gui/event-editor.c:1301
-msgid "FIXME: C_ancel Invitation..."
-msgstr "FIXME: Отмена приглашения..."
+#: calendar/gui/event-editor.c:1315
+msgid "Schedule _Meeting..."
+msgstr "Расписание встреч..."
 
-#: calendar/gui/event-editor.c:1303
+#: calendar/gui/event-editor.c:1317
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Переслать как v_Calendar"
 
-#: calendar/gui/event-editor.c:1346
+#: calendar/gui/event-editor.c:1360
 msgid "Save and close this appointment"
 msgstr "Сохранить и закрыть эту встречу"
 
-#: calendar/gui/event-editor.c:1356
+#: calendar/gui/event-editor.c:1370
 msgid "Close this appointment"
 msgstr "Закрыть эту встречу"
 
-#: calendar/gui/event-editor.c:1372
+#: calendar/gui/event-editor.c:1386
 msgid "FIXME: Invite Attendees..."
-msgstr ""
+msgstr "FIXME: Пригласить посетителей..."
 
-#: calendar/gui/event-editor.c:1373
+#: calendar/gui/event-editor.c:1387
 msgid "Invite attendees to a meeting"
 msgstr "Пригласить посетителей на встречу"
 
-#: calendar/gui/event-editor.c:1930
+#: calendar/gui/event-editor.c:1944
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2021,12 +1891,6 @@ msgstr "Напоминание"
 msgid "Recurrence rule"
 msgstr "Правило повторения"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:977
-#: widgets/misc/e-calendar.c:166 widgets/misc/e-dateedit.c:329
-#: widgets/misc/e-dateedit.c:670 widgets/misc/e-dateedit.c:951
-msgid "None"
-msgstr "Нет"
-
 #: calendar/gui/event-editor-dialog.glade.h:43
 msgid "Daily"
 msgstr "Ежедневно"
@@ -2925,7 +2789,8 @@ msgstr "%.1fG"
 msgid "Add attachment"
 msgstr "Добавить вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:366 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:366 shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:354
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2967,7 +2832,7 @@ msgid "Click here for the address book"
 msgstr "Щелкните здесь для адресной книги"
 
 #: composer/e-msg-composer-hdrs.c:297
-msgid "Enter the identitiy you wish to send this message from"
+msgid "Enter the identity you wish to send this message from"
 msgstr "Введите именование, от которого вы хотите отправить это сообщение"
 
 #: composer/e-msg-composer-hdrs.c:301
@@ -3006,33 +2871,33 @@ msgstr "Тема:"
 msgid "Enter the subject of the mail"
 msgstr "Введите тему письма"
 
-#: composer/e-msg-composer.c:451
+#: composer/e-msg-composer.c:438
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:462
+#: composer/e-msg-composer.c:449
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:482
+#: composer/e-msg-composer.c:469
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:504
+#: composer/e-msg-composer.c:491
 msgid "Saving changes to message..."
 msgstr "Сохранить изменения в сообщении..."
 
-#: composer/e-msg-composer.c:506
+#: composer/e-msg-composer.c:493
 msgid "About to save changes to message..."
 msgstr "О сохранении изменений в сообщении..."
 
-#: composer/e-msg-composer.c:591 shell/e-shell-view-menu.c:166
+#: composer/e-msg-composer.c:578 shell/e-shell-view-menu.c:166
 msgid "Evolution"
 msgstr "Эволюция"
 
-#: composer/e-msg-composer.c:597
+#: composer/e-msg-composer.c:584
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3042,27 +2907,27 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: composer/e-msg-composer.c:619
+#: composer/e-msg-composer.c:606
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:738
+#: composer/e-msg-composer.c:725
 msgid "That file does not exist."
 msgstr "Этот файл не существует."
 
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:735
 msgid "That is not a regular file."
 msgstr "Это не обычный файл."
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:745
 msgid "That file exists but is not readable."
 msgstr "Этот файл существует, но не читается."
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:755
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Файл выглядит доступным, но произошел сбой open(2)."
 
-#: composer/e-msg-composer.c:790
+#: composer/e-msg-composer.c:777
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3070,123 +2935,123 @@ msgstr ""
 "Файл очень большой (больше 100К).\n"
 "Вы уверены, что хотите вставить его?"
 
-#: composer/e-msg-composer.c:811
+#: composer/e-msg-composer.c:798
 msgid "An error occurred while reading the file."
 msgstr "При чтении файла возникла ошибка."
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:894
 msgid "_File"
 msgstr "Файл"
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:900
 msgid "_Open..."
 msgstr "Открыть..."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:901
 msgid "Load a previously saved message"
 msgstr "Загрузить ранее сохраненное сообщение"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:909
 msgid "_Save..."
 msgstr "Cохранить..."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:910
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: composer/e-msg-composer.c:931
-msgid "_Save as..."
+#: composer/e-msg-composer.c:918
+msgid "Save _as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:932
+#: composer/e-msg-composer.c:919
 msgid "Save message with a different name"
 msgstr "Сохранить сообщение c другим названием"
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:927
 msgid "Save in _folder..."
 msgstr "Сохранить в папке..."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:928
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: composer/e-msg-composer.c:950
+#: composer/e-msg-composer.c:937
 msgid "_Insert text file... (FIXME)"
 msgstr "Вставить текстовый файл... (FIXME)"
 
-#: composer/e-msg-composer.c:951
+#: composer/e-msg-composer.c:938
 msgid "Insert a file as text into the message"
 msgstr "Вставить файл в сообщение как текст"
 
-#: composer/e-msg-composer.c:960
+#: composer/e-msg-composer.c:947
 msgid "Send _Now"
 msgstr "Отправить сейчас"
 
-#: composer/e-msg-composer.c:961
+#: composer/e-msg-composer.c:948
 msgid "Send the message now"
 msgstr "Отправить это сообщение сейчас"
 
-#: composer/e-msg-composer.c:969
+#: composer/e-msg-composer.c:956
 msgid "Send _Later"
 msgstr "Отправить позже"
 
-#: composer/e-msg-composer.c:970
+#: composer/e-msg-composer.c:957
 msgid "Send the message later"
 msgstr "Отправить это сообщение позже"
 
-#: composer/e-msg-composer.c:980
+#: composer/e-msg-composer.c:967
 msgid "_Close..."
 msgstr "Закрыть..."
 
-#: composer/e-msg-composer.c:981
+#: composer/e-msg-composer.c:968
 msgid "Quit the message composer"
 msgstr "Выйти из редактора сообщений"
 
-#: composer/e-msg-composer.c:994
+#: composer/e-msg-composer.c:981
 msgid "_Edit"
 msgstr "Правка"
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:998
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:1012
+#: composer/e-msg-composer.c:999
 msgid "Send the mail in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: composer/e-msg-composer.c:1025 shell/e-storage-set-view.c:223
+#: composer/e-msg-composer.c:1012 shell/e-storage-set-view.c:223
 msgid "_View"
 msgstr "Просмотр"
 
-#: composer/e-msg-composer.c:1031
+#: composer/e-msg-composer.c:1018
 msgid "Show _attachments"
 msgstr "Показать вложения"
 
-#: composer/e-msg-composer.c:1032
+#: composer/e-msg-composer.c:1019
 msgid "Show/hide attachments"
 msgstr "Показать/скрыть вложения"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1052
 msgid "Send"
 msgstr "Отправить"
 
-#: composer/e-msg-composer.c:1066
+#: composer/e-msg-composer.c:1053
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1062
 msgid "Attach"
 msgstr "Присоединить"
 
-#: composer/e-msg-composer.c:1076
+#: composer/e-msg-composer.c:1063
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer.c:1263
+#: composer/e-msg-composer.c:1250
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1321
 msgid "Could not create composer window."
 msgstr "Невозможно создать окно редактора."
 
@@ -3418,15 +3283,15 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: mail/mail-callbacks.c:492
+#: mail/mail-callbacks.c:502
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:494
+#: mail/mail-callbacks.c:504
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:563
+#: mail/mail-callbacks.c:605
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3434,7 +3299,7 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:654
+#: mail/mail-callbacks.c:696
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3734,280 +3599,259 @@ msgstr "Изменить папку \"%s\" в формат \"%s\""
 msgid " (XXX unread)"
 msgstr " (XXX непрочитано)"
 
-#: mail/mail-ops.c:75
+#: mail/mail-ops.c:68
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Получение почты c %s"
 
-#: mail/mail-ops.c:77
+#: mail/mail-ops.c:70
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Получить почту c %s"
 
-#: 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 "Неправильная папка передана в fetch_mail"
-
-#: mail/mail-ops.c:266
+#: mail/mail-ops.c:258
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Нет новой почты на %s."
 
-#: mail/mail-ops.c:330
+#: mail/mail-ops.c:312
 msgid "Filtering email on demand"
 msgstr "Фильтрация почты по запросу"
 
-#: mail/mail-ops.c:332
+#: mail/mail-ops.c:314
 msgid "Filter email on demand"
 msgstr "Фильтр почты по запросу"
 
-#: mail/mail-ops.c:343
-msgid "Bad filter context specified"
-msgstr "Указан плохой контекст фильтра"
-
-#: mail/mail-ops.c:352
-msgid "Bad input source defined for filtering"
-msgstr "Для фильтрации определен плохой входной источник"
-
-#: mail/mail-ops.c:361
-msgid "Bad default destination folder"
-msgstr "Плохая папка назначения по умолчанию"
-
-#: mail/mail-ops.c:514
+#: mail/mail-ops.c:481
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:519
+#: mail/mail-ops.c:486
 msgid "Sending a message without a subject"
 msgstr "Отправка сообщения без темы"
 
-#: mail/mail-ops.c:522
+#: mail/mail-ops.c:489
 #, c-format
 msgid "Send \"%s\""
 msgstr "Послать \"%s\""
 
-#: mail/mail-ops.c:525
+#: mail/mail-ops.c:492
 msgid "Send a message without a subject"
 msgstr "Послать сообщение без темы"
 
-#: mail/mail-ops.c:707
+#: mail/mail-ops.c:636
 msgid "Sending queue"
 msgstr "Отправка очереди"
 
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:638
 msgid "Send queue"
 msgstr "Отправить очередь"
 
-#: mail/mail-ops.c:863 mail/mail-ops.c:870
+#: mail/mail-ops.c:774 mail/mail-ops.c:781
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Присоединение \"%s\""
 
-#: mail/mail-ops.c:867 mail/mail-ops.c:873
+#: mail/mail-ops.c:778 mail/mail-ops.c:784
 msgid "Appending a message without a subject"
 msgstr "Присоединение сообщения без темы"
 
-#: mail/mail-ops.c:962
+#: mail/mail-ops.c:856
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Вычеркивание \"%s\""
 
-#: mail/mail-ops.c:964
+#: mail/mail-ops.c:858
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Вычеркнуть \"%s\""
 
-#: mail/mail-ops.c:1036
+#: mail/mail-ops.c:917
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1038
+#: mail/mail-ops.c:919
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:922
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:924
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1101
+#: mail/mail-ops.c:954
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:1104
+#: mail/mail-ops.c:957
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:969
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1197
+#: mail/mail-ops.c:1046
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Помечание сообщений в папке \"%s\""
 
-#: mail/mail-ops.c:1200
+#: mail/mail-ops.c:1049
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Пометить сообщения в папке \"%s\""
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1192
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1362
+#: mail/mail-ops.c:1195
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Считать папки в \"%s\""
 
-#: mail/mail-ops.c:1419
+#: mail/mail-ops.c:1239
 #, c-format
 msgid "Found subfolder \"%s\""
 msgstr "Найдена вложенная папка \"%s\""
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1273
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1331
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Присоединение сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:1519
+#: mail/mail-ops.c:1334
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Присоединить сообщения из \"%s\""
 
-#: mail/mail-ops.c:1645
+#: mail/mail-ops.c:1437
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Пересылка сообщений \"%s\""
 
-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1442
 msgid "Forwarding a message without a subject"
 msgstr "Пересылка сообщения без темы"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1445
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслать сообщение \"%s\""
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1450
 msgid "Forward a message without a subject"
 msgstr "Переслать сообщение без темы"
 
-#: mail/mail-ops.c:1712
+#: mail/mail-ops.c:1479
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1725
+#: mail/mail-ops.c:1492
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Не удалось создать mime-часть из сообщения при создании пересылаемого "
 "сообщения."
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1578
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Загрузка \"%s\""
 
-#: mail/mail-ops.c:1816
+#: mail/mail-ops.c:1580
 #, c-format
 msgid "Load \"%s\""
 msgstr "Загрузить \"%s\""
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1682
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Создание \"%s\""
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1684
 #, c-format
 msgid "Create \"%s\""
 msgstr "Создать \"%s\""
 
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:1730
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:1776
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхронизация \"%s\""
 
-#: mail/mail-ops.c:2064
+#: mail/mail-ops.c:1778
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхронизовать \"%s\""
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1841
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:2143
+#: mail/mail-ops.c:1844
 msgid "Clearing message display"
 msgstr "Очистка отображения сообщения"
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:1847
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:1850
 msgid "Clear message display"
 msgstr "Очистить отображение сообщения"
 
-#: mail/mail-ops.c:2276
+#: mail/mail-ops.c:1959
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Открытие сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2279
+#: mail/mail-ops.c:1962
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Открыть сообщения из \"%s\""
 
-#: mail/mail-ops.c:2401
+#: mail/mail-ops.c:2066
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Загрузка папки %s"
 
-#: mail/mail-ops.c:2403
+#: mail/mail-ops.c:2068
 #, c-format
 msgid "Load %s Folder"
 msgstr "Загрузить папку %s"
 
-#: mail/mail-ops.c:2478
+#: mail/mail-ops.c:2133
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Просмотр сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2481
+#: mail/mail-ops.c:2136
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Просмотреть сообщения из  \"%s\""
 
-#: mail/mail-ops.c:2527
+#: mail/mail-ops.c:2162
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения %d из %d (uid  \"%s\")"
@@ -4114,7 +3958,7 @@ msgstr "Ответить"
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/mail-view.c:154 mail/message-list.c:1281
+#: mail/mail-view.c:154 mail/message-list.c:1647
 msgid "Reply to All"
 msgstr "Ответить всем"
 
@@ -4142,91 +3986,91 @@ msgstr "Распечатать выделенное сообщение"
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/message-list.c:722
+#: mail/message-list.c:972
 msgid "From"
 msgstr "От"
 
-#: mail/message-list.c:729
+#: mail/message-list.c:979
 msgid "Subject"
 msgstr "Тема"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:986
 msgid "Date"
 msgstr "Дата"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:993
 msgid "Received"
 msgstr "Получено"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:1000
 msgid "To"
 msgstr "Кому"
 
-#: mail/message-list.c:757
+#: mail/message-list.c:1007
 msgid "Size"
 msgstr "Размер"
 
-#: mail/message-list.c:1276
+#: mail/message-list.c:1642
 msgid "Open in New Window"
 msgstr "Открыть в новом окне"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1643
 msgid "Edit Message"
 msgstr "Правка сообщения"
 
-#: mail/message-list.c:1278
+#: mail/message-list.c:1644
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1646
 msgid "Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1648
 msgid "Forward Message"
 msgstr "Переслать сообщение"
 
-#: mail/message-list.c:1284
+#: mail/message-list.c:1650
 msgid "Delete Message"
 msgstr "Удалить сообщение"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1651
 msgid "Move Message"
 msgstr "Переместить сообщение"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1652
 msgid "Copy Message"
 msgstr "Скопировать сообщение"
 
-#: mail/message-list.c:1288
+#: mail/message-list.c:1654
 msgid "VFolder on Subject"
 msgstr "Вирт.папка по теме"
 
-#: mail/message-list.c:1289
+#: mail/message-list.c:1655
 msgid "VFolder on Sender"
 msgstr "Вирт.папка по отправителю"
 
-#: mail/message-list.c:1290
+#: mail/message-list.c:1656
 msgid "VFolder on Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: mail/message-list.c:1292
+#: mail/message-list.c:1658
 msgid "Filter on Subject"
 msgstr "Фильтр по теме"
 
-#: mail/message-list.c:1293
+#: mail/message-list.c:1659
 msgid "Filter on Sender"
 msgstr "Фильтр по отправителю"
 
-#: mail/message-list.c:1294
+#: mail/message-list.c:1660
 msgid "Filter on Recipients"
 msgstr "Фильтр по получателю"
 
-#: mail/message-list.c:1295 mail/message-list.c:1318
+#: mail/message-list.c:1661 mail/message-list.c:1684
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/message-list.c:1320
+#: mail/message-list.c:1686
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
@@ -4372,31 +4216,68 @@ msgstr "Эволюция - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "Невозможно установить локальное хранилище -- %s"
 
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
+#: shell/e-shortcuts-view.c:122
+msgid "Create new shortcut group"
+msgstr "Создать новую группу закладок"
+
+#: shell/e-shortcuts-view.c:125
+msgid "Group name:"
+msgstr "Название группы:"
+
+#: shell/e-shortcuts-view.c:232
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+"Вы действительно хотите удалить группу\n"
+"\"%s\" из панели закладок?"
+
+#: shell/e-shortcuts-view.c:237
+msgid "Don't remove"
+msgstr "Не удалять"
+
+#: shell/e-shortcuts-view.c:248
+msgid "_Small Icons"
 msgstr "Маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Показать закладки как маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
+#: shell/e-shortcuts-view.c:251
+msgid "_Large Icons"
 msgstr "Большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Показать закладки как большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:263
+msgid "_New Group..."
+msgstr "Новая группа..."
+
+#: shell/e-shortcuts-view.c:264
+msgid "Create a new shortcut group"
+msgstr "Создать новую группу закладок"
+
+#: shell/e-shortcuts-view.c:266
+msgid "_Remove This Group..."
+msgstr "Удалить эту группу..."
+
+#: shell/e-shortcuts-view.c:267
+msgid "Remove this shortcut group"
+msgstr "Удалить эту группу закладок"
+
+#: shell/e-shortcuts-view.c:351
 msgid "Activate"
 msgstr "Активировать"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:351
 msgid "Activate this shortcut"
 msgstr "Активировать эту закладку"
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:354
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Удалить эту закладку из строки закладок"
 
@@ -4594,25 +4475,36 @@ msgstr "Время завершения собрания:"
 msgid "All Attendees"
 msgstr "Все сопровождение"
 
-#. Create the 'Today' and 'None' buttons but don't show them.
-#: widgets/misc/e-calendar.c:158 widgets/misc/e-dateedit.c:323
-msgid "Today"
-msgstr "Сегодня"
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:422
+#: widgets/misc/e-calendar-item.c:415
 msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2671
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: widgets/misc/e-clipped-label.c:106
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:317
+#: widgets/misc/e-dateedit.c:320
 msgid "Now"
 msgstr "Сейчас"
 
+#: widgets/misc/e-dateedit.c:326
+msgid "Today"
+msgstr "Сегодня"
+
+#. This is a strftime() format for a short date. %m = month, %d = day
+#. of month, %Y = year (all digits).
+#: widgets/misc/e-dateedit.c:475 widgets/misc/e-dateedit.c:507
+#: widgets/misc/e-dateedit.c:662 widgets/misc/e-dateedit.c:718
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"