Updated russian translation.

svn path=/trunk/; revision=3974

1 files changed, 320 insertions, 362 deletions

diff --git a/po/ru.po b/po/ru.po
index 5281e23b4f..59eb6e269b 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-06-30 17:28+0000\n"
-"PO-Revision-Date: 2000-06-30 17:37+00:00\n"
+"POT-Creation-Date: 2000-07-08 12:58+0000\n"
+"PO-Revision-Date: 2000-07-08 12:58+00:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -36,477 +36,456 @@ msgstr "Элементы принадлежащие этим категориям:"
 msgid "Available Categories:"
 msgstr "Доступные категории:"
 
-#: addressbook/contact-editor/e-contact-editor.c:578
+#: addressbook/contact-editor/e-contact-editor.c:579
 #: calendar/gui/event-editor.c:1118
 msgid "FIXME: _Appointment"
 msgstr "FIXME: Встреча"
 
-#: addressbook/contact-editor/e-contact-editor.c:579
+#: addressbook/contact-editor/e-contact-editor.c:580
 #: calendar/gui/event-editor.c:1119
 msgid "FIXME: Meeting Re_quest"
 msgstr "FIXME: Запрос встречи"
 
-#: addressbook/contact-editor/e-contact-editor.c:581
+#: addressbook/contact-editor/e-contact-editor.c:582
 #: calendar/gui/event-editor.c:1121
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Почтовое сообщение"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
+#: addressbook/contact-editor/e-contact-editor.c:583
 #: calendar/gui/event-editor.c:1122
 msgid "FIXME: _Contact"
 msgstr "FIXME: Контакт"
 
-#: addressbook/contact-editor/e-contact-editor.c:583
+#: addressbook/contact-editor/e-contact-editor.c:584
 #: calendar/gui/event-editor.c:1123
 msgid "FIXME: _Task"
 msgstr "FIXME: Задание"
 
-#: addressbook/contact-editor/e-contact-editor.c:584
+#: addressbook/contact-editor/e-contact-editor.c:585
 #: calendar/gui/event-editor.c:1124
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Запрос задания"
 
-#: addressbook/contact-editor/e-contact-editor.c:585
+#: addressbook/contact-editor/e-contact-editor.c:586
 #: calendar/gui/event-editor.c:1125
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Журнальная запись"
 
-#: addressbook/contact-editor/e-contact-editor.c:586
+#: addressbook/contact-editor/e-contact-editor.c:587
 #: calendar/gui/event-editor.c:1126
 msgid "FIXME: _Note"
 msgstr "FIXME: Заметка"
 
-#: addressbook/contact-editor/e-contact-editor.c:588
-#: addressbook/contact-editor/e-contact-editor.c:693
+#: addressbook/contact-editor/e-contact-editor.c:589
+#: addressbook/contact-editor/e-contact-editor.c:694
 #: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Выбрать из..."
 
-#: addressbook/contact-editor/e-contact-editor.c:593
+#: addressbook/contact-editor/e-contact-editor.c:594
 #: calendar/gui/event-editor.c:1133
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Стиль памятки"
 
-#: addressbook/contact-editor/e-contact-editor.c:595
+#: addressbook/contact-editor/e-contact-editor.c:596
 #: calendar/gui/event-editor.c:1135
 msgid "FIXME: Define Print _Styles..."
 msgstr "FIXME: Определить стили печати..."
 
-#: addressbook/contact-editor/e-contact-editor.c:602
+#: addressbook/contact-editor/e-contact-editor.c:603
 #: calendar/gui/event-editor.c:1142
 msgid "FIXME: S_end"
 msgstr "FIXME: Отправить"
 
-#: addressbook/contact-editor/e-contact-editor.c:606
+#: addressbook/contact-editor/e-contact-editor.c:607
 #: calendar/gui/event-editor.c:1146
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Сохранить вложения..."
 
-#: addressbook/contact-editor/e-contact-editor.c:608
+#: addressbook/contact-editor/e-contact-editor.c:609
 #: calendar/gui/event-editor.c:1148
 msgid "FIXME: _Delete"
 msgstr "FIXME: Удалить"
 
-#: addressbook/contact-editor/e-contact-editor.c:609
+#: addressbook/contact-editor/e-contact-editor.c:610
 #: calendar/gui/event-editor.c:1149
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Переместить в папку..."
 
-#: addressbook/contact-editor/e-contact-editor.c:610
+#: addressbook/contact-editor/e-contact-editor.c:611
 #: calendar/gui/event-editor.c:1150
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Скопировать в папку..."
 
-#: addressbook/contact-editor/e-contact-editor.c:612
+#: addressbook/contact-editor/e-contact-editor.c:613
 #: calendar/gui/event-editor.c:1152
 msgid "Page Set_up"
 msgstr "Настройка страницы:"
 
-#: addressbook/contact-editor/e-contact-editor.c:613
+#: addressbook/contact-editor/e-contact-editor.c:614
 #: calendar/gui/event-editor.c:1153
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Просмотр печати"
 
-#: addressbook/contact-editor/e-contact-editor.c:634
+#: addressbook/contact-editor/e-contact-editor.c:635
 #: calendar/gui/event-editor.c:1174
 msgid "FIXME: Paste _Special..."
 msgstr "FIXME: Специальная вставка..."
 
-#: addressbook/contact-editor/e-contact-editor.c:639
+#: addressbook/contact-editor/e-contact-editor.c:640
 #: calendar/gui/event-editor.c:1179
 msgid "FIXME: Mark as U_nread"
 msgstr "FIXME: Пометить как непрочтенное"
 
-#: addressbook/contact-editor/e-contact-editor.c:643
+#: addressbook/contact-editor/e-contact-editor.c:644
 #: calendar/gui/event-editor.c:1183
 msgid "_Object"
 msgstr "Объект"
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: addressbook/contact-editor/e-contact-editor.c:655
+#: addressbook/contact-editor/e-contact-editor.c:649
+#: addressbook/contact-editor/e-contact-editor.c:656
 #: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
 msgid "FIXME: _Item"
 msgstr "FIXME: Элемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
+#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:657
 #: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Непрочтенный элемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:650
+#: addressbook/contact-editor/e-contact-editor.c:651
 #: calendar/gui/event-editor.c:1190
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Первый элемент в папке"
 
-#: addressbook/contact-editor/e-contact-editor.c:657
+#: addressbook/contact-editor/e-contact-editor.c:658
 #: calendar/gui/event-editor.c:1197
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Последний элемент в папке"
 
-#: addressbook/contact-editor/e-contact-editor.c:662
+#: addressbook/contact-editor/e-contact-editor.c:663
 #: calendar/gui/event-editor.c:1202
 msgid "FIXME: _Standard"
 msgstr "FIXME: Стандарт"
 
-#: addressbook/contact-editor/e-contact-editor.c:664
+#: addressbook/contact-editor/e-contact-editor.c:665
 #: calendar/gui/event-editor.c:1204
 msgid "FIXME: __Formatting"
 msgstr "FIXME: Форматирование"
 
-#: addressbook/contact-editor/e-contact-editor.c:667
+#: addressbook/contact-editor/e-contact-editor.c:668
 #: calendar/gui/event-editor.c:1207
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Настройка..."
 
-#: addressbook/contact-editor/e-contact-editor.c:672
+#: addressbook/contact-editor/e-contact-editor.c:673
 #: calendar/gui/event-editor.c:1212
 msgid "Pre_vious"
 msgstr "Пред."
 
-#: addressbook/contact-editor/e-contact-editor.c:673
+#: addressbook/contact-editor/e-contact-editor.c:674
 #: calendar/gui/event-editor.c:1213
 msgid "Ne_xt"
 msgstr "След."
 
-#: addressbook/contact-editor/e-contact-editor.c:675
+#: addressbook/contact-editor/e-contact-editor.c:676
 #: calendar/gui/event-editor.c:1217
 msgid "_Toolbars"
 msgstr "Панели инструментов"
 
-#: addressbook/contact-editor/e-contact-editor.c:680
+#: addressbook/contact-editor/e-contact-editor.c:681
 #: calendar/gui/event-editor.c:1222
 msgid "FIXME: _File..."
 msgstr "FIXME: Файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:681
+#: addressbook/contact-editor/e-contact-editor.c:682
 #: calendar/gui/event-editor.c:1223
 msgid "FIXME: It_em..."
 msgstr "FIXME: Элемент..."
 
-#: addressbook/contact-editor/e-contact-editor.c:682
+#: addressbook/contact-editor/e-contact-editor.c:683
 #: calendar/gui/event-editor.c:1224
 msgid "FIXME: _Object..."
 msgstr "FIXME: Объект..."
 
-#: addressbook/contact-editor/e-contact-editor.c:687
+#: addressbook/contact-editor/e-contact-editor.c:688
 #: calendar/gui/event-editor.c:1229
 msgid "FIXME: _Font..."
 msgstr "FIXME: Шрифт..."
 
-#: addressbook/contact-editor/e-contact-editor.c:688
+#: addressbook/contact-editor/e-contact-editor.c:689
 #: calendar/gui/event-editor.c:1230
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Параграф..."
 
-#: addressbook/contact-editor/e-contact-editor.c:695
+#: addressbook/contact-editor/e-contact-editor.c:696
 #: calendar/gui/event-editor.c:1237
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Конструкция этой формы"
 
-#: addressbook/contact-editor/e-contact-editor.c:696
+#: addressbook/contact-editor/e-contact-editor.c:697
 #: calendar/gui/event-editor.c:1238
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Создать форму..."
 
-#: addressbook/contact-editor/e-contact-editor.c:698
+#: addressbook/contact-editor/e-contact-editor.c:699
 #: calendar/gui/event-editor.c:1240
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Опубликовать форму..."
 
-#: addressbook/contact-editor/e-contact-editor.c:699
+#: addressbook/contact-editor/e-contact-editor.c:700
 #: calendar/gui/event-editor.c:1241
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Опубликовать форму как..."
 
-#: addressbook/contact-editor/e-contact-editor.c:701
+#: addressbook/contact-editor/e-contact-editor.c:702
 #: calendar/gui/event-editor.c:1243
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Отладчик скрипта"
 
-#: addressbook/contact-editor/e-contact-editor.c:706
+#: addressbook/contact-editor/e-contact-editor.c:707
 #: calendar/gui/event-editor.c:1248
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Проверка правописания..."
 
-#: addressbook/contact-editor/e-contact-editor.c:708
+#: addressbook/contact-editor/e-contact-editor.c:709
 #: calendar/gui/event-editor.c:1253
 msgid "_Forms"
 msgstr "Формы"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
+#: addressbook/contact-editor/e-contact-editor.c:714
 msgid "FIXME: _New Contact"
 msgstr "FIXME: Новый контакт"
 
-#: addressbook/contact-editor/e-contact-editor.c:714
+#: addressbook/contact-editor/e-contact-editor.c:715
 msgid "FIXME: New _Contact from Same Company"
 msgstr "FIXME: Новый контакт в той же компании"
 
-#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:717
 msgid "FIXME: New _Letter to Contact"
 msgstr "FIXME: Новое письмо для контакта"
 
-#: addressbook/contact-editor/e-contact-editor.c:717
+#: addressbook/contact-editor/e-contact-editor.c:718
 msgid "FIXME: New _Message to Contact"
 msgstr "FIXME: Новое сообщение для контакта"
 
-#: addressbook/contact-editor/e-contact-editor.c:718
+#: addressbook/contact-editor/e-contact-editor.c:719
 msgid "FIXME: New Meetin_g with Contact"
 msgstr "FIXME: Новая встреча с контактом"
 
-#: addressbook/contact-editor/e-contact-editor.c:719
+#: addressbook/contact-editor/e-contact-editor.c:720
 msgid "FIXME: _Plan a Meeting..."
 msgstr "FIXME: План встречи..."
 
-#: addressbook/contact-editor/e-contact-editor.c:720
+#: addressbook/contact-editor/e-contact-editor.c:721
 msgid "FIXME: New _Task for Contact"
 msgstr "FIXME: Новая задача для контакта"
 
-#: addressbook/contact-editor/e-contact-editor.c:721
+#: addressbook/contact-editor/e-contact-editor.c:722
 msgid "FIXME: New _Journal Entry for Contact"
 msgstr "FIXME: Новая журнальная запись для контакта"
 
-#: addressbook/contact-editor/e-contact-editor.c:723
+#: addressbook/contact-editor/e-contact-editor.c:724
 msgid "FIXME: _Flag for Follow Up..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
+#: addressbook/contact-editor/e-contact-editor.c:725
 msgid "FIXME: _Display Map of Address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:725
+#: addressbook/contact-editor/e-contact-editor.c:726
 msgid "FIXME: _Open Web Page"
 msgstr "FIXME: Открыть Web-страницу"
 
-#: addressbook/contact-editor/e-contact-editor.c:727
+#: addressbook/contact-editor/e-contact-editor.c:728
 msgid "FIXME: Forward as _vCard"
 msgstr "FIXME: Переслать как vCard"
 
-#: addressbook/contact-editor/e-contact-editor.c:728
+#: addressbook/contact-editor/e-contact-editor.c:729
 #: calendar/gui/event-editor.c:1266
 msgid "FIXME: For_ward"
 msgstr "FIXME: Переслать"
 
-#: addressbook/contact-editor/e-contact-editor.c:740
+#: addressbook/contact-editor/e-contact-editor.c:741
 #: calendar/gui/event-editor.c:1279
 msgid "_Insert"
 msgstr "Вставить"
 
-#: addressbook/contact-editor/e-contact-editor.c:741
+#: addressbook/contact-editor/e-contact-editor.c:742
 #: calendar/gui/event-editor.c:1280
 msgid "F_ormat"
 msgstr "Формат"
 
 #. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:468
+#: addressbook/contact-editor/e-contact-editor.c:743
+#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:497
 msgid "_Tools"
 msgstr "Инструменты"
 
-#: addressbook/contact-editor/e-contact-editor.c:743
+#: addressbook/contact-editor/e-contact-editor.c:744
 #: calendar/gui/event-editor.c:1282
 msgid "Actio_ns"
 msgstr "Действия"
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
-msgstr "FIXME: Сохранить и закрыть"
-
 #: addressbook/contact-editor/e-contact-editor.c:775
+msgid "Save and Close"
+msgstr "Сохранить и закрыть"
+
+#: addressbook/contact-editor/e-contact-editor.c:776
 #: calendar/gui/event-editor.c:1321
 msgid "Save the appointment and close the dialog box"
 msgstr "Сохранить встречу и закрыть окно диалога"
 
-#: addressbook/contact-editor/e-contact-editor.c:779
+#: addressbook/contact-editor/e-contact-editor.c:780
 #: calendar/gui/event-editor.c:1325
 msgid "FIXME: Print..."
 msgstr "FIXME: Печать..."
 
-#: addressbook/contact-editor/e-contact-editor.c:780
+#: addressbook/contact-editor/e-contact-editor.c:781
 #: calendar/gui/event-editor.c:1326
 msgid "Print this item"
 msgstr "Печать этого элемента"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
+#: addressbook/contact-editor/e-contact-editor.c:782
 #: calendar/gui/event-editor.c:1327
 msgid "FIXME: Insert File..."
 msgstr "FIXME: Вставить файл..."
 
-#: addressbook/contact-editor/e-contact-editor.c:782
+#: addressbook/contact-editor/e-contact-editor.c:783
 #: calendar/gui/event-editor.c:1328
 msgid "Insert a file as an attachment"
 msgstr "Вставить файл как вложение"
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
-msgstr ""
-
 #: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
-msgstr "Настройка правил повторения"
-
-#: addressbook/contact-editor/e-contact-editor.c:787
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
-msgstr "Пригласить посетителей на встречу"
-
-#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1336
 msgid "FIXME: Delete"
 msgstr "FIXME: Удалить"
 
-#: addressbook/contact-editor/e-contact-editor.c:791
+#: addressbook/contact-editor/e-contact-editor.c:786
 #: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
 msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
+#: addressbook/contact-editor/e-contact-editor.c:788
 #: calendar/gui/event-editor.c:1339
 msgid "FIXME: Previous"
 msgstr "FIXME: Пред."
 
-#: addressbook/contact-editor/e-contact-editor.c:794
+#: addressbook/contact-editor/e-contact-editor.c:789
 #: calendar/gui/event-editor.c:1340
 msgid "Go to the previous item"
 msgstr "Перейти к предыдущему элементу"
 
-#: addressbook/contact-editor/e-contact-editor.c:795
+#: addressbook/contact-editor/e-contact-editor.c:790
 #: calendar/gui/event-editor.c:1341
 msgid "FIXME: Next"
 msgstr "FIXME: След."
 
-#: addressbook/contact-editor/e-contact-editor.c:796
+#: addressbook/contact-editor/e-contact-editor.c:791
 #: calendar/gui/event-editor.c:1342
 msgid "Go to the next item"
 msgstr "Перейти к следующему элементу"
 
-#: addressbook/contact-editor/e-contact-editor.c:797
+#: addressbook/contact-editor/e-contact-editor.c:792
 #: calendar/gui/event-editor.c:1343
 msgid "FIXME: Help"
 msgstr "FIXME: Справка"
 
-#: addressbook/contact-editor/e-contact-editor.c:798
+#: addressbook/contact-editor/e-contact-editor.c:793
 #: calendar/gui/event-editor.c:1344
 msgid "See online help"
 msgstr "Просмотр справки в сети"
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1208
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#: addressbook/contact-editor/e-contact-editor.c:1318
+#: addressbook/contact-editor/e-contact-editor.c:1209
+#: addressbook/contact-editor/e-contact-editor.c:1313
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1210
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1211
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1212
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1213
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1214
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1314
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1216
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1217
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1218
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1219
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1320 mail/mail-config.c:2039
+#: addressbook/contact-editor/e-contact-editor.c:1220
+#: addressbook/contact-editor/e-contact-editor.c:1315
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1221
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1222
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1223
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1224
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1225
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1226
 msgid "TTY/TDD"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Primary Email"
 msgstr "Первый эл.адрес"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
@@ -533,8 +512,7 @@ msgid "New phone type"
 msgstr "Новый тип телефона"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:91 mail/mail-config.c:1847
-#: mail/mail-config.c:1943
+#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "Add"
 msgstr "Добавить"
 
@@ -710,80 +688,78 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:697
+#: addressbook/gui/component/addressbook.c:426 mail/message-list.c:536
 msgid "To"
 msgstr "Кому"
 
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:669
+#: addressbook/gui/component/addressbook.c:426 mail/message-list.c:508
 msgid "From"
 msgstr "От"
 
-#: addressbook/gui/component/addressbook.c:419
+#: addressbook/gui/component/addressbook.c:426
 msgid "Cc"
 msgstr "Копия"
 
-#: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/calendar-commands.c:544 notes/component-factory.c:27
+#: addressbook/gui/component/addressbook.c:450
+#: calendar/gui/calendar-commands.c:544
 msgid "New"
 msgstr "Новый"
 
-#: addressbook/gui/component/addressbook.c:424
+#: addressbook/gui/component/addressbook.c:450
 msgid "Create a new contact"
 msgstr "Создать новый контакт"
 
-#: addressbook/gui/component/addressbook.c:428
-#: mail/folder-browser-factory.c:37
+#: addressbook/gui/component/addressbook.c:454
 msgid "Find"
 msgstr "Найти"
 
-#: addressbook/gui/component/addressbook.c:428
+#: addressbook/gui/component/addressbook.c:454
 msgid "Find a contact"
 msgstr "Найти контакт"
 
-#: addressbook/gui/component/addressbook.c:429
-#: addressbook/gui/component/addressbook.c:496
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:48
+#: addressbook/gui/component/addressbook.c:455
+#: addressbook/gui/component/addressbook.c:522
+#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/component/addressbook.c:429
+#: addressbook/gui/component/addressbook.c:455
 msgid "Print contacts"
 msgstr "Напечатать контакт"
 
 #. Delete
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:456
 #: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
-#: mail/mail-config.c:1961
+#: mail/folder-browser-factory.c:45
 msgid "Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook.c:430
+#: addressbook/gui/component/addressbook.c:456
 msgid "Delete a contact"
 msgstr "Удалить контакт"
 
-#: addressbook/gui/component/addressbook.c:503
+#: addressbook/gui/component/addressbook.c:529
 msgid "Test Select Names"
 msgstr "Проверка выбранных имен"
 
-#: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1056
+#: addressbook/gui/component/addressbook.c:536
+#: addressbook/gui/component/addressbook.c:1079
 msgid "As _Table"
 msgstr "Как таблица"
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook.c:543
 msgid "_New Contact"
 msgstr "Новый контакт"
 
-#: addressbook/gui/component/addressbook.c:525
+#: addressbook/gui/component/addressbook.c:551
 msgid "N_ew Directory Server"
 msgstr "Новый сервер каталогов"
 
-#: addressbook/gui/component/addressbook.c:604
+#: addressbook/gui/component/addressbook.c:630
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:635
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -795,20 +771,20 @@ msgid ""
 "OpenLDAP and recompile and install evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:960
+#: addressbook/gui/component/addressbook.c:983
 #: addressbook/gui/minicard/e-minicard.c:329
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/component/addressbook.c:1027
+#: addressbook/gui/component/addressbook.c:1050
 msgid "* Click here to add a contact *"
 msgstr "* Щелкните здесь чтобы добавить контакт *"
 
-#: addressbook/gui/component/addressbook.c:1063
+#: addressbook/gui/component/addressbook.c:1086
 msgid "As _Minicards"
 msgstr "Как миникарточки"
 
-#: addressbook/gui/component/addressbook.c:1114
+#: addressbook/gui/component/addressbook.c:1137
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -952,26 +928,10 @@ msgstr "Номер порта:"
 msgid "Root DN:"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Выбрать имена"
-
-#: addressbook/gui/component/select-names.glade.h:8
-msgid "Find..."
-msgstr "Найти..."
-
-#: addressbook/gui/component/select-names.glade.h:9
-msgid "T_ype name or select from List:"
-msgstr "Наберите имя или выберите из списка:"
-
-#: addressbook/gui/component/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Получатели сообщения"
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Имя:"
 
 #: addressbook/gui/minicard/e-minicard-view.c:110
 msgid ""
@@ -1302,7 +1262,7 @@ msgstr "Сегодня"
 msgid "Go to present time"
 msgstr "Перейти к настоящему"
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:213
+#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
 msgid "Next"
 msgstr "След."
 
@@ -1585,30 +1545,30 @@ msgstr "Время дремания (минут)"
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2271 calendar/gui/e-day-view.c:2278
-#: calendar/gui/e-day-view.c:2287 calendar/gui/e-week-view.c:2629
-#: calendar/gui/e-week-view.c:2636 calendar/gui/e-week-view.c:2645
+#: calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324
+#: calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:2275 calendar/gui/e-day-view.c:2282
-#: calendar/gui/e-week-view.c:2633 calendar/gui/e-week-view.c:2640
+#: calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328
+#: calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:2276 calendar/gui/e-week-view.c:2634
+#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:2283 calendar/gui/e-week-view.c:2641
+#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:2284 calendar/gui/e-week-view.c:2642
+#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:2285 calendar/gui/e-week-view.c:2643
+#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
@@ -1672,6 +1632,26 @@ msgstr "FIXME: Отмена приглашения..."
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Переслать как v_Calendar"
 
+#: calendar/gui/event-editor.c:1320
+msgid "FIXME: Save and Close"
+msgstr "FIXME: Сохранить и закрыть"
+
+#: calendar/gui/event-editor.c:1330
+msgid "FIXME: Recurrence..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1331
+msgid "Configure recurrence rules"
+msgstr "Настройка правил повторения"
+
+#: calendar/gui/event-editor.c:1333
+msgid "FIXME: Invite Attendees..."
+msgstr ""
+
+#: calendar/gui/event-editor.c:1334
+msgid "Invite attendees to a meeting"
+msgstr "Пригласить посетителей на встречу"
+
 #: calendar/gui/event-editor.c:1745
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2210,7 +2190,7 @@ msgid "Due Date"
 msgstr "Условленная дата"
 
 #: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
-#: mail/message-list.c:655
+#: mail/message-list.c:494
 msgid "Priority"
 msgstr "Приоритет"
 
@@ -2609,7 +2589,7 @@ msgstr ""
 
 #: calendar/gui/prop.c:803
 msgid "Audio alarms timeout after"
-msgstr ""
+msgstr "Задержка аудиосигнала на"
 
 #: calendar/gui/prop.c:814 calendar/gui/prop.c:831
 msgid " seconds"
@@ -2644,7 +2624,7 @@ msgstr "gnome-unknown.xpm"
 msgid "Enabled"
 msgstr "Включено"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:753
+#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:749
 msgid "Cut"
 msgstr "Вырезать"
 
@@ -2652,7 +2632,7 @@ msgstr "Вырезать"
 msgid "Cut selected item into clipboard"
 msgstr "Вырезает выделенный элемент в буфер обмена"
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:754
+#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:750
 msgid "Copy"
 msgstr "Скопировать"
 
@@ -2661,7 +2641,7 @@ msgid "Copy selected item into clipboard"
 msgstr "Копирует выделенный элемент в буфер обмена"
 
 #: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:755
+#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:751
 msgid "Paste"
 msgstr "Вставить"
 
@@ -2683,19 +2663,15 @@ msgstr "Выбрать адреса получателей"
 msgid "Recipient list:"
 msgstr "Список получателей:"
 
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Имя:"
-
 #: composer/e-msg-composer-address-dialog.glade.h:9
 msgid "Search..."
 msgstr "Поиск..."
 
-#: composer/e-msg-composer-address-dialog.glade.h:10 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:10
 msgid "Name"
 msgstr "Имя"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11 mail/mail-config.c:1716
+#: composer/e-msg-composer-address-dialog.glade.h:11
 msgid "Address"
 msgstr "Адрес"
 
@@ -2788,31 +2764,31 @@ msgstr "Тип MIME:"
 msgid "File name:"
 msgstr "Имя файла:"
 
-#: composer/e-msg-composer-hdrs.c:89
+#: composer/e-msg-composer-hdrs.c:174
 msgid "Click here for the address book"
 msgstr "Щелкните здесь для адресной книги"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:215
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:216
 msgid "Enter the recipients of the message"
 msgstr "Введите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:220
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:221
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адресатов, которые получат копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:135
+#: composer/e-msg-composer-hdrs.c:226
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:227
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2820,11 +2796,11 @@ msgstr ""
 "Введите адресатов, которые получат копию сообщения не попав в список "
 "получателей."
 
-#: composer/e-msg-composer-hdrs.c:142
+#: composer/e-msg-composer-hdrs.c:233
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:234
 msgid "Enter the subject of the mail"
 msgstr "Введите тему письма"
 
@@ -2850,91 +2826,91 @@ msgstr "Открыть файл"
 msgid "Discard this message?"
 msgstr "Отменить это сообщение"
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:707
 msgid "Save in _folder..."
 msgstr "Сохранить в папке..."
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:707
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: composer/e-msg-composer.c:714 composer/e-msg-composer.c:751
+#: composer/e-msg-composer.c:710 composer/e-msg-composer.c:747
 msgid "Send"
 msgstr "Отправить"
 
-#: composer/e-msg-composer.c:714
+#: composer/e-msg-composer.c:710
 msgid "Send the message"
 msgstr "Отправить сообщение"
 
-#: composer/e-msg-composer.c:722
+#: composer/e-msg-composer.c:718
 msgid "View _attachments"
 msgstr "Просмотреть вложения"
 
-#: composer/e-msg-composer.c:722
+#: composer/e-msg-composer.c:718
 msgid "View/hide attachments"
 msgstr "Показать/скрыть вложения"
 
-#: composer/e-msg-composer.c:751
+#: composer/e-msg-composer.c:747
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:749
 msgid "Cut selected region into the clipboard"
 msgstr "Вырезать выделенную область в буфер обмена"
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:750
 msgid "Copy selected region into the clipboard"
 msgstr "Скопировать выделенную область в буфер обмена"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:751
 msgid "Paste selected region into the clipboard"
 msgstr "Вставить выделенную область в буфер обмена"
 
-#: composer/e-msg-composer.c:756
+#: composer/e-msg-composer.c:752
 msgid "Undo"
 msgstr "Откат"
 
-#: composer/e-msg-composer.c:756
+#: composer/e-msg-composer.c:752
 msgid "Undo last operation"
 msgstr "Отменить последнюю операцию"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:754
 msgid "Attach"
 msgstr "Присоединить"
 
-#: composer/e-msg-composer.c:758
+#: composer/e-msg-composer.c:754
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer.c:916
+#: composer/e-msg-composer.c:912
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 msgid "Edit Filter"
 msgstr "Правка фильтра"
 
-#: filter/filter-editor.c:201
+#: filter/filter-editor.c:198
 msgid "Create filter"
 msgstr "Создать фильтр"
 
-#: filter/filter-editor.c:212
+#: filter/filter-editor.c:209
 msgid "Back"
 msgstr "Назад"
 
-#: filter/filter-editor.c:214
+#: filter/filter-editor.c:211
 msgid "Finish"
 msgstr "Закончить"
 
-#: filter/filter-editor.c:215
+#: filter/filter-editor.c:212
 msgid "Cancel"
 msgstr "Отмена"
 
-#: filter/filter-editor.c:219
+#: filter/filter-editor.c:216
 msgid "Apply"
 msgstr "Применить"
 
-#: filter/filter-editor.c:236
+#: filter/filter-editor.c:233
 msgid ""
 "<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
 "continue forwards to customise it.</p>"
@@ -2942,83 +2918,88 @@ msgstr ""
 "<h2>Создать правило фильтрации</h2><p>Выберите одно из приведенных ниже "
 "правил, затем продолжите его настройку.</p>"
 
-#: mail/component-factory.c:207
+#: mail/component-factory.c:211
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Get mail"
 msgstr "Получить почту"
 
-#: mail/folder-browser-factory.c:35
+#: mail/folder-browser-factory.c:29
 msgid "Check for new mail"
 msgstr "Проверить почтовый ящик"
 
-#: mail/folder-browser-factory.c:36
+#: mail/folder-browser-factory.c:30
 msgid "Compose"
 msgstr "Создать"
 
-#: mail/folder-browser-factory.c:36
+#: mail/folder-browser-factory.c:30
 msgid "Compose a new message"
 msgstr "Создать новое сообщение"
 
-#: mail/folder-browser-factory.c:37
-msgid "Find messages"
-msgstr "Найти сообщения"
-
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser-factory.c:34
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser-factory.c:42
+#: mail/folder-browser-factory.c:35
 msgid "Reply to all recipients of this message"
 msgstr "Ответить всем получателям этого сообщения"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser-factory.c:37
 msgid "Forward this message"
 msgstr "Переслать это сообщение"
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser-factory.c:41
+#, fuzzy
+msgid "Refile"
+msgstr "Открыть файл"
+
+#: mail/folder-browser-factory.c:41
+msgid "Move message to a new folder"
+msgstr "Переместить сообщение в новую папку"
+
+#: mail/folder-browser-factory.c:43
 msgid "Print the selected message"
 msgstr "Распечатать выделенное сообщение"
 
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser-factory.c:45
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/folder-browser-factory.c:69
+#: mail/folder-browser-factory.c:64
 msgid "_Expunge"
 msgstr "Вычеркнуть"
 
-#: mail/folder-browser-factory.c:75
+#: mail/folder-browser-factory.c:70
 msgid "_Filter Druid ..."
 msgstr "Помощник по фильтрам ..."
 
-#: mail/folder-browser-factory.c:81
+#: mail/folder-browser-factory.c:76
 msgid "_Virtual Folder Druid ..."
 msgstr "Помощник по виртуальным папкам ..."
 
-#: mail/folder-browser-factory.c:87
+#: mail/folder-browser-factory.c:82
 msgid "_Mail Configuration ..."
 msgstr "Настройка почты ..."
 
-#: mail/folder-browser-factory.c:93
+#: mail/folder-browser-factory.c:88
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: mail/mail-config.c:258
+#: mail/mail-config.c:259
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3028,51 +3009,51 @@ msgstr ""
 "почты. Вы можете также дополнительно ввести название вашей организации и "
 "название файла для считывания подписи."
 
-#: mail/mail-config.c:273
+#: mail/mail-config.c:274
 msgid "Full name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config.c:301
+#: mail/mail-config.c:302
 msgid "Email address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config.c:324
+#: mail/mail-config.c:325
 msgid "Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config.c:336
+#: mail/mail-config.c:337
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.c:341
+#: mail/mail-config.c:342
 msgid "Signature File"
 msgstr "Файл подписи"
 
-#: mail/mail-config.c:698 mail/mail-config.c:789
+#: mail/mail-config.c:699 mail/mail-config.c:790
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config.c:704
+#: mail/mail-config.c:705
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config.c:710
+#: mail/mail-config.c:711
 msgid "Path:"
 msgstr "Путь"
 
-#: mail/mail-config.c:716 mail/mail-config.c:795
+#: mail/mail-config.c:717 mail/mail-config.c:796
 msgid "Authentication:"
 msgstr "Идентификация:"
 
-#: mail/mail-config.c:728 mail/mail-config.c:807
+#: mail/mail-config.c:729 mail/mail-config.c:808
 msgid "Detect supported types..."
 msgstr "Определять поддерживаемые типы..."
 
-#: mail/mail-config.c:754 mail/mail-config.c:829
+#: mail/mail-config.c:755 mail/mail-config.c:830
 msgid "Test these values before continuing"
 msgstr "Проверять эти значения до продолжения"
 
-#: mail/mail-config.c:936
+#: mail/mail-config.c:937
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3086,87 +3067,51 @@ msgstr ""
 "Если сервер требует идентификации, вы можете щелкнуть на кнопке \"Определить "
 "поддерживаемые типы...\" после ввода этой информации."
 
-#: mail/mail-config.c:954
+#: mail/mail-config.c:955
 msgid "Select the method you would like to use to deliver your mail."
 msgstr ""
 "Выберите метод, который вы хотели бы использовать для доставки вашей почты."
 
-#: mail/mail-config.c:1128 mail/mail-config.c:1207
+#: mail/mail-config.c:1129 mail/mail-config.c:1208
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
 #. Identity page
-#: mail/mail-config.c:1145 mail/mail-config.c:1874
+#: mail/mail-config.c:1146
 msgid "Identity"
 msgstr "Именование"
 
 #. Source page
-#: mail/mail-config.c:1164
+#: mail/mail-config.c:1165
 msgid "Mail Source"
 msgstr "Источник почты"
 
 #. Transport page
-#: mail/mail-config.c:1185
+#: mail/mail-config.c:1186
 msgid "Mail Transport"
 msgstr "Передача почты"
 
-#: mail/mail-config.c:1307
+#: mail/mail-config.c:1308
 msgid "Edit Identity"
 msgstr "Правка именования"
 
-#: mail/mail-config.c:1309
+#: mail/mail-config.c:1310
 msgid "Add Identity"
 msgstr "Добавить именование"
 
-#: mail/mail-config.c:1452
+#: mail/mail-config.c:1453
 msgid "Edit Source"
 msgstr "Правка источника"
 
-#: mail/mail-config.c:1454
+#: mail/mail-config.c:1455
 msgid "Add Source"
 msgstr "Добавить источник"
 
-#: mail/mail-config.c:1716
-msgid "Organization"
-msgstr "Ориентация"
-
-#: mail/mail-config.c:1716
-msgid "Signature file"
-msgstr "Файл подписи"
-
-#: mail/mail-config.c:1742
-msgid "Camel Providers Configuration"
-msgstr "Настройка провайдеров Camel"
-
-#: mail/mail-config.c:1831
-msgid "Identities"
-msgstr "Именования"
-
-#: mail/mail-config.c:1856 mail/mail-config.c:1952
-msgid "Edit"
-msgstr "Правка"
-
-#: mail/mail-config.c:1927
-msgid "Mail sources"
-msgstr "Источники почты"
-
-#: mail/mail-config.c:1970
-msgid "Sources"
-msgstr "Источники"
-
-#: mail/mail-config.c:2009
-msgid "Transports"
-msgstr "Способы доставки"
-
-#: mail/mail-config.c:2030
-msgid "Send messages in HTML format"
-msgstr "Отправлять сообщения в формате HTML"
-
-#: mail/mail-ops.c:342
+#: mail/mail-ops.c:356
 msgid "Fetching mail"
 msgstr "Получение почты"
 
-#: mail/mail-ops.c:354
+#: mail/mail-ops.c:368
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3174,13 +3119,18 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
+#: mail/mail-ops.c:663
+#, fuzzy
+msgid "Refile message(s) to"
+msgstr "Найти сообщения"
+
 #: mail/mail-threads.c:483
 msgid "Currently pending operations:"
 msgstr ""
 
 #: mail/mail-threads.c:621
 msgid "Incomplete message written on pipe!"
-msgstr ""
+msgstr "Неполное сообщение записано в канал!"
 
 #: mail/mail-threads.c:623
 msgid "Error reading commands from dispatching thread."
@@ -3198,42 +3148,30 @@ msgstr "Невозможно создать окно диалога."
 msgid "User cancelled query."
 msgstr "Пользователь отменил запрос."
 
-#: mail/main.c:61
+#: mail/main.c:62
 msgid "Mail Component: I could not initialize Bonobo"
 msgstr "Почтовый компонент: не удалось инициализировать Bonobo"
 
-#: mail/message-list.c:641
+#: mail/message-list.c:480
 msgid "Online Status"
 msgstr "Подключенное состояние"
 
-#: mail/message-list.c:676
+#: mail/message-list.c:515
 msgid "Subject"
 msgstr "Тема"
 
-#: mail/message-list.c:683
+#: mail/message-list.c:522
 msgid "Date"
 msgstr "Дата"
 
-#: mail/message-list.c:690
+#: mail/message-list.c:529
 msgid "Received"
 msgstr "Получено"
 
-#: mail/message-list.c:704
+#: mail/message-list.c:543
 msgid "Size"
 msgstr "Размер"
 
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "Создать новую заметку"
-
-#: notes/component-factory.c:147
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Невозможно инициализировать компонент заметок \"Эволюции\"."
-
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Компонент заметок: не удалось инициализировать Bonobo"
-
 #: shell/e-init.c:25
 msgid "Evolution can not create its local folders"
 msgstr "\"Эволюции\" не удалось создать ее локальные папки"
@@ -3304,7 +3242,15 @@ msgstr "Указанное имя папки не допустимо."
 msgid "Evolution - Create new folder"
 msgstr "Эволюция - Создать новую папку"
 
-#: shell/e-shell-folder-selection-dialog.c:155
+#: shell/e-shell-folder-selection-dialog.c:95
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+"Тип выбранной папки не подходит для\n"
+"запрошенного действия."
+
+#: shell/e-shell-folder-selection-dialog.c:236
 msgid "New..."
 msgstr "Новая..."
 
@@ -3342,123 +3288,135 @@ msgstr ""
 "ведения календарей и контактной информации для\n"
 "групповой работы в среде GNOME."
 
-#: shell/e-shell-view-menu.c:302 shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:301
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
-#: shell/e-shell-view-menu.c:343
+#: shell/e-shell-view-menu.c:370
 msgid "_Folder"
 msgstr "Папка"
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:374
 msgid "Evolution _Bar Shortcut"
 msgstr "Строка ярлыков Evolution"
 
-#: shell/e-shell-view-menu.c:353
+#: shell/e-shell-view-menu.c:380
 msgid "_Mail message"
 msgstr "Почтовое сообщение"
 
-#: shell/e-shell-view-menu.c:354 shell/e-shell-view-menu.c:357
+#: shell/e-shell-view-menu.c:381 shell/e-shell-view-menu.c:384
 msgid "Composes a new mail message"
 msgstr "Создать новое сообщение"
 
-#: shell/e-shell-view-menu.c:356
+#: shell/e-shell-view-menu.c:383
 msgid "_Appointment"
 msgstr "Встреча"
 
-#: shell/e-shell-view-menu.c:359
+#: shell/e-shell-view-menu.c:386
 msgid "Meeting Re_quest"
 msgstr "Запрос встречи"
 
-#: shell/e-shell-view-menu.c:362
+#: shell/e-shell-view-menu.c:389
 msgid "_Contact"
 msgstr "Контакт"
 
-#: shell/e-shell-view-menu.c:365
+#: shell/e-shell-view-menu.c:392
 msgid "_Task"
 msgstr "Задание"
 
-#: shell/e-shell-view-menu.c:368
+#: shell/e-shell-view-menu.c:395
 msgid "Task _Request"
 msgstr "Запрос задания"
 
-#: shell/e-shell-view-menu.c:371
+#: shell/e-shell-view-menu.c:398
 msgid "_Journal Entry"
 msgstr "Журнальная строка"
 
-#: shell/e-shell-view-menu.c:374
+#: shell/e-shell-view-menu.c:401
 msgid "_Note"
 msgstr "Заметка"
 
-#: shell/e-shell-view-menu.c:384
+#: shell/e-shell-view-menu.c:411
 msgid "_Selected Items"
 msgstr "Выделенные элементы"
 
-#: shell/e-shell-view-menu.c:392
+#: shell/e-shell-view-menu.c:419
 msgid "_New"
 msgstr "Новое"
 
-#: shell/e-shell-view-menu.c:393
+#: shell/e-shell-view-menu.c:420
 msgid "_Open"
 msgstr "Открыть"
 
-#: shell/e-shell-view-menu.c:395
+#: shell/e-shell-view-menu.c:422
 msgid "Clos_e All Items"
 msgstr "Закрыть все"
 
-#: shell/e-shell-view-menu.c:395
+#: shell/e-shell-view-menu.c:422
 msgid "Closes all the open items"
 msgstr "Закрыть все что открыто"
 
-#: shell/e-shell-view-menu.c:399
+#: shell/e-shell-view-menu.c:426
+msgid "_Go to folder..."
+msgstr "Перейти к папке..."
+
+#: shell/e-shell-view-menu.c:426
 msgid "Display a different folder"
 msgstr "Показать другую папку"
 
-#: shell/e-shell-view-menu.c:414
+#: shell/e-shell-view-menu.c:428
+msgid "_Create new folder..."
+msgstr "Создать новую папку..."
+
+#: shell/e-shell-view-menu.c:428
+msgid "Create a new folder"
+msgstr "Создать новую папку"
+
+#: shell/e-shell-view-menu.c:443
 msgid "Show _shortcut bar"
 msgstr "Показать строку закладок"
 
-#: shell/e-shell-view-menu.c:415
+#: shell/e-shell-view-menu.c:444
 msgid "Show the shortcut bar"
 msgstr "Показать строку закладок"
 
-#: shell/e-shell-view-menu.c:417
+#: shell/e-shell-view-menu.c:446
 msgid "Show _folder bar"
 msgstr "Показать строку папок"
 
-#: shell/e-shell-view-menu.c:418
+#: shell/e-shell-view-menu.c:447
 msgid "Show the folder bar"
 msgstr "Показать строку папок"
 
-#: shell/e-shell-view-menu.c:435
+#: shell/e-shell-view-menu.c:464
 msgid "Help _Index"
 msgstr "Индекс справки"
 
-#: shell/e-shell-view-menu.c:438
+#: shell/e-shell-view-menu.c:467
 msgid "Getting _Started"
 msgstr "Введение"
 
-#: shell/e-shell-view-menu.c:441
+#: shell/e-shell-view-menu.c:470
 msgid "Using the _Mailer"
 msgstr "Использование почты"
 
-#: shell/e-shell-view-menu.c:444
+#: shell/e-shell-view-menu.c:473
 msgid "Using the _Calendar"
 msgstr "Использование календаря"
 
-#: shell/e-shell-view-menu.c:447
+#: shell/e-shell-view-menu.c:476
 msgid "Using the Cont_act Manager"
 msgstr "Использование диспетчера контактов"
 
-#: shell/e-shell-view-menu.c:452
+#: shell/e-shell-view-menu.c:481
 msgid "_Submit bug report"
 msgstr "Отправить сообщение об ошибке"
 
-#: shell/e-shell-view-menu.c:453
+#: shell/e-shell-view-menu.c:482
 msgid "Submit bug-report via bug-buddy"
 msgstr "Оправить сообщение об ошибке через bug-buddy"
 
-#: shell/e-shell-view-menu.c:469
+#: shell/e-shell-view-menu.c:498
 msgid "_Actions"
 msgstr "Действия"
 
@@ -3480,7 +3438,7 @@ msgstr "Эволюция - %s"
 msgid "Cannot open location: %s"
 msgstr "Невозможно открыть: %s"
 
-#: shell/e-shell.c:258
+#: shell/e-shell.c:296
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Невозможно установить локальное хранилище -- %s"