Updated russian translation.

svn path=/trunk/; revision=5193

1 files changed, 417 insertions, 460 deletions

diff --git a/po/ru.po b/po/ru.po
index 70e9623fec..6e4bebac52 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,22 +4,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-08-29 18:45+0400\n"
-"PO-Revision-Date: 2000-08-29 18:48+04:00\n"
+"POT-Creation-Date: 2000-09-04 20:39+0400\n"
+"PO-Revision-Date: 2000-09-04 20:44+04:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:41
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/backend/ebook/test-client-list.c:29
-#: addressbook/backend/ebook/test-client.c:54
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: addressbook/backend/ebook/load-pine-addressbook.c:16
+#: addressbook/backend/ebook/test-client-list.c:18
+#: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1215
 #: addressbook/gui/component/addressbook-factory.c:37
 #: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1669
+#: calendar/conduits/calendar/calendar-conduit.c:1673
 #: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
@@ -173,228 +173,229 @@ msgid "Available Categories:"
 msgstr "Доступные категории:"
 
 #: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1176
+#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1173
 msgid "FIXME: _Appointment"
 msgstr "FIXME: Встреча"
 
 #: addressbook/contact-editor/e-contact-editor.c:666
-#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1177
+#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1174
 msgid "FIXME: Meeting Re_quest"
 msgstr "FIXME: Запрос встречи"
 
 #: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1179
+#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1176
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Почтовое сообщение"
 
 #: addressbook/contact-editor/e-contact-editor.c:669
-#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1180
+#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1177
 msgid "FIXME: _Contact"
 msgstr "FIXME: Контакт"
 
 #: addressbook/contact-editor/e-contact-editor.c:670
 #: calendar/gui/dialogs/task-editor.c:213
-#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1181
+#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1178
 msgid "FIXME: _Task"
 msgstr "FIXME: Задание"
 
 #: addressbook/contact-editor/e-contact-editor.c:671
 #: calendar/gui/dialogs/task-editor.c:214
-#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1182
+#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1179
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Запрос задания"
 
 #: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1183
+#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1180
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Журнальная запись"
 
 #: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1184
+#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1181
 msgid "FIXME: _Note"
 msgstr "FIXME: Заметка"
 
 #: addressbook/contact-editor/e-contact-editor.c:675
 #: addressbook/contact-editor/e-contact-editor.c:780
 #: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1186
-#: calendar/gui/event-editor.c:1293
+#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1183
+#: calendar/gui/event-editor.c:1291
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Выбрать из..."
 
 #: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1191
+#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1188
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Стиль памятки"
 
 #: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1193
+#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1190
 msgid "FIXME: Define Print _Styles..."
 msgstr "FIXME: Определить стили печати..."
 
 #: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1200
+#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1197
 msgid "FIXME: S_end"
 msgstr "FIXME: Отправить"
 
 #: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1204
+#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1201
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Сохранить вложения..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
 #: addressbook/contact-editor/e-contact-editor.c:695
+#: calendar/gui/event-editor.c:1203
 msgid "_Delete"
 msgstr "Удалить"
 
 #: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1207
+#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1205
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Переместить в папку..."
 
 #: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1208
+#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1206
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Скопировать в папку..."
 
 #: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1210
+#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1208
 msgid "Page Set_up"
 msgstr "Настройка страницы:"
 
 #: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1211
+#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1209
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Просмотр печати"
 
 #: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1232
+#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1230
 msgid "FIXME: Paste _Special..."
 msgstr "FIXME: Специальная вставка..."
 
 #: addressbook/contact-editor/e-contact-editor.c:726
-#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1237
+#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1235
 msgid "FIXME: Mark as U_nread"
 msgstr "FIXME: Пометить как непрочтенное"
 
 #: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1241
+#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1239
 msgid "_Object"
 msgstr "Объект"
 
 #: addressbook/contact-editor/e-contact-editor.c:735
 #: addressbook/contact-editor/e-contact-editor.c:742
 #: calendar/gui/dialogs/task-editor.c:285
-#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1246
-#: calendar/gui/event-editor.c:1253
+#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1244
+#: calendar/gui/event-editor.c:1251
 msgid "FIXME: _Item"
 msgstr "FIXME: Элемент"
 
 #: addressbook/contact-editor/e-contact-editor.c:736
 #: addressbook/contact-editor/e-contact-editor.c:743
 #: calendar/gui/dialogs/task-editor.c:286
-#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1247
-#: calendar/gui/event-editor.c:1254
+#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1245
+#: calendar/gui/event-editor.c:1252
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Непрочтенный элемент"
 
 #: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1248
+#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1246
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Первый элемент в папке"
 
 #: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1255
+#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1253
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Последний элемент в папке"
 
 #: addressbook/contact-editor/e-contact-editor.c:749
-#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1260
+#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1258
 msgid "FIXME: _Standard"
 msgstr "FIXME: Стандарт"
 
 #: addressbook/contact-editor/e-contact-editor.c:751
-#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1262
+#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1260
 msgid "FIXME: __Formatting"
 msgstr "FIXME: Форматирование"
 
 #: addressbook/contact-editor/e-contact-editor.c:754
-#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1265
+#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1263
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Настройка..."
 
 #: addressbook/contact-editor/e-contact-editor.c:759
-#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1270
+#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1268
 msgid "Pre_vious"
 msgstr "Пред."
 
 #: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1271
+#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1269
 msgid "Ne_xt"
 msgstr "След."
 
 #: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1275
+#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1273
 msgid "_Toolbars"
 msgstr "Панели инструментов"
 
 #: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1280
+#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1278
 msgid "FIXME: _File..."
 msgstr "FIXME: Файл..."
 
 #: addressbook/contact-editor/e-contact-editor.c:768
-#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1281
+#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1279
 msgid "FIXME: It_em..."
 msgstr "FIXME: Элемент..."
 
 #: addressbook/contact-editor/e-contact-editor.c:769
-#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1282
+#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1280
 msgid "FIXME: _Object..."
 msgstr "FIXME: Объект..."
 
 #: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1287
+#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1285
 msgid "FIXME: _Font..."
 msgstr "FIXME: Шрифт..."
 
 #: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1288
+#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1286
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Параграф..."
 
 #: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1295
+#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1293
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Конструкция этой формы"
 
 #: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1296
+#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1294
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Создать форму..."
 
 #: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1298
+#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1296
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Опубликовать форму..."
 
 #: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1299
+#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1297
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Опубликовать форму как..."
 
 #: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1301
+#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1299
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Отладчик скрипта"
 
 #: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1306
+#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1304
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Проверка правописания..."
 
 #: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1311
+#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1309
 msgid "_Forms"
 msgstr "Формы"
 
@@ -447,74 +448,72 @@ msgid "FIXME: Forward as _vCard"
 msgstr "FIXME: Переслать как vCard"
 
 #: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1324
+#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1322
 msgid "FIXME: For_ward"
 msgstr "FIXME: Переслать"
 
 #: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1337
+#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1335
 msgid "_Insert"
 msgstr "Вставить"
 
 #: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1338
+#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1336
 msgid "F_ormat"
 msgstr "Формат"
 
 #: addressbook/contact-editor/e-contact-editor.c:829
 #: addressbook/gui/component/addressbook.c:544
-#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1339
+#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1337
 msgid "_Tools"
 msgstr "Инструменты"
 
 #: addressbook/contact-editor/e-contact-editor.c:830
-#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1340
+#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1338
 msgid "Actio_ns"
 msgstr "Действия"
 
 #: addressbook/contact-editor/e-contact-editor.c:861
+#: calendar/gui/event-editor.c:1363
 msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
 #: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1379
 msgid "Save the appointment and close the dialog box"
 msgstr "Сохранить встречу и закрыть окно диалога"
 
 #: addressbook/contact-editor/e-contact-editor.c:866
-#: calendar/gui/calendar-commands.c:656
+#: calendar/gui/calendar-commands.c:652
 msgid "Print..."
 msgstr "Печать..."
 
 #: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1384
+#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1381
 msgid "Print this item"
 msgstr "Печать этого элемента"
 
 #: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1385
+#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1386
 msgid "FIXME: Insert File..."
 msgstr "FIXME: Вставить файл..."
 
 #: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1386
+#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1387
 msgid "Insert a file as an attachment"
 msgstr "Вставить файл как вложение"
 
-#. Delete
 #: addressbook/contact-editor/e-contact-editor.c:874
 #: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/e-calendar-table.c:323
-#: calendar/gui/event-editor-dialog.glade.h:92 calendar/gui/gncal-todo.c:550
-#: mail/folder-browser-factory.c:50 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:160
+#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/event-editor-dialog.glade.h:92
+#: calendar/gui/event-editor.c:1368 mail/folder-browser-factory.c:51
+#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:24 mail/mail-view.c:160
 msgid "Delete"
 msgstr "Удалить"
 
 #: addressbook/contact-editor/e-contact-editor.c:875
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1395
-#: calendar/gui/gncal-todo.c:378
+#: calendar/gui/dialogs/task-editor.c:426
 msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
@@ -529,22 +528,22 @@ msgid "Go to the previous item"
 msgstr "Перейти к предыдущему элементу"
 
 #: addressbook/contact-editor/e-contact-editor.c:882
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1399
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1400
 msgid "FIXME: Next"
 msgstr "FIXME: След."
 
 #: addressbook/contact-editor/e-contact-editor.c:883
-#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1400
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1401
 msgid "Go to the next item"
 msgstr "Перейти к следующему элементу"
 
 #: addressbook/contact-editor/e-contact-editor.c:886
-#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1401
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1403
 msgid "FIXME: Help"
 msgstr "FIXME: Справка"
 
 #: addressbook/contact-editor/e-contact-editor.c:887
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1402
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1404
 msgid "See online help"
 msgstr "Просмотр справки в сети"
 
@@ -857,7 +856,7 @@ msgstr ""
 "Esq.\n"
 
 #: addressbook/gui/component/addressbook.c:436
-#: calendar/gui/calendar-commands.c:513 notes/component-factory.c:27
+#: calendar/gui/calendar-commands.c:526 notes/component-factory.c:27
 msgid "New"
 msgstr "Новый"
 
@@ -874,7 +873,7 @@ msgid "Find a contact"
 msgstr "Найти контакт"
 
 #: addressbook/gui/component/addressbook.c:441
-#: calendar/gui/calendar-commands.c:518 mail/folder-browser-factory.c:48
+#: calendar/gui/calendar-commands.c:531 mail/folder-browser-factory.c:49
 #: mail/mail-view.c:158
 msgid "Print"
 msgstr "Печать"
@@ -1151,7 +1150,7 @@ msgstr ""
 
 #. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
 #: addressbook/gui/search/e-addressbook-search-dialog.c:150
-#: mail/folder-browser.c:377
+#: mail/folder-browser.c:397
 msgid "Search"
 msgstr "Поиск"
 
@@ -1353,22 +1352,22 @@ msgstr "Кондуит календаря Gpilotd"
 msgid "Configuration utility for the calendar conduit.\n"
 msgstr "Средство настройки для кондуита календаря.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:399
-#: calendar/conduits/calendar/calendar-conduit.c:1109
+#: calendar/conduits/calendar/calendar-conduit.c:398
+#: calendar/conduits/calendar/calendar-conduit.c:1111
 #: calendar/conduits/todo/todo-conduit.c:443
 #: calendar/conduits/todo/todo-conduit.c:1025
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/conduits/calendar/calendar-conduit.c:776
 #: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/calendar/calendar-conduit.c:780
 #: calendar/conduits/todo/todo-conduit.c:707
 #: calendar/conduits/todo/todo-conduit.c:709
 msgid "Could not start gnomecal server"
 msgstr "Не удалось запустить сервер gnomecal"
 
-#: calendar/conduits/calendar/calendar-conduit.c:806
-#: calendar/conduits/calendar/calendar-conduit.c:809
+#: calendar/conduits/calendar/calendar-conduit.c:808
+#: calendar/conduits/calendar/calendar-conduit.c:811
 msgid "Could not read pilot's DateBook application block"
 msgstr "Невозможно прочесть блок приложения книги данных Пилота"
 
@@ -1433,141 +1432,140 @@ msgstr "Календарь Gnome"
 msgid "The GNOME personal calendar and schedule manager."
 msgstr "Личный календарь и диспетчер расписания Gnome."
 
-#: calendar/gui/calendar-commands.c:401 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:412 tests/ui-tests/message-browser.c:676
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: calendar/gui/calendar-commands.c:425
+#: calendar/gui/calendar-commands.c:436
 msgid "Open calendar"
 msgstr "Открыть календарь"
 
-#: calendar/gui/calendar-commands.c:464
+#: calendar/gui/calendar-commands.c:475
 msgid "Save calendar"
 msgstr "Сохранить календарь"
 
-#: calendar/gui/calendar-commands.c:491 calendar/gui/gncal-todo.c:765
-#: calendar/gui/gncal-todo.c:769
+#: calendar/gui/calendar-commands.c:504
 msgid "Day"
 msgstr "День"
 
-#: calendar/gui/calendar-commands.c:491
+#: calendar/gui/calendar-commands.c:504
 msgid "Show 1 day"
 msgstr "Показать 1 день"
 
-#: calendar/gui/calendar-commands.c:494
+#: calendar/gui/calendar-commands.c:507
 msgid "5 Days"
 msgstr "5 дней"
 
-#: calendar/gui/calendar-commands.c:494
+#: calendar/gui/calendar-commands.c:507
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: calendar/gui/calendar-commands.c:497 calendar/gui/gncal-todo.c:764
+#: calendar/gui/calendar-commands.c:510
 msgid "Week"
 msgstr "Неделя"
 
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:510
 msgid "Show 1 week"
 msgstr "Показать 1 неделю"
 
-#: calendar/gui/calendar-commands.c:500
+#: calendar/gui/calendar-commands.c:513
 msgid "Month"
 msgstr "Месяц"
 
-#: calendar/gui/calendar-commands.c:500
+#: calendar/gui/calendar-commands.c:513
 msgid "Show 1 month"
 msgstr "Показать 1 месяц"
 
-#: calendar/gui/calendar-commands.c:504
+#: calendar/gui/calendar-commands.c:517
 msgid "Year"
 msgstr "Год"
 
-#: calendar/gui/calendar-commands.c:504
+#: calendar/gui/calendar-commands.c:517
 msgid "Show 1 year"
 msgstr "Показать 1 год"
 
-#: calendar/gui/calendar-commands.c:513 calendar/gui/calendar-commands.c:665
+#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:661
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/calendar-commands.c:518 calendar/gui/calendar-commands.c:657
+#: calendar/gui/calendar-commands.c:531 calendar/gui/calendar-commands.c:653
 msgid "Print this calendar"
 msgstr "Напечатать этот календарь"
 
-#: calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:535
 msgid "Prev"
 msgstr "Пред."
 
-#: calendar/gui/calendar-commands.c:522
+#: calendar/gui/calendar-commands.c:535
 msgid "Go back in time"
 msgstr "Перейти в прошлое"
 
-#: calendar/gui/calendar-commands.c:523
+#: calendar/gui/calendar-commands.c:536
 msgid "Today"
 msgstr "Сегодня"
 
-#: calendar/gui/calendar-commands.c:523
+#: calendar/gui/calendar-commands.c:536
 msgid "Go to present time"
 msgstr "Перейти к настоящему"
 
-#: calendar/gui/calendar-commands.c:524
+#: calendar/gui/calendar-commands.c:537
 msgid "Next"
 msgstr "След."
 
-#: calendar/gui/calendar-commands.c:524
+#: calendar/gui/calendar-commands.c:537
 msgid "Go forward in time"
 msgstr "Перейти в будущее"
 
-#: calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:541
 msgid "Go to"
 msgstr "Перейти"
 
-#: calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:541
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
 #. file menu
-#: calendar/gui/calendar-commands.c:642
+#: calendar/gui/calendar-commands.c:638
 msgid "New Ca_lendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-commands.c:643
+#: calendar/gui/calendar-commands.c:639
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
-#: calendar/gui/calendar-commands.c:646
+#: calendar/gui/calendar-commands.c:642
 msgid "Open Ca_lendar"
 msgstr "Открыть календарь"
 
-#: calendar/gui/calendar-commands.c:647
+#: calendar/gui/calendar-commands.c:643
 msgid "Open a calendar"
 msgstr "Открыть календарь"
 
-#: calendar/gui/calendar-commands.c:651 calendar/gui/calendar-commands.c:652
+#: calendar/gui/calendar-commands.c:647 calendar/gui/calendar-commands.c:648
 msgid "Save Calendar As"
 msgstr "Сохранить календарь как"
 
-#: calendar/gui/calendar-commands.c:665
+#: calendar/gui/calendar-commands.c:661
 msgid "_New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/calendar-commands.c:673 calendar/gui/prop.c:718
+#: calendar/gui/calendar-commands.c:669 calendar/gui/prop.c:718
 msgid "Preferences"
 msgstr "Настройки"
 
-#: calendar/gui/calendar-commands.c:680 calendar/gui/calendar-commands.c:681
+#: calendar/gui/calendar-commands.c:676 calendar/gui/calendar-commands.c:677
 msgid "About Calendar"
 msgstr "О программе \"Календарь\""
 
 #. i18n: This "%s%s" indicates possession. Languages where the order is
 #. * the inverse should translate it to "%2$s%1$s".
 #.
-#: calendar/gui/calendar-commands.c:723
+#: calendar/gui/calendar-commands.c:719
 #, c-format
 msgid "%s%s"
 msgstr "%s%s"
 
-#: calendar/gui/calendar-commands.c:723
+#: calendar/gui/calendar-commands.c:719
 msgid "'s calendar"
 msgstr "' календарь"
 
@@ -1663,10 +1661,11 @@ msgstr "Итог не доступен."
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: calendar/gui/event-editor.c:1373
 msgid "Close"
 msgstr "Закрыть"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1086
+#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1168
 msgid "Snooze"
 msgstr "Короткий сон"
 
@@ -1678,7 +1677,7 @@ msgstr "Правка встречи"
 msgid "Snooze time (minutes)"
 msgstr "Время дремания (минут)"
 
-#: calendar/gui/dialogs/task-editor.c:245 calendar/gui/event-editor.c:1206
+#: calendar/gui/dialogs/task-editor.c:245
 msgid "FIXME: _Delete"
 msgstr "FIXME: Удалить"
 
@@ -1687,11 +1686,11 @@ msgstr "FIXME: Удалить"
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Невыполненное Задание"
 
-#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1308
+#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1306
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Проверка имен"
 
-#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1309
+#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1307
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Адресная книга..."
 
@@ -1707,7 +1706,7 @@ msgstr "FIXME: Отправить отчет о состоянии"
 msgid "FIXME: _Mark Complete"
 msgstr "FIXME: Пометить как выполненное"
 
-#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1318
+#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1316
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Повторение..."
 
@@ -1727,7 +1726,7 @@ msgstr "FIXME: Ответить"
 msgid "FIXME: Reply to A_ll"
 msgstr "FIXME: Ответить всем"
 
-#: calendar/gui/dialogs/task-editor.c:409 calendar/gui/event-editor.c:1378
+#: calendar/gui/dialogs/task-editor.c:409
 msgid "FIXME: Save and Close"
 msgstr "FIXME: Сохранить и закрыть"
 
@@ -1735,15 +1734,15 @@ msgstr "FIXME: Сохранить и закрыть"
 msgid "Save the task and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1383
+#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1380
 msgid "FIXME: Print..."
 msgstr "FIXME: Печать..."
 
-#: calendar/gui/dialogs/task-editor.c:419 calendar/gui/event-editor.c:1388
+#: calendar/gui/dialogs/task-editor.c:419
 msgid "FIXME: Recurrence..."
 msgstr "FIXME: Повторение..."
 
-#: calendar/gui/dialogs/task-editor.c:420 calendar/gui/event-editor.c:1389
+#: calendar/gui/dialogs/task-editor.c:420
 msgid "Configure recurrence rules"
 msgstr "Настройка правил повторения"
 
@@ -1755,7 +1754,7 @@ msgstr "FIXME: Назначить задание..."
 msgid "Assign the task to someone"
 msgstr "Назначить задание кому-либо"
 
-#: calendar/gui/dialogs/task-editor.c:425 calendar/gui/event-editor.c:1394
+#: calendar/gui/dialogs/task-editor.c:425
 msgid "FIXME: Delete"
 msgstr "FIXME: Удалить"
 
@@ -1880,12 +1879,12 @@ msgstr "Географическое положение"
 msgid "Percent complete"
 msgstr "Процент выполненного"
 
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/gncal-todo.c:478
-#: calendar/gui/prop.c:611 mail/message-list.c:508
+#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
+#: mail/message-list.c:508
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.c:212 calendar/gui/gncal-todo.c:476
+#: calendar/gui/e-calendar-table.c:212
 msgid "Summary"
 msgstr "Итого"
 
@@ -1901,23 +1900,23 @@ msgstr "URL"
 msgid "Alarms"
 msgstr "Таймеры"
 
-#: calendar/gui/e-calendar-table.c:317
+#: calendar/gui/e-calendar-table.c:318
 msgid "Open..."
 msgstr "Открыть..."
 
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:319
 msgid "Open the task"
 msgstr "Открыть задание"
 
-#: calendar/gui/e-calendar-table.c:320
+#: calendar/gui/e-calendar-table.c:321
 msgid "Mark Complete"
 msgstr "Пометить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:322
 msgid "Mark the task complete"
 msgstr "Пометить задание как выполненное"
 
-#: calendar/gui/e-calendar-table.c:324
+#: calendar/gui/e-calendar-table.c:325
 msgid "Delete the task"
 msgstr "Удалить задание"
 
@@ -1926,85 +1925,94 @@ msgstr "Удалить задание"
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2334 calendar/gui/e-day-view.c:2341
-#: calendar/gui/e-day-view.c:2350 calendar/gui/e-week-view.c:2681
-#: calendar/gui/e-week-view.c:2688 calendar/gui/e-week-view.c:2697
+#: calendar/gui/e-day-view.c:2510 calendar/gui/e-day-view.c:2517
+#: calendar/gui/e-day-view.c:2526 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-week-view.c:2951 calendar/gui/e-week-view.c:2960
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:2338 calendar/gui/e-day-view.c:2345
-#: calendar/gui/e-week-view.c:2685 calendar/gui/e-week-view.c:2692
+#: calendar/gui/e-day-view.c:2514 calendar/gui/e-day-view.c:2521
+#: calendar/gui/e-week-view.c:2948 calendar/gui/e-week-view.c:2955
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:2339 calendar/gui/e-week-view.c:2686
+#: calendar/gui/e-day-view.c:2515 calendar/gui/e-week-view.c:2949
+#: calendar/gui/event-editor.c:1369
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:2346 calendar/gui/e-week-view.c:2693
+#: calendar/gui/e-day-view.c:2522 calendar/gui/e-week-view.c:2956
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:2347 calendar/gui/e-week-view.c:2694
+#: calendar/gui/e-day-view.c:2523 calendar/gui/e-week-view.c:2957
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:2348 calendar/gui/e-week-view.c:2695
+#: calendar/gui/e-day-view.c:2524 calendar/gui/e-week-view.c:2958
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
-#: calendar/gui/event-editor.c:293
+#: calendar/gui/event-editor.c:277
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/event-editor.c:299
+#: calendar/gui/event-editor.c:283
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/event-editor.c:305
+#: calendar/gui/event-editor.c:289
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/event-editor.c:308
+#: calendar/gui/event-editor.c:292
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/event-editor.c:311
+#: calendar/gui/event-editor.c:295
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
 
-#: calendar/gui/event-editor.c:1273
+#: calendar/gui/event-editor.c:1271
 msgid "FIXME: Ca_lendar..."
 msgstr "FIXME: Календарь..."
 
-#: calendar/gui/event-editor.c:1316
+#: calendar/gui/event-editor.c:1314
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: Новая встреча"
 
-#: calendar/gui/event-editor.c:1320
+#: calendar/gui/event-editor.c:1318
 msgid "FIXME: Invite _Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1321
+#: calendar/gui/event-editor.c:1319
 msgid "FIXME: C_ancel Invitation..."
 msgstr "FIXME: Отмена приглашения..."
 
-#: calendar/gui/event-editor.c:1323
+#: calendar/gui/event-editor.c:1321
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Переслать как v_Calendar"
 
-#: calendar/gui/event-editor.c:1391
+#: calendar/gui/event-editor.c:1364
+msgid "Save and close this appointment"
+msgstr "Сохранить и закрыть эту встречу"
+
+#: calendar/gui/event-editor.c:1374
+msgid "Close this appointment"
+msgstr "Закрыть эту встречу"
+
+#: calendar/gui/event-editor.c:1390
 msgid "FIXME: Invite Attendees..."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1392
+#: calendar/gui/event-editor.c:1391
 msgid "Invite attendees to a meeting"
 msgstr "Пригласить посетителей на встречу"
 
-#: calendar/gui/event-editor.c:1835
+#: calendar/gui/event-editor.c:1930
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -2109,7 +2117,7 @@ msgstr "Напоминание"
 msgid "Recurrence rule"
 msgstr "Правило повторения"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:891
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:937
 msgid "None"
 msgstr "Нет"
 
@@ -2494,101 +2502,37 @@ msgstr "двенадцатый"
 msgid "ago"
 msgstr "назад"
 
-#: calendar/gui/gncal-todo.c:167
+#: calendar/gui/gncal-todo.c:139
 msgid "Create to-do item"
 msgstr "Создать задание"
 
-#: calendar/gui/gncal-todo.c:167
+#: calendar/gui/gncal-todo.c:139
 msgid "Edit to-do item"
 msgstr "Правка задания"
 
-#: calendar/gui/gncal-todo.c:203
+#: calendar/gui/gncal-todo.c:175
 msgid "Summary:"
 msgstr "Итог:"
 
-#: calendar/gui/gncal-todo.c:214
+#: calendar/gui/gncal-todo.c:186
 msgid "Due Date:"
 msgstr "Условленная дата:"
 
-#: calendar/gui/gncal-todo.c:225
+#: calendar/gui/gncal-todo.c:197
 msgid "Priority:"
 msgstr "Приоритет:"
 
-#: calendar/gui/gncal-todo.c:243
+#: calendar/gui/gncal-todo.c:215
 msgid "Item Comments:"
 msgstr "Комментарии элемента:"
 
-#: calendar/gui/gncal-todo.c:376
-msgid "Add to-do item..."
-msgstr "Добавить задание..."
-
-#: calendar/gui/gncal-todo.c:377
-msgid "Edit this item..."
-msgstr "Правка этого элемента..."
-
-#: calendar/gui/gncal-todo.c:477 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Условленная дата"
-
-#: calendar/gui/gncal-todo.c:479
-msgid "Time Left"
-msgstr "Оставшееся время"
-
-#. Label
-#: calendar/gui/gncal-todo.c:491
-msgid "To-do list"
-msgstr "Список заданий"
-
-#. Add
-#: calendar/gui/gncal-todo.c:530
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Добавить..."
-
-#. Edit
-#: calendar/gui/gncal-todo.c:539
-msgid "Edit..."
-msgstr "Правка..."
-
-#: calendar/gui/gncal-todo.c:764
-msgid "Weeks"
-msgstr "Недели"
-
-#: calendar/gui/gncal-todo.c:765 calendar/gui/gncal-todo.c:769
-msgid "Days"
-msgstr "Дни"
-
-#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
-msgid "Hours"
-msgstr "Часы"
-
-#: calendar/gui/gncal-todo.c:770 calendar/gui/gncal-todo.c:774
-msgid "Hour"
-msgstr "Час"
-
-#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
-msgid "Minutes"
-msgstr "Минуты"
-
-#: calendar/gui/gncal-todo.c:775 calendar/gui/gncal-todo.c:779
-msgid "Minute"
-msgstr "Минута"
-
-#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
-msgid "Seconds"
-msgstr "Секунды"
-
-#: calendar/gui/gncal-todo.c:780 calendar/gui/gncal-todo.c:784
-msgid "Second"
-msgstr "Секунда"
-
-#: calendar/gui/gnome-cal.c:458 calendar/gui/gnome-cal.c:1094
-#: calendar/gui/gnome-cal.c:1150
+#: calendar/gui/gnome-cal.c:559 calendar/gui/gnome-cal.c:1176
+#: calendar/gui/gnome-cal.c:1232
 msgid "Reminder of your appointment at "
 msgstr "Напоминание о вашей встрече в "
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1099 calendar/gui/gnome-cal.c:1154
+#: calendar/gui/gnome-cal.c:1181 calendar/gui/gnome-cal.c:1236
 msgid "Ok"
 msgstr "Ок"
 
@@ -2886,6 +2830,10 @@ msgstr "Цвета"
 msgid "Show on TODO List:"
 msgstr "Показать в списке заданий:"
 
+#: calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Условленная дата"
+
 #: calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Время до условленного"
@@ -2940,34 +2888,34 @@ msgstr "Разрешить краткий сон для "
 msgid "Defaults"
 msgstr "Исх.значения"
 
-#: composer/e-msg-composer-address-dialog.c:182
+#: composer/e-msg-composer-address-dialog.c:186
 msgid "Cut"
 msgstr "Вырезать"
 
-#: composer/e-msg-composer-address-dialog.c:183
+#: composer/e-msg-composer-address-dialog.c:187
 msgid "Cut selected item into clipboard"
 msgstr "Вырезает выделенный элемент в буфер обмена"
 
-#: composer/e-msg-composer-address-dialog.c:186
-#: mail/folder-browser-factory.c:46
+#: composer/e-msg-composer-address-dialog.c:190
+#: mail/folder-browser-factory.c:47
 msgid "Copy"
 msgstr "Скопировать"
 
-#: composer/e-msg-composer-address-dialog.c:187
+#: composer/e-msg-composer-address-dialog.c:191
 msgid "Copy selected item into clipboard"
 msgstr "Копирует выделенный элемент в буфер обмена"
 
-#: composer/e-msg-composer-address-dialog.c:190
-#: composer/e-msg-composer-address-dialog.c:198
+#: composer/e-msg-composer-address-dialog.c:194
+#: composer/e-msg-composer-address-dialog.c:202
 msgid "Paste"
 msgstr "Вставить"
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
+#: composer/e-msg-composer-address-dialog.c:195
+#: composer/e-msg-composer-address-dialog.c:203
 msgid "Paste item from clipboard"
 msgstr "Вставить элемент из буфера обмена"
 
-#: composer/e-msg-composer-address-dialog.c:525
+#: composer/e-msg-composer-address-dialog.c:529
 msgid "Select recipients' addresses"
 msgstr "Выбрать адреса получателей"
 
@@ -2997,6 +2945,10 @@ msgstr "Адрес"
 msgid "Properties..."
 msgstr "Свойства..."
 
+#: composer/e-msg-composer-address-dialog.glade.h:13
+msgid "Add..."
+msgstr "Добавить..."
+
 #: composer/e-msg-composer-address-dialog.glade.h:14
 msgid "To: >>"
 msgstr "Кому: >>"
@@ -3170,23 +3122,23 @@ msgstr ""
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:746
+#: composer/e-msg-composer.c:753
 msgid "That file does not exist."
 msgstr "Этот файл не существует."
 
-#: composer/e-msg-composer.c:756
+#: composer/e-msg-composer.c:763
 msgid "That is not a regular file."
 msgstr "Это не обычный файл."
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:773
 msgid "That file exists but is not readable."
 msgstr "Этот файл существует, но не читается."
 
-#: composer/e-msg-composer.c:776
+#: composer/e-msg-composer.c:783
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Файл выглядит доступным, но произошел сбой open(2)."
 
-#: composer/e-msg-composer.c:798
+#: composer/e-msg-composer.c:805
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3194,116 +3146,124 @@ msgstr ""
 "Файл очень большой (больше 100К).\n"
 "Вы уверены, что хотите вставить его?"
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:826
 msgid "An error occurred while reading the file."
 msgstr "При чтении файла возникла ошибка."
 
-#: composer/e-msg-composer.c:915 shell/e-shell-view-menu.c:434
+#: composer/e-msg-composer.c:922 shell/e-shell-view-menu.c:434
 msgid "_File"
 msgstr "Файл"
 
-#: composer/e-msg-composer.c:921
+#: composer/e-msg-composer.c:928
 msgid "_Open..."
 msgstr "Открыть..."
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:929
 msgid "Load a previously saved message"
 msgstr "Загрузить ранее сохраненное сообщение"
 
-#: composer/e-msg-composer.c:930
+#: composer/e-msg-composer.c:937
 msgid "_Save..."
 msgstr "Cохранить..."
 
-#: composer/e-msg-composer.c:931
+#: composer/e-msg-composer.c:938
 msgid "Save message"
 msgstr "Сохранить сообщение"
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:946
 msgid "_Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:940
+#: composer/e-msg-composer.c:947
 msgid "Save message with a different name"
 msgstr "Сохранить сообщение c другим названием"
 
-#: composer/e-msg-composer.c:948
+#: composer/e-msg-composer.c:955
 msgid "Save in _folder..."
 msgstr "Сохранить в папке..."
 
-#: composer/e-msg-composer.c:949
+#: composer/e-msg-composer.c:956
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: composer/e-msg-composer.c:958
+#: composer/e-msg-composer.c:965
 msgid "_Insert text file... (FIXME)"
 msgstr "Вставить текстовый файл... (FIXME)"
 
-#: composer/e-msg-composer.c:959
+#: composer/e-msg-composer.c:966
 msgid "Insert a file as text into the message"
 msgstr "Вставить файл в сообщение как текст"
 
-#: composer/e-msg-composer.c:968
-msgid "_Send"
-msgstr "Отправить"
+#: composer/e-msg-composer.c:975
+msgid "Send _Now"
+msgstr "Отправить сейчас"
+
+#: composer/e-msg-composer.c:976
+msgid "Send the message now"
+msgstr "Отправить это сообщение сейчас"
+
+#: composer/e-msg-composer.c:984
+msgid "Send _Later"
+msgstr "Отправить позже"
 
-#: composer/e-msg-composer.c:969
-msgid "Send the message"
-msgstr "Отправить сообщение"
+#: composer/e-msg-composer.c:985
+msgid "Send the message later"
+msgstr "Отправить это сообщение позже"
 
-#: composer/e-msg-composer.c:979
+#: composer/e-msg-composer.c:995
 msgid "_Close..."
 msgstr "Закрыть..."
 
-#: composer/e-msg-composer.c:980
+#: composer/e-msg-composer.c:996
 msgid "Quit the message composer"
 msgstr "Выйти из редактора сообщений"
 
-#: composer/e-msg-composer.c:993 shell/e-shell-view-menu.c:478
+#: composer/e-msg-composer.c:1009 shell/e-shell-view-menu.c:478
 msgid "_Edit"
 msgstr "Правка"
 
-#: composer/e-msg-composer.c:1004
+#: composer/e-msg-composer.c:1020
 msgid "_Format"
 msgstr "Формат"
 
-#: composer/e-msg-composer.c:1010
+#: composer/e-msg-composer.c:1026
 msgid "HTML"
 msgstr "HTML"
 
-#: composer/e-msg-composer.c:1011
+#: composer/e-msg-composer.c:1027
 msgid "Send the mail in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: composer/e-msg-composer.c:1024 shell/e-shell-view-menu.c:383
+#: composer/e-msg-composer.c:1040 shell/e-shell-view-menu.c:383
 #: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:221
 msgid "_View"
 msgstr "Просмотр"
 
-#: composer/e-msg-composer.c:1030
+#: composer/e-msg-composer.c:1046
 msgid "Show _attachments"
 msgstr "Показать вложения"
 
-#: composer/e-msg-composer.c:1031
+#: composer/e-msg-composer.c:1047
 msgid "Show/hide attachments"
 msgstr "Показать/скрыть вложения"
 
-#: composer/e-msg-composer.c:1064
+#: composer/e-msg-composer.c:1080
 msgid "Send"
 msgstr "Отправить"
 
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1081
 msgid "Send this message"
 msgstr "Отправить это сообщение"
 
-#: composer/e-msg-composer.c:1074
+#: composer/e-msg-composer.c:1090
 msgid "Attach"
 msgstr "Присоединить"
 
-#: composer/e-msg-composer.c:1075
+#: composer/e-msg-composer.c:1091
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1278
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
@@ -3426,182 +3386,182 @@ msgstr "Правка правила подсчета"
 msgid "Edit VFolder Rule"
 msgstr "Правка правила вирт.папки"
 
-#: mail/component-factory.c:187
+#: mail/component-factory.c:191
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
 #: mail/folder-browser-factory.c:33
-msgid "Get mail"
+msgid "Get Mail"
 msgstr "Получить почту"
 
 #: mail/folder-browser-factory.c:33
-msgid "Check for new mail"
-msgstr "Проверить почтовый ящик"
+msgid "Send queued mail and retrieve new mail"
+msgstr "Послать почту из очереди и получить новую почту"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:35
 msgid "Compose"
 msgstr "Создать"
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser-factory.c:35
 msgid "Compose a new message"
 msgstr "Создать новое сообщение"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:148
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:148
+#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:151
+#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:151
+#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
 msgid "Reply to all recipients of this message"
 msgstr "Ответить всем получателям этого сообщения"
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:154
+#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
 msgid "Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:154
+#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
 msgid "Forward this message"
 msgstr "Переслать это сообщение"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:46
 msgid "Move"
 msgstr "Перенести"
 
-#: mail/folder-browser-factory.c:45
+#: mail/folder-browser-factory.c:46
 msgid "Move message to a new folder"
 msgstr "Переместить сообщение в новую папку"
 
-#: mail/folder-browser-factory.c:46
+#: mail/folder-browser-factory.c:47
 msgid "Copy message to a new folder"
 msgstr "Скопировать сообщение в новую папку"
 
-#: mail/folder-browser-factory.c:48 mail/mail-view.c:158
+#: mail/folder-browser-factory.c:49 mail/mail-view.c:158
 msgid "Print the selected message"
 msgstr "Распечатать выделенное сообщение"
 
-#: mail/folder-browser-factory.c:50 mail/mail-view.c:160
+#: mail/folder-browser-factory.c:51 mail/mail-view.c:160
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/folder-browser-factory.c:71
+#: mail/folder-browser-factory.c:72
 #, c-format
 msgid "Run filter \"%s\""
 msgstr "Применить фильтр \"%s\""
 
-#: mail/folder-browser-factory.c:129 mail/folder-browser-factory.c:187
+#: mail/folder-browser-factory.c:130 mail/folder-browser-factory.c:189
 msgid "_Print Message"
 msgstr "Печать сообщения"
 
-#: mail/folder-browser-factory.c:139
+#: mail/folder-browser-factory.c:140
 msgid "_Threaded Message List"
 msgstr "Список подшитых сообщений"
 
-#: mail/folder-browser-factory.c:150
+#: mail/folder-browser-factory.c:151
 msgid "Mail _Filters..."
 msgstr "Почтовые фильтры ..."
 
-#: mail/folder-browser-factory.c:155
+#: mail/folder-browser-factory.c:156
 msgid "_Virtual Folder Editor..."
 msgstr "Редактор виртуальных папок ..."
 
-#: mail/folder-browser-factory.c:160
+#: mail/folder-browser-factory.c:161
 msgid "_Mail Configuration..."
 msgstr "Настройка почты ..."
 
-#: mail/folder-browser-factory.c:165
+#: mail/folder-browser-factory.c:166
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: mail/folder-browser-factory.c:173
+#: mail/folder-browser-factory.c:174
 msgid "_Message"
 msgstr "Сообщение"
 
-#: mail/folder-browser-factory.c:177
+#: mail/folder-browser-factory.c:178
 msgid "_Open in New Window"
 msgstr "Открыть в новом окне"
 
-#: mail/folder-browser-factory.c:182
+#: mail/folder-browser-factory.c:184
 msgid "_Edit Message"
 msgstr "Правка сообщения"
 
-#: mail/folder-browser-factory.c:194
+#: mail/folder-browser-factory.c:196
 msgid "Reply to _Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser-factory.c:199
+#: mail/folder-browser-factory.c:201
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser-factory.c:204
+#: mail/folder-browser-factory.c:206
 msgid "_Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser-factory.c:211
+#: mail/folder-browser-factory.c:213
 msgid "_Delete Message"
 msgstr "Удалить сообщение"
 
-#: mail/folder-browser-factory.c:216
+#: mail/folder-browser-factory.c:218
 msgid "_Move Message"
 msgstr "Переместить сообщение"
 
-#: mail/folder-browser-factory.c:221
+#: mail/folder-browser-factory.c:223
 msgid "_Copy Message"
 msgstr "Скопировать сообщение"
 
-#: mail/folder-browser-factory.c:228
+#: mail/folder-browser-factory.c:230
 msgid "_VFolder on Subject"
 msgstr "Вирт.папка по теме"
 
-#: mail/folder-browser-factory.c:233
+#: mail/folder-browser-factory.c:235
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: mail/folder-browser-factory.c:238
+#: mail/folder-browser-factory.c:240
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: mail/folder-browser-factory.c:245
+#: mail/folder-browser-factory.c:247
 msgid "_Filter on Subject"
 msgstr "Фильтр по теме"
 
-#: mail/folder-browser-factory.c:250
+#: mail/folder-browser-factory.c:252
 msgid "Fi_lter on Sender"
 msgstr "Фильтр по отправителю"
 
-#: mail/folder-browser-factory.c:255
+#: mail/folder-browser-factory.c:257
 msgid "Filter on Rec_ipients"
 msgstr "Фильтр по получателю"
 
-#: mail/folder-browser-factory.c:262
+#: mail/folder-browser-factory.c:264
 msgid "F_older"
 msgstr "Папка"
 
-#: mail/folder-browser-factory.c:266
+#: mail/folder-browser-factory.c:268
 msgid "_Mark all as Read"
 msgstr "Пометить все как прочтенное"
 
-#: mail/folder-browser-factory.c:271
+#: mail/folder-browser-factory.c:273
 msgid "_Delete all"
 msgstr "Удалить все"
 
-#: mail/folder-browser-factory.c:276
+#: mail/folder-browser-factory.c:278
 msgid "_Expunge"
 msgstr "Вычеркнуть"
 
-#: mail/folder-browser-factory.c:281
+#: mail/folder-browser-factory.c:283
 msgid "_Configure Folder"
 msgstr "Настроить папку"
 
-#: mail/folder-browser.c:380
+#: mail/folder-browser.c:400
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3629,7 +3589,7 @@ msgstr ""
 "Вы должны настроить передачу почты\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:230
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3637,15 +3597,15 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: mail/mail-callbacks.c:415
+#: mail/mail-callbacks.c:480
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:417
+#: mail/mail-callbacks.c:482
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:551
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3653,7 +3613,7 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:576
+#: mail/mail-callbacks.c:642
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3662,7 +3622,7 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-config-gui.c:435
+#: mail/mail-config-gui.c:434
 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 "
@@ -3672,59 +3632,59 @@ msgstr ""
 "почты. Вы можете также, дополнительно, ввести название вашей организации и "
 "название файла, в котором хранится ваша подпись."
 
-#: mail/mail-config-gui.c:448
+#: mail/mail-config-gui.c:447
 msgid "Full name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config-gui.c:472
+#: mail/mail-config-gui.c:471
 msgid "Email address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config-gui.c:487
+#: mail/mail-config-gui.c:486
 msgid "Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config-gui.c:498
+#: mail/mail-config-gui.c:497
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config-gui.c:503 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:502 mail/mail-config.glade.h:10
 msgid "Signature File"
 msgstr "Файл подписи"
 
-#: mail/mail-config-gui.c:930
+#: mail/mail-config-gui.c:929
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config-gui.c:933
+#: mail/mail-config-gui.c:932
 msgid "Port:"
 msgstr "Порт:"
 
-#: mail/mail-config-gui.c:938
+#: mail/mail-config-gui.c:937
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config-gui.c:944
+#: mail/mail-config-gui.c:943
 msgid "Path:"
 msgstr "Путь:"
 
-#: mail/mail-config-gui.c:952
+#: mail/mail-config-gui.c:951
 msgid "Authentication:"
 msgstr "Идентификация:"
 
-#: mail/mail-config-gui.c:964
+#: mail/mail-config-gui.c:963
 msgid "Detect supported types..."
 msgstr "Определить поддерживаемые типы..."
 
-#: mail/mail-config-gui.c:989
+#: mail/mail-config-gui.c:988
 msgid "Don't delete messages from server"
 msgstr "Не удалять сообщения с сервера"
 
-#: mail/mail-config-gui.c:1001
+#: mail/mail-config-gui.c:1000
 msgid "Test Settings"
 msgstr "Установки теста"
 
-#: mail/mail-config-gui.c:1133 mail/mail-config-gui.c:1181
+#: mail/mail-config-gui.c:1132 mail/mail-config-gui.c:1180
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3738,7 +3698,7 @@ msgstr ""
 "Если сервер требует идентификации, то щелкните на кнопке \"Определить "
 "поддерживаемые типы...\" после ввода остальной информации."
 
-#: mail/mail-config-gui.c:1157
+#: mail/mail-config-gui.c:1156
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3752,35 +3712,35 @@ msgstr ""
 "Если сервер требует идентификации, вы можете щелкнуть на кнопке \"Определить "
 "поддерживаемые типы...\" после ввода остальной информации."
 
-#: mail/mail-config-gui.c:1176
+#: mail/mail-config-gui.c:1175
 msgid "Mail transport type:"
 msgstr "Тип передачи почты:"
 
-#: mail/mail-config-gui.c:1231
+#: mail/mail-config-gui.c:1230
 msgid "Add Identity"
 msgstr "Добавить именование"
 
-#: mail/mail-config-gui.c:1233
+#: mail/mail-config-gui.c:1232
 msgid "Edit Identity"
 msgstr "Правка именования"
 
-#: mail/mail-config-gui.c:1325
+#: mail/mail-config-gui.c:1324
 msgid "Add Source"
 msgstr "Добавить источник"
 
-#: mail/mail-config-gui.c:1327
+#: mail/mail-config-gui.c:1326
 msgid "Edit Source"
 msgstr "Правка источника"
 
-#: mail/mail-config-gui.c:1422
+#: mail/mail-config-gui.c:1421
 msgid "Add News Server"
 msgstr "Добавить сервер новостей"
 
-#: mail/mail-config-gui.c:1424
+#: mail/mail-config-gui.c:1423
 msgid "Edit News Server"
 msgstr "Правка сервера новостей"
 
-#: mail/mail-config-gui.c:2291
+#: mail/mail-config-gui.c:2294
 msgid "The connection was successful!"
 msgstr "Соединение было успешным!"
 
@@ -3919,217 +3879,250 @@ msgstr "Неправильная папка передана в fetch_mail"
 msgid "There is no new mail at %s."
 msgstr "Нет новой почты на %s."
 
-#: mail/mail-ops.c:238
+#: mail/mail-ops.c:237
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:243
+#: mail/mail-ops.c:242
 msgid "Sending a message without a subject"
 msgstr "Отправка сообщения без темы"
 
-#: mail/mail-ops.c:246
+#: mail/mail-ops.c:245
 #, c-format
 msgid "Send \"%s\""
 msgstr "Послать \"%s\""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:248
 msgid "Send a message without a subject"
 msgstr "Послать сообщение без темы"
 
-#: mail/mail-ops.c:414
+#: mail/mail-ops.c:429
+msgid "Sending queue"
+msgstr "Отправка очереди"
+
+#: mail/mail-ops.c:431
+msgid "Send queue"
+msgstr "Отправить очередь"
+
+#: mail/mail-ops.c:585 mail/mail-ops.c:592
+#, c-format
+msgid "Appending \"%s\""
+msgstr "Присоединение \"%s\""
+
+#: mail/mail-ops.c:589 mail/mail-ops.c:595
+msgid "Appending a message without a subject"
+msgstr "Присоединение сообщения без темы"
+
+#: mail/mail-ops.c:690
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Вычеркивание \"%s\""
 
-#: mail/mail-ops.c:416
+#: mail/mail-ops.c:692
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Вычеркнуть \"%s\""
 
-#: mail/mail-ops.c:488
+#: mail/mail-ops.c:764
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:490
+#: mail/mail-ops.c:766
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:493
+#: mail/mail-ops.c:769
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:495
+#: mail/mail-ops.c:771
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:553
+#: mail/mail-ops.c:829
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:556
+#: mail/mail-ops.c:832
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:844
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:649
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Помечание сообщений в папке \"%s\""
 
-#: mail/mail-ops.c:652
+#: mail/mail-ops.c:928
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Пометить сообщения в папке \"%s\""
 
-#: mail/mail-ops.c:811
+#: mail/mail-ops.c:1087
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:814
+#: mail/mail-ops.c:1090
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Считать папки в \"%s\""
 
-#: mail/mail-ops.c:869
+#: mail/mail-ops.c:1145
 #, c-format
 msgid "Found subfolder \"%s\""
 msgstr "Найдена вложенная папка \"%s\""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:1179
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1242
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Присоединение сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1245
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Присоединить сообщения из \"%s\""
 
-#: mail/mail-ops.c:1094
+#: mail/mail-ops.c:1371
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Пересылка сообщений \"%s\""
 
-#: mail/mail-ops.c:1099
+#: mail/mail-ops.c:1376
 msgid "Forwarding a message without a subject"
 msgstr "Пересылка сообщения без темы"
 
-#: mail/mail-ops.c:1102
+#: mail/mail-ops.c:1379
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслать сообщение \"%s\""
 
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1384
 msgid "Forward a message without a subject"
 msgstr "Переслать сообщение без темы"
 
-#: mail/mail-ops.c:1161
+#: mail/mail-ops.c:1438
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1174
+#: mail/mail-ops.c:1451
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Не удалось создать mime-часть из сообщения при создании пересылаемого "
 "сообщения."
 
-#: mail/mail-ops.c:1263
+#: mail/mail-ops.c:1540
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Загрузка \"%s\""
 
-#: mail/mail-ops.c:1265
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Load \"%s\""
 msgstr "Загрузить \"%s\""
 
-#: mail/mail-ops.c:1384
+#: mail/mail-ops.c:1661
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Создание \"%s\""
 
-#: mail/mail-ops.c:1386
+#: mail/mail-ops.c:1663
 #, c-format
 msgid "Create \"%s\""
 msgstr "Создать \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1734
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1787
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхронизация \"%s\""
 
-#: mail/mail-ops.c:1512
+#: mail/mail-ops.c:1789
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхронизовать \"%s\""
 
-#: mail/mail-ops.c:1588
+#: mail/mail-ops.c:1865
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1868
 msgid "Clearing message display"
 msgstr "Очистка отображения сообщения"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1871
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1874
 msgid "Clear message display"
 msgstr "Очистить отображение сообщения"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:2001
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Открытие сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:1727
+#: mail/mail-ops.c:2004
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Открыть сообщения из \"%s\""
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:2116
 msgid "Loading Draftbox"
 msgstr "Загрузка ящика черновиков"
 
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:2118
 msgid "Load Draftbox"
 msgstr "Загрузить ящик черновиков"
 
-#: mail/mail-ops.c:1909
+#: mail/mail-ops.c:2171
+msgid "Loading Outbox"
+msgstr "Загрузка ящика исходящих"
+
+#: mail/mail-ops.c:2173
+msgid "Load Outbox"
+msgstr "Загрузить ящик исходящих"
+
+#: mail/mail-ops.c:2226
+msgid "Loading Sentbox"
+msgstr "Загрузка ящика отправленных"
+
+#: mail/mail-ops.c:2228
+msgid "Load Sentbox"
+msgstr "Загрузить ящик отправленных"
+
+#: mail/mail-ops.c:2297
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Просмотр сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:1912
+#: mail/mail-ops.c:2300
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Просмотреть сообщения из  \"%s\""
 
-#: mail/mail-ops.c:1958
+#: mail/mail-ops.c:2346
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения %d из %d (uid  \"%s\")"
@@ -4185,35 +4178,35 @@ msgstr ""
 "Не удалось прочесть UID кэш-файл \"%s\". Вы можете получить дубликаты "
 "сообщений."
 
-#: mail/mail-tools.c:385
+#: mail/mail-tools.c:396
 #, c-format
 msgid "[%s] %s"
 msgstr "[%s] %s"
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:398
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (пересланное сообщение)"
 
-#: mail/mail-tools.c:396
+#: mail/mail-tools.c:407
 msgid "Fwd: (no subject)"
 msgstr "Пересл.: (нет темы)"
 
-#: mail/mail-tools.c:433
+#: mail/mail-tools.c:444
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:446
 msgid "Forwarded message (no subject)"
 msgstr "Пересланное сообщение (без темы)"
 
-#: mail/mail-tools.c:636
+#: mail/mail-tools.c:647
 #, c-format
 msgid "Don't know protocol to open URI `%s'"
 msgstr "Не известен протокол для открытия URI \"%s\""
 
-#: mail/mail-tools.c:665
+#: mail/mail-tools.c:676
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4222,7 +4215,7 @@ msgstr ""
 "Невозможно открыть положение \"%s\":\n"
 "%s"
 
-#: mail/mail-vfolder.c:298
+#: mail/mail-vfolder.c:302
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
@@ -4326,7 +4319,7 @@ msgstr ""
 "Пожалуйста, удалите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:81
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4335,11 +4328,11 @@ msgstr ""
 "Невозможно создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:133
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr "Указанное имя папки не допустимо."
 
-#: shell/e-shell-folder-creation-dialog.c:223
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr "Эволюция - Создать новую папку"
 
@@ -4497,15 +4490,15 @@ msgstr "О программе Evolution..."
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: shell/e-shell-view.c:122
+#: shell/e-shell-view.c:127
 msgid "(No folder displayed)"
 msgstr "(Папки не показаны)"
 
-#: shell/e-shell-view.c:350
+#: shell/e-shell-view.c:395
 msgid "Folders"
 msgstr "Папки"
 
-#: shell/e-shell-view.c:895
+#: shell/e-shell-view.c:941
 #, c-format
 msgid "Evolution - %s"
 msgstr "Эволюция - %s"
@@ -4547,55 +4540,55 @@ msgstr "Удалить эту закладку из строки закладок"
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения закладок."
 
-#: shell/e-storage.c:217
+#: shell/e-storage.c:235
 msgid "(No name)"
 msgstr "(Без имени)"
 
-#: shell/e-storage.c:412
+#: shell/e-storage.c:430
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: shell/e-storage.c:414
+#: shell/e-storage.c:432
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
-#: shell/e-storage.c:416
+#: shell/e-storage.c:434
 msgid "A folder with the same name already exists"
 msgstr "Папка с таким названием уже существует"
 
-#: shell/e-storage.c:418
+#: shell/e-storage.c:436
 msgid "The specified folder type is not valid"
 msgstr "Указанный тип папки не допустим"
 
-#: shell/e-storage.c:420
+#: shell/e-storage.c:438
 msgid "I/O error"
 msgstr "Ошибка ввода/вывода"
 
-#: shell/e-storage.c:422
+#: shell/e-storage.c:440
 msgid "Not enough space to create the folder"
 msgstr "Недостаточно места для создания папки"
 
-#: shell/e-storage.c:424
+#: shell/e-storage.c:442
 msgid "The specified folder was not found"
 msgstr "Указанная папка не найдена"
 
-#: shell/e-storage.c:426
+#: shell/e-storage.c:444
 msgid "Function not implemented in this storage"
 msgstr "Функция не реализована для этого носителя"
 
-#: shell/e-storage.c:428
+#: shell/e-storage.c:446
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
-#: shell/e-storage.c:430
+#: shell/e-storage.c:448
 msgid "Operation not supported"
 msgstr "Операция не поддерживается"
 
-#: shell/e-storage.c:432
+#: shell/e-storage.c:450
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
-#: shell/e-storage.c:434
+#: shell/e-storage.c:452
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -4872,7 +4865,7 @@ msgstr "Все сопровождение"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:281
+#: widgets/misc/e-calendar-item.c:417
 msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
@@ -4884,39 +4877,3 @@ msgstr "..."
 #, c-format
 msgid "Group %i"
 msgstr "Группа %i"
-
-#~ msgid "Comment"
-#~ msgstr "Комментарий"
-
-#~ msgid "Created"
-#~ msgstr "Создано"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Timestamp"
-#~ msgstr "Отметка времени"
-
-#~ msgid "Last Modification Date"
-#~ msgstr "Дата последнего изменения"
-
-#~ msgid "Location"
-#~ msgstr "Положение"
-
-#~ msgid "Organizer"
-#~ msgstr "Организатор"
-
-#~ msgid "% Complete"
-#~ msgstr "% Выполнено"
-
-#~ msgid "TaskPad"
-#~ msgstr "Задания"
-
-#~ msgid "?"
-#~ msgstr "?"
-
-#~ msgid "_Owner:"
-#~ msgstr "Владелец:"
-
-#~ msgid "E_dit"
-#~ msgstr "Правка"