Updated russian translation.

svn path=/trunk/; revision=6754

1 files changed, 1187 insertions, 792 deletions

diff --git a/po/ru.po b/po/ru.po
index 2c7502da87..d34099088b 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-11-30 13:42+0300\n"
-"PO-Revision-Date: 2000-11-30 13:47+03:00\n"
+"POT-Creation-Date: 2000-12-01 14:47+0300\n"
+"PO-Revision-Date: 2000-12-01 15:10+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -286,8 +286,8 @@ msgstr ""
 #: addressbook/backend/ebook/test-client.c:29
 #: addressbook/conduit/address-conduit.c:1006
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1065
-#: calendar/conduits/todo/todo-conduit.c:939 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1127
+#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -419,14 +419,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
 #: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:648
-#: calendar/conduits/todo/todo-conduit.c:521
+#: calendar/conduits/calendar/calendar-conduit.c:710
+#: calendar/conduits/todo/todo-conduit.c:520
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
 #: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:649
-#: calendar/conduits/todo/todo-conduit.c:522
+#: calendar/conduits/calendar/calendar-conduit.c:711
+#: calendar/conduits/todo/todo-conduit.c:521
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
@@ -504,7 +504,7 @@ msgstr "Мобильный"
 
 #: addressbook/contact-editor/e-contact-editor.c:1278
 #: addressbook/contact-editor/e-contact-editor.c:1373
-#: mail/mail-config.glade.h:18
+#: po/tmp/mail-config.glade.h:17
 msgid "Other"
 msgstr "Другой"
 
@@ -547,10 +547,9 @@ msgstr "Эл.адрес 3"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Удалить контакт?"
 
@@ -564,7 +563,7 @@ msgid "_Add"
 msgstr "Добавить"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "Удалить"
 
@@ -579,12 +578,11 @@ msgstr "Новый тип телефона"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:7
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Добавить"
 
@@ -637,7 +635,7 @@ msgid "C_ontacts..."
 msgstr "Контакты..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Категории..."
 
@@ -654,7 +652,7 @@ msgid "_Address..."
 msgstr "Адрес..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Общее"
 
@@ -699,44 +697,55 @@ msgid "No_tes:"
 msgstr "Заметки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Детали"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Адрес 2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Канада"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Проверить адрес"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Страна:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Финляндия"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "США"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "Адрес:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "Город:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "Аб.ящик:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Область/Район (Штат/Провинция):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "Почтовый индекс:"
 
@@ -805,11 +814,10 @@ msgstr "Как миникарточки"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/gui/component/addressbook.c:272
-#: ui/evolution-addressbook.xml.h:7
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Как таблица"
 
@@ -826,7 +834,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Не удалось открыть эту адресную книгу. Это значит,\n"
 "что либо вы ввели некорректный URI, либо пытались\n"
@@ -867,63 +875,160 @@ msgstr "Внешние каталоги"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Описание:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Сервер LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Имя:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Номер порта:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Найти..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Получатели сообщения"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Выбрать имена"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Выбрать имена из списка:"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "window2"
-msgstr "окно2"
+#: po/tmp/alphabet.glade.h:7
+msgid "a"
+msgstr "a"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr "b"
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr "c"
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr "d"
+
+#: po/tmp/alphabet.glade.h:11
+msgid "e"
+msgstr "e"
+
+#: po/tmp/alphabet.glade.h:12
+msgid "f"
+msgstr "f"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr "g"
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+msgid "i"
+msgstr "i"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr "j"
+
+#: po/tmp/alphabet.glade.h:17
+msgid "k"
+msgstr "k"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr "l"
+
+#: po/tmp/alphabet.glade.h:19
+msgid "m"
+msgstr "m"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr "n"
+
+#: po/tmp/alphabet.glade.h:21
+msgid "o"
+msgstr "o"
+
+#: po/tmp/alphabet.glade.h:22
+msgid "p"
+msgstr "p"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr "q"
+
+#: po/tmp/alphabet.glade.h:24
+msgid "r"
+msgstr "r"
+
+#: po/tmp/alphabet.glade.h:25
+msgid "s"
+msgstr "s"
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr "t"
+
+#: po/tmp/alphabet.glade.h:27
+msgid "u"
+msgstr "u"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr "v"
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr "w"
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr "x"
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr "y"
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:415
 #: addressbook/gui/widgets/e-minicard.c:338
@@ -955,174 +1060,173 @@ msgstr "Поиск"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Пустая форма в конце:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Тело"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Снизу:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Размеры:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Шрифт..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Шрифты..."
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Сноска:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Формат"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Заголовок"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Заголовок/Сноска"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Заголовки"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Заголовки для каждой буквы"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Высота:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Один за другим"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Включить:"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Блокнот"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Слева:"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Закладки букв сбоку"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Поля"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Параметры"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Страница"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Настройка страницы:"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Бумага"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Источник бумаги:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Портрет"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Просмотр:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Печать с использованием полутонов"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Обращать на четных страницах"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Справа:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Разделы:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Полутона"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Размер:"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Начинать с новой страницы"
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Название стиля:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Сверху:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Тип:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Ширина:"
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "метка26"
 
@@ -1138,10 +1242,6 @@ msgstr "д.п."
 msgid "pm"
 msgstr "п.п."
 
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Кондуит календаря Evolution"
@@ -1150,13 +1250,13 @@ msgstr "Кондуит календаря Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Средство настройки для кондуита календаря Evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:604
-#: calendar/conduits/todo/todo-conduit.c:477
+#: calendar/conduits/calendar/calendar-conduit.c:666
+#: calendar/conduits/todo/todo-conduit.c:476
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/conduits/calendar/calendar-conduit.c:703
-#: calendar/conduits/calendar/calendar-conduit.c:706
+#: calendar/conduits/calendar/calendar-conduit.c:765
+#: calendar/conduits/calendar/calendar-conduit.c:768
 msgid "Could not read pilot's Calendar application block"
 msgstr "Невозможно прочесть блок приложения календарь Пилота"
 
@@ -1168,8 +1268,8 @@ msgstr "Кондуит заданий Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Средство настройки для кондуита заданий Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:576
-#: calendar/conduits/todo/todo-conduit.c:579
+#: calendar/conduits/todo/todo-conduit.c:575
+#: calendar/conduits/todo/todo-conduit.c:578
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
@@ -1244,15 +1344,15 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
@@ -1360,221 +1460,261 @@ msgstr "Итог не доступен."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
+#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
+#: po/tmp/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Закрыть"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Короткий сон"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Время дремания (минут)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 минут"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 минут"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12-часовой (ДП/ПП)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 минут"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24-часовой"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 минут"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 минут"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Задержка таймера на"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Аудио Таймеры"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Гудок при возникновении окна таймера."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Календарь"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Настройки календаря"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Цвета"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Сжать выходные дни"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Параметры навигатора дат"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Исх.значения"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Отобразить параметры"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Условленная дата"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Разрешить краткий сон для "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Конец дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Первый день недели:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Пят"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/event-editor.c:397 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Пятница"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Подсвеченные дни:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Задания установленные на сегодня"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Задания установленные на сегодня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Еще не просроченные задания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Еще не просроченные задания:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Пон"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:393 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Понедельник"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Просроченные задания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Просроченные задания:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:19 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Напоминать обо всех встречах"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Напоминания"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/event-editor.c:398 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Суббота"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Показать"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Показать время окончании встречи"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Показать номера недель"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Начало дня:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "Вск"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/event-editor.c:399 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Панель заданий"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:396 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Четверг"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Время до условленного"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Разделители времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Формат времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/event-editor.c:394 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Видимые таймеры"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/event-editor.c:395 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Среда"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Рабочая неделя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "минут до назначенного времени."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "секунд."
 
@@ -1603,54 +1743,89 @@ msgstr "Журнальная запись - %s"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% Выполнения:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "Классификация:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Отменено"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "Выполнено"
+
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Дата выполнения:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr "Высокий"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "В процессе"
+
+#: po/tmp/task-editor-dialog.glade.h:16
+msgid "Low"
+msgstr "Низкий"
+
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1018
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
+msgid "None"
+msgstr "Нет"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Нормальный"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Не начато"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "Итог"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Дата начала:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Задание"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "Контакты..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Условленная дата:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "Приоритет:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "Состояние:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "диалог редактора заданий"
 
@@ -1670,12 +1845,11 @@ msgstr "Пометить как выполненное"
 msgid "Mark the task complete"
 msgstr "Пометить задание как выполненное"
 
-#: calendar/gui/e-calendar-table.c:334
-#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:493
-#: mail/mail-config.glade.h:9 mail/mail-view.c:165
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-event-editor.xml.h:20
-#: ui/evolution-mail.xml.h:12
+#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:8
+#: mail/folder-browser.c:493 mail/mail-view.c:165
+#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
+#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1721,7 +1895,7 @@ msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
 #: calendar/gui/e-day-view.c:2936 calendar/gui/e-week-view.c:3169
-#: ui/evolution-event-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
@@ -1757,34 +1931,6 @@ msgstr "в"
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/event-editor.c:393
-msgid "Monday"
-msgstr "Понедельник"
-
-#: calendar/gui/event-editor.c:394
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: calendar/gui/event-editor.c:395
-msgid "Wednesday"
-msgstr "Среда"
-
-#: calendar/gui/event-editor.c:396
-msgid "Thursday"
-msgstr "Четверг"
-
-#: calendar/gui/event-editor.c:397
-msgid "Friday"
-msgstr "Пятница"
-
-#: calendar/gui/event-editor.c:398
-msgid "Saturday"
-msgstr "Суббота"
-
-#: calendar/gui/event-editor.c:399
-msgid "Sunday"
-msgstr "Воскресенье"
-
 #: calendar/gui/event-editor.c:517
 msgid "on the"
 msgstr ""
@@ -1821,175 +1967,164 @@ msgstr "%a %b %d %Y"
 #. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
 #.
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "диалог редактора событий"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Su_mmary:"
-msgstr "Итог:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Время"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "Время начала:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "Время окончания:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "Все события дня"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Основания встречи"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Классификация"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "Общее"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Личное"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "Конфиденциальное"
-
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Минуты"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "Часы"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Другое повторение"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Дни"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "Отобразить"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Каждый"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "Программа"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Исключения"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "Почта"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Часы"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Почта для:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "Запустить программу:"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Минуты"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "Аудио"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Изменить"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr "Напоминание"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Без повторения"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Appointment Basics"
-msgstr "Основания встречи"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "Просмотр"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Starting date:"
-msgstr "Дата начала:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Личное"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Общее"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Повторение"
+
+#: po/tmp/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Правило повторения"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
-msgstr "Без повторения"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "Напоминание"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: po/tmp/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Простое повторение"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
-msgstr "Другое повторение"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "Итог:"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Каждый"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Время"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
-msgstr "день"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "Аудио"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
-msgstr "неделя"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "Конфиденциальное"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
-msgstr "месяц"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "Отобразить"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "year(s)"
-msgstr "год"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Время окончания:"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "Почта"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "Программа"
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "Запустить программу:"
+
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Время начала:"
+
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr "Дата начала:"
+
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "день"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "диалог редактора событий"
+
+#: po/tmp/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "в"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
-msgstr "до"
-
-#: calendar/gui/event-editor-dialog.glade.h:51
+#: po/tmp/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "всегда"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "Исключения"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "Изменить"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
+#: po/tmp/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "метка26"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "Preview"
-msgstr "Просмотр"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "месяц"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence"
-msgstr "Повторение"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "до"
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "неделя"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
+msgstr "год"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2452,16 +2587,35 @@ msgstr "ПВСЧПСВ"
 msgid "SMTWTFS"
 msgstr "ПВСЧПСВ"
 
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Не удалось создать файл блокировки для %s: %s"
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"Превышение времени при попытке заблокировать файл %s. Попробуйте еще раз "
+"позже."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr "Не удалось получить lock используя fcntl(2): %s"
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr "Не удалось получить lock используя flock(2): %s"
+
 #: camel/camel-movemail.c:99
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Не удалось проверить почтовый файл %s: %s"
 
-#: camel/camel-movemail.c:136 camel/camel-movemail.c:183
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Не удалось создать файл блокировки для %s: %s"
-
 #: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
@@ -2477,13 +2631,6 @@ msgstr "Невозможно открыть временный почтовый файл %s: %s"
 msgid "Could not test lock file for %s: %s"
 msgstr "Невозможно проверить файл блокировки для %s: %s"
 
-#: camel/camel-movemail.c:217
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"Превышение времени при попытке заблокировать файл %s. Попробуйте еще раз "
-"позже."
-
 #: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
@@ -2709,10 +2856,12 @@ msgstr "Невозможно присоединить сообщение к файлу mbox: %s"
 msgid "Cannot get message: %s"
 msgstr "Невозможно получить сообщение: %s"
 
+#: camel/providers/local/camel-mbox-provider.c:34
 #: camel/providers/mbox/camel-mbox-provider.c:34
 msgid "UNIX mbox-format mail files"
 msgstr "Почтовые файлы в формате UNIX mbox"
 
+#: camel/providers/local/camel-mbox-provider.c:36
 #: camel/providers/mbox/camel-mbox-provider.c:36
 msgid ""
 "For reading mail delivered by the local system, and for storing mail on "
@@ -2721,6 +2870,7 @@ msgstr ""
 "Для чтения почты доставленной локальной системой и хранения почты на "
 "локальном диске."
 
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/mbox/camel-mbox-store.c:118
 #, c-format
 msgid ""
@@ -2730,12 +2880,16 @@ msgstr ""
 "Невозможно открыть файл \"%s\":\n"
 "%s"
 
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #: camel/providers/mbox/camel-mbox-store.c:125
 #: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Папка \"%s\" не существует."
 
+#: camel/providers/local/camel-mbox-store.c:117
 #: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
@@ -2745,12 +2899,16 @@ msgstr ""
 "Не удалось создать файл \"%s\":\n"
 "%s"
 
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #: camel/providers/mbox/camel-mbox-store.c:143
 #: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "%s не является обычным файлом."
 
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #: camel/providers/mbox/camel-mbox-store.c:169
 #: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
@@ -2761,6 +2919,7 @@ msgstr ""
 "Невозможно удалить папку \"%s\":\n"
 "%s"
 
+#: camel/providers/local/camel-mbox-store.c:160
 #: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
@@ -2775,6 +2934,7 @@ msgstr "Не удалось переименовать папку %s в %s: такое имя уже существует"
 msgid "Mbox folders may not be nested."
 msgstr ""
 
+#: camel/providers/local/camel-local-store.c:200
 #: camel/providers/mbox/camel-mbox-store.c:274
 #, c-format
 msgid "Local mail file %s"
@@ -2785,6 +2945,7 @@ msgstr "Локальный почтовый файл %s"
 msgid "Could not open summary %s"
 msgstr "Невозможно открыть итог %s"
 
+#: camel/providers/local/camel-mbox-summary.c:491
 #: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
@@ -2792,12 +2953,13 @@ msgstr "Не удалось открыть временный почтовый ящик: %s"
 
 #: camel/providers/mbox/camel-mbox-summary.c:734
 msgid "Summary mismatch, aborting sync"
-msgstr ""
+msgstr "Несовпадение итога, прерывание синхронизации"
 
 #: camel/providers/mbox/camel-mbox-summary.c:754
 msgid "Summary mismatch, X-Evolution header missing"
-msgstr ""
+msgstr "Несовпадение итога, ошибочный заголовок X-Evolution"
 
+#: camel/providers/local/camel-mbox-summary.c:562
 #: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
@@ -2809,21 +2971,26 @@ msgstr "Ошибка записи во временный почтовый ящик: %s"
 msgid "Cannot copy data to output file: %s"
 msgstr "Невозможно скопировать данные в файл вывода: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Невозможно закрыть исходную папку %s: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:604
 #: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Невозможно закрыть временную папку: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:615
 #: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
+#: camel/providers/local/camel-mbox-summary.c:817
 #: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
@@ -2840,6 +3007,13 @@ msgstr "Невозможно загрузить или создать итог"
 msgid "Cannot append message to mh folder: %s"
 msgstr "Невозможно добавить сообщение к папке mh: %s"
 
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:204
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
 #: camel/providers/mh/camel-mh-folder.c:405
 #, c-format
 msgid ""
@@ -2853,10 +3027,13 @@ msgstr ""
 msgid "UNIX MH-format mail directories"
 msgstr "Почтовые каталоги в формате UNIX MH"
 
+#: camel/providers/local/camel-local-provider.c:37
 #: camel/providers/mh/camel-mh-provider.c:36
 msgid "For storing local mail in MH-like mail directories"
 msgstr "Для хранения локальной почты в почтовых каталогах типа MH"
 
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #: camel/providers/mh/camel-mh-store.c:112
 #, c-format
 msgid ""
@@ -2866,6 +3043,8 @@ msgstr ""
 "Невозможно открыть папку \"%s\":\n"
 "%s"
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
 #: camel/providers/mh/camel-mh-store.c:127
 #, c-format
 msgid ""
@@ -2875,11 +3054,15 @@ msgstr ""
 "Не удалось создать папку \"%s\":\n"
 "%s"
 
+#: camel/providers/local/camel-mh-store.c:116
 #: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не является каталогом."
 
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
 #: camel/providers/mh/camel-mh-store.c:155
 #: camel/providers/mh/camel-mh-store.c:168
 #, c-format
@@ -3105,11 +3288,11 @@ msgid "attachment"
 msgstr "вложение"
 
 #: composer/e-msg-composer-attachment-bar.c:417
-#: ui/evolution-message-composer.xml.h:8
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer-attachment-bar.c:464 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Удалить"
@@ -3128,18 +3311,17 @@ msgstr "Присоединить файл к сообщению"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Свойства вложения"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Имя файла:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
@@ -3286,6 +3468,10 @@ msgstr "Невозможно создать окно редактора."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
+#: filter/e-search-bar.c:175
+msgid "Sear_ch"
+msgstr "Поиск"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "годы"
@@ -3381,7 +3567,7 @@ msgstr "Добавить правило фильтра"
 msgid "Edit Filter Rule"
 msgstr "Правка правила фильтра"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:10
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Правка фильтров"
 
@@ -3427,6 +3613,11 @@ msgstr ""
 "Ошибка в регулярном выражении \"%s\":\n"
 "%s"
 
+#: filter/filter-message-search.c:377 filter/filter-message-search.c:445
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr "Сбой выполнения поиска рег.выражения в заголовке сообщения: %s"
+
 #: filter/filter-part.c:456
 msgid "Test"
 msgstr "Проверка"
@@ -3463,29 +3654,37 @@ msgstr "Добавить критерий"
 msgid "Remove criterion"
 msgstr "Удалить критерий"
 
-#: filter/filter.glade.h:9 mail/folder-browser.c:479
-#: mail/mail-config.glade.h:10
+#: mail/folder-browser.c:479 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Правка"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Правка вирт.папок"
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Правила фильтра"
 
-#: filter/filter.glade.h:14
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr "Входящие"
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr "Исходящие"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Виртуальные папки"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Источники вирт.папки"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:540
+#: filter/libfilter-i18n.h:2 mail/message-list.c:557
 msgid "Answered"
 msgstr "Отвечено"
 
@@ -3555,9 +3754,9 @@ msgstr "Получатели"
 
 #: filter/libfilter-i18n.h:21
 msgid "Regex Match"
-msgstr ""
+msgstr "Совпадение рег.выражения"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:537
+#: filter/libfilter-i18n.h:22 mail/message-list.c:554
 msgid "Seen"
 msgstr "Прочитанное"
 
@@ -3701,8 +3900,8 @@ msgstr "Невозможно инициализировать хэш почтового хранилища Evolution."
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:18
+#: mail/folder-browser.c:156 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3754,7 +3953,7 @@ msgstr "Фильтр по получателю"
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:478 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:478 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Открыть"
 
@@ -3763,8 +3962,8 @@ msgid "Save As..."
 msgstr "Сохранить как..."
 
 #: mail/folder-browser.c:481 mail/mail-view.c:163
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Print"
 msgstr "Печать"
 
@@ -3772,15 +3971,17 @@ msgstr "Печать"
 msgid "Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:484 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:484 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:485 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:485 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:486 ui/evolution-mail.xml.h:19
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
 msgid "Forward as Attachment"
 msgstr "Переслать как вложение"
 
@@ -3810,7 +4011,7 @@ msgstr "Восстановить"
 msgid "Apply Filters"
 msgstr "Применить фильтры"
 
-#: mail/folder-browser.c:500 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:500 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Создать правило из сообщения"
 
@@ -3958,7 +4159,7 @@ msgstr "Организация:"
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
+#: mail/mail-config-gui.c:500 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Файл подписи"
 
@@ -4079,36 +4280,42 @@ msgid "Query authorization at \"%s\""
 msgstr "Запрос авторизации от \"%s\""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Настройка почты"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
+#: po/tmp/mail-config-druid.glade.h:6
 msgid "Identity"
 msgstr "Именование"
 
-#: mail/mail-config-druid.glade.h:14
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Настройка почты"
+
+#: po/tmp/mail-config-druid.glade.h:8
 msgid "Mail Source"
 msgstr "Источник почты"
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:13
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
 msgid "Mail Transport"
 msgstr "Передача почты"
 
-#: mail/mail-config-druid.glade.h:17
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "Добро пожаловать к помощнику по настройке почты в Evolution!\n"
+
+#: po/tmp/mail-config-druid.glade.h:11
+msgid "By filling in some information about your email\n"
+msgstr "Введя некоторую информацию о параметрах вашей электронной\n"
+
+#: po/tmp/mail-config-druid.glade.h:12
+msgid "settings, you can start sending and receiving email\n"
+msgstr "почты, вы сможете начать ее отправку и приём\n"
+
+#: po/tmp/mail-config-druid.glade.h:13
+msgid "right away. Click Next to continue."
+msgstr "Нажмите \"Далее\" для продолжения."
+
+#: po/tmp/mail-config-druid.glade.h:14
 msgid ""
 "Your email configuration is now complete.\n"
 "Click \"Finish\" to save your new settings"
@@ -4116,39 +4323,39 @@ msgstr ""
 "Ваши почтовые настройки закончены.\n"
 "Нажмите \"Завершить\" для сохранения ваших новых установок"
 
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Адрес"
 
-#: mail/mail-config.glade.h:11
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Именования"
 
-#: mail/mail-config.glade.h:12
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Источники почты"
 
-#: mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Отметить сообщение как просмотренное [мс]:"
 
-#: mail/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Серверы новостей"
 
-#: mail/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Источники новостей"
 
-#: mail/mail-config.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Организация"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:20
 msgid "Sources"
 msgstr "Источники"
 
@@ -4210,38 +4417,38 @@ msgstr ""
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:192
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:232
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:274
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:276
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:278
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:302
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:325
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:329
 msgid "Hide"
 msgstr "Скрыть"
 
@@ -4356,268 +4563,268 @@ msgstr "Получение почты c %s"
 msgid "Fetch email from %s"
 msgstr "Получить почту c %s"
 
-#: mail/mail-ops.c:333
+#: mail/mail-ops.c:330
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Нет новой почты на %s."
 
-#: mail/mail-ops.c:407
+#: mail/mail-ops.c:400
 msgid "Filtering email on demand"
 msgstr "Фильтрация почты по запросу"
 
-#: mail/mail-ops.c:409
+#: mail/mail-ops.c:402
 msgid "Filter email on demand"
 msgstr "Фильтр почты по запросу"
 
-#: mail/mail-ops.c:544
+#: mail/mail-ops.c:537
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:542
 msgid "Sending a message without a subject"
 msgstr "Отправка сообщения без темы"
 
-#: mail/mail-ops.c:552
+#: mail/mail-ops.c:545
 #, c-format
 msgid "Send \"%s\""
 msgstr "Послать \"%s\""
 
-#: mail/mail-ops.c:555
+#: mail/mail-ops.c:548
 msgid "Send a message without a subject"
 msgstr "Послать сообщение без темы"
 
-#: mail/mail-ops.c:726
+#: mail/mail-ops.c:719
 msgid "Sending queue"
 msgstr "Отправка очереди"
 
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:721
 msgid "Send queue"
 msgstr "Отправить очередь"
 
-#: mail/mail-ops.c:864 mail/mail-ops.c:871
+#: mail/mail-ops.c:857 mail/mail-ops.c:864
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Присоединение \"%s\""
 
-#: mail/mail-ops.c:868 mail/mail-ops.c:874
+#: mail/mail-ops.c:861 mail/mail-ops.c:867
 msgid "Appending a message without a subject"
 msgstr "Присоединение сообщения без темы"
 
-#: mail/mail-ops.c:946
+#: mail/mail-ops.c:939
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Вычеркивание \"%s\""
 
-#: mail/mail-ops.c:948
+#: mail/mail-ops.c:941
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Вычеркнуть \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1000
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1009
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1012
+#: mail/mail-ops.c:1005
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:1007
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1045
+#: mail/mail-ops.c:1038
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:1048
+#: mail/mail-ops.c:1041
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:1068
+#: mail/mail-ops.c:1061
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1147
+#: mail/mail-ops.c:1140
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Помечание сообщений в папке \"%s\""
 
-#: mail/mail-ops.c:1150
+#: mail/mail-ops.c:1143
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Пометить сообщения в папке \"%s\""
 
-#: mail/mail-ops.c:1181
+#: mail/mail-ops.c:1174
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Помечание сообщений в папке %d из %d"
 
-#: mail/mail-ops.c:1304
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1306
+#: mail/mail-ops.c:1299
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Считать папки в \"%s\""
 
-#: mail/mail-ops.c:1375 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1429
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Присоединение сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:1439
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Присоединить сообщения из \"%s\""
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1532
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Пересылка сообщений \"%s\""
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1536
 msgid "Forwarding a message without a subject"
 msgstr "Пересылка сообщения без темы"
 
-#: mail/mail-ops.c:1546
+#: mail/mail-ops.c:1539
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслать сообщение \"%s\""
 
-#: mail/mail-ops.c:1550
+#: mail/mail-ops.c:1543
 msgid "Forward a message without a subject"
 msgstr "Переслать сообщение без темы"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1590
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1613
+#: mail/mail-ops.c:1606
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Не удалось создать mime-часть из сообщения при создании пересылаемого "
 "сообщения."
 
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1650
 msgid "Forwarded message:\n"
 msgstr "Пересланное сообщение:\n"
 
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1719
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Загрузка \"%s\""
 
-#: mail/mail-ops.c:1728
+#: mail/mail-ops.c:1721
 #, c-format
 msgid "Load \"%s\""
 msgstr "Загрузить \"%s\""
 
-#: mail/mail-ops.c:1830
+#: mail/mail-ops.c:1824
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Создание \"%s\""
 
-#: mail/mail-ops.c:1832
+#: mail/mail-ops.c:1826
 #, c-format
 msgid "Create \"%s\""
 msgstr "Создать \"%s\""
 
-#: mail/mail-ops.c:1880
+#: mail/mail-ops.c:1874
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:1920
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхронизация \"%s\""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1922
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхронизовать \"%s\""
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:1986
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:1989
 msgid "Clearing message display"
 msgstr "Очистка отображения сообщения"
 
-#: mail/mail-ops.c:1998
+#: mail/mail-ops.c:1992
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:2001
+#: mail/mail-ops.c:1995
 msgid "Clear message display"
 msgstr "Очистить отображение сообщения"
 
-#: mail/mail-ops.c:2114
+#: mail/mail-ops.c:2108
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Открытие сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2117
+#: mail/mail-ops.c:2111
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Открыть сообщения из \"%s\""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2215
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Загрузка папки %s"
 
-#: mail/mail-ops.c:2223
+#: mail/mail-ops.c:2217
 #, c-format
 msgid "Load %s Folder"
 msgstr "Загрузить папку %s"
 
-#: mail/mail-ops.c:2287
+#: mail/mail-ops.c:2281
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Просмотр сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2290
+#: mail/mail-ops.c:2284
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Просмотреть сообщения из  \"%s\""
 
-#: mail/mail-ops.c:2316
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения %d из %d (uid  \"%s\")"
 
-#: mail/mail-ops.c:2405
+#: mail/mail-ops.c:2399
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Сохранение сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2408
+#: mail/mail-ops.c:2402
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Сохранить сообщения из папки \"%s\""
 
-#: mail/mail-ops.c:2450
+#: mail/mail-ops.c:2444
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
@@ -4626,7 +4833,7 @@ msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
 msgid "Cancel"
 msgstr "Отмена"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:703
+#: mail/mail-summary.c:104 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Неполное сообщение записано в канал!"
 
@@ -4639,7 +4846,7 @@ msgstr ""
 "Ошибка при подготовке к %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4648,19 +4855,19 @@ msgstr ""
 "Ошибка при \"%s\":\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Ошибка чтения команд из проверяемой нити."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Поврежденное сообщение из проверяемой нити?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Невозможно создать окно диалога."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Пользователь отменил запрос."
 
@@ -4737,39 +4944,54 @@ msgstr "Новая вирт.папка"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Ответить всем получателям этого сообщения"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Переслать это сообщение"
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Распечатать выделенное сообщение"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/message-list.c:534
+#: mail/message-list.c:551
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:2089
+#: mail/message-list.c:825
+#, c-format
+msgid "[ %s ]"
+msgstr "[ %s ]"
+
+#. well, we could scan more children, build up a (more accurate) list, but this should do ok
+#: mail/message-list.c:837 mail/message-list.c:852
+#, c-format
+msgid "%s, et al."
+msgstr "%s, и т.д."
+
+#: mail/message-list.c:839 mail/message-list.c:854
+msgid "<unknown>"
+msgstr "<неизвестное>"
+
+#: mail/message-list.c:2137
 msgid "Rebuilding message view"
 msgstr "Перестроение окна сообщения"
 
-#: mail/message-list.c:2091
+#: mail/message-list.c:2139
 msgid "Rebuild message view"
 msgstr "Перестроить окно сообщения"
 
@@ -4955,13 +5177,6 @@ msgstr "(Папки не показаны)"
 msgid "Folders"
 msgstr "Папки"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:422
-#: widgets/misc/e-dateedit.c:1331 widgets/misc/e-dateedit.c:1446
-msgid "None"
-msgstr "Нет"
-
 #: shell/e-shell-view.c:1022
 #, c-format
 msgid "Evolution - %s"
@@ -5098,8 +5313,9 @@ msgstr "Операция не поддерживается"
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:36
+#: shell/e-storage-set-view.c:235
 msgid "_View"
 msgstr "Просмотр"
 
@@ -5171,1110 +5387,1118 @@ msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "Новый сервер каталогов"
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "Действия"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Создать новый контакт"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Удалить контакт"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Поиск"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Поиск контакта"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:18
 msgid "New"
 msgstr "Новый"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Печать контактов"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Стоп"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Остановить загрузку"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Просмотреть все"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Просмотреть все контакты"
 
-#: ui/evolution-addressbook.xml.h:20
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_New Contact"
 msgstr "Новый контакт"
 
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Напечатать контакты..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "Поиск контактов"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "Инструменты"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 дней"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Другие настройки"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
 msgid "Calendar Preferences..."
 msgstr "Настройки календаря..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Day"
 msgstr "День"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Go back in time"
 msgstr "Перейти в прошлое"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go forward in time"
 msgstr "Перейти в будущее"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go to"
 msgstr "Перейти к"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to present time"
 msgstr "Перейти к настоящему времени"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Month"
 msgstr "Месяц"
 
-#: ui/evolution-calendar.xml.h:20
+#: po/tmp/evolution-calendar.xml.h:19
 msgid "New Ca_lendar"
 msgstr "Новый календарь"
 
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "След."
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Открыть календарь"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Пред."
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Напечатать этот календарь"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Сохранить календарь как что-нибудь еще"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Показать 1 день"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Показать 1 месяц"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Показать 1 неделю"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:414
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Сегодня"
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Неделя"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
 msgid "_New"
 msgstr "Новый"
 
-#: ui/evolution-calendar.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_New appointment..."
 msgstr "Новая встреча..."
 
-#: ui/evolution-calendar.xml.h:35
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Open"
 msgstr "Открыть"
 
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Open Calendar"
 msgstr "Открыть календарь"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:36
 msgid "_Print this calendar"
 msgstr "Напечатать этот календарь"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:37
 msgid "_Save Calendar As"
 msgstr "Сохранить календарь как"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Удалить..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Справка"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Печать конверта..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Печать этого элемента"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Печать..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: ui/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Послать контакт другому..."
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Просмотр онлайновой справки"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Послать сообщение к контакту..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:110
+#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:27
 msgid "_File"
 msgstr "Файл"
 
-#: ui/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "Печать..."
 
-#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:44
 msgid "_Save"
 msgstr "Сохранить"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Об этой программе"
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "О программе..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Действия"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "Очистить"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Вырезать"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Очистить"
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Очистить выделение"
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Закрыть эту встречу"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Скопировать"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Скопировать выделение"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Вырезать"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Дамп XML"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Дамп XML описания интерфейса"
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Адресная книга..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Выбрать форму..."
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Проверка имен"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Скопировать в папку..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Определить стиль печати"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Конструкция этой формы"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Первый элемент в папке"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: Переслать"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Переслать как v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Справка"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Невыполненное задание"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Вставить файл"
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Элемент..."
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Специальная вставка..."
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Просмотр печати"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Повторение..."
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: Послать"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Сохранить вложение..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Отладчик скрипта"
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Запрос задачи"
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: Контакт"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Настройка..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: файл..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: Шрифт..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Форматирование"
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Элемент"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Журнальная запись"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Последний элемент в папке"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Правка сообщения"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Стиль памятки"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Переместить в папку..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: Новая встреча"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: Запись"
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: Объект..."
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Абзац..."
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Правописание..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: Стандартная"
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: Задача"
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Непрочитанный элемент"
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "Формат"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Повторный поиск"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Повторный поиск"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Перейти к следующему элементу"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Перейти к предыдущему элементу"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Изменить свойства файла"
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "След."
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Вставить"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Вставить выделение"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Пред."
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Пред."
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Настройка печати..."
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Настройка страницы"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Свойства"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Возврат"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Повторить отмененное действие"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Заменить"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Заменить строку"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Сохранить встречу и закрыть окно диалога"
 
-#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Вставить встречу в расписание"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Вставить встречу в расписание"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Вставить в расписание встречу некоторого типа"
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Искать ту же строку еще раз"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Поиск строки"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Выбрать все"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Настройки страницы для вашего текущего принтера"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Откат"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Отменить последнее действие"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_About..."
 msgstr "О программе..."
 
-#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:37
 msgid "_Close"
 msgstr "Закрыть"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "_Debug"
 msgstr "Отладка"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:109
+#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:26
 msgid "_Edit"
 msgstr "Правка"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "Найти..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "Формы"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:30
 msgid "_Help"
 msgstr "Справка"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "Вставить"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "Объект"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Вставить"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Печать"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "Свойства..."
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "Возврат"
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "Заменить..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Панель инструментов"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "Откат"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Создать"
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Создать новое сообщение"
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Скопировать сообщение в новую папку"
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "Папка"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Фильтр по отправителю"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Фильтр по получателю"
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: ui/evolution-mail.xml.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Получить почту"
 
-#: ui/evolution-mail.xml.h:22
+#: po/tmp/evolution-mail.xml.h:21
 msgid "Mail _Filters..."
 msgstr "Почтовые фильтры..."
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:22
 msgid "Manage Subscriptions..."
 msgstr "Управление подписками..."
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Пометить как прочитанное"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Пометить как непрочтенное"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Переместить"
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Переместить сообщение в новую папку"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Просмотр печатаемых сообщений"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Просмотр печати сообщения..."
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Распечатать сообщение на принтере"
 
-#: ui/evolution-mail.xml.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Печать сообщения..."
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: ui/evolution-mail.xml.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Ответить отправителю"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Выбрать все"
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Отправить почту из очереди и получить новую почту"
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Список подшитых сообщений"
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:44
 msgid "View Raw Message Source"
 msgstr "Просмотр исходного текста сообщения"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "Применить фильтры"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "Настроить папку"
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "Правка сообщения"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "Вычеркнуть"
 
-#: ui/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Фильтр по теме"
 
-#: ui/evolution-mail.xml.h:53
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Переслать"
 
-#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Обратить выделение"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:54
 msgid "_Mail Configuration..."
 msgstr "Настройка почты..."
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "Сообщение"
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "Открыть в новом окне"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "Печать сообщения"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:59
 msgid "_Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: ui/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Source"
 msgstr "Источник"
 
-#: ui/evolution-mail.xml.h:62
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "Подшитые"
 
-#: ui/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#: ui/evolution-mail.xml.h:64
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "Вирт.папка по теме"
 
-#: ui/evolution-mail.xml.h:65
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Virtual Folder Editor..."
 msgstr "Редактор виртуальных папок..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Присоединить"
 
-#: ui/evolution-message-composer.xml.h:9
+#: po/tmp/evolution-message-composer.xml.h:8
 msgid "Bold"
 msgstr "Полужирное"
 
-#: ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Вставить файл как текст в сообщение"
 
-#: ui/evolution-message-composer.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Вставить текстовый файл..."
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Открыть файл"
 
-#: ui/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save As"
 msgstr "Сохранить как"
 
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in _folder... (FIXME)"
 msgstr "Сохранить в папке... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save in folder..."
 msgstr "Сохранить в папке..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send"
 msgstr "Отправить"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _Later"
 msgstr "Отправить позже"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send _later"
 msgstr "Отправить позже"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the mail in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message later"
 msgstr "Отправить сообщение позже"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send the message now"
 msgstr "Отправить сообщение сейчас"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Send this message now"
 msgstr "Отправить это сообщение сейчас"
 
-#: ui/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Sets something as bold"
 msgstr "Установить что-то в полужирное"
 
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show / hide attachments"
 msgstr "Показать/Скрыть вложения"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "Show _attachments"
 msgstr "Показать вложения"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "Show attachments"
 msgstr "Показать вложения"
 
-#: ui/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Insert text file... (FIXME)"
 msgstr "Вставить текстовый файл... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:43
 msgid "_Open..."
 msgstr "Открыть..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Добавить папку к вашему списку папок подписок"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Обновить список папок"
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Удалить папку из вашего списка папок подписок"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Отказаться"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
+#: po/tmp/evolution.xml.h:6
 msgid "Create a new folder"
 msgstr "Создать новую папку"
 
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Показать другую папку"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:8
 msgid "E_xit"
 msgstr "Выход"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:9
 msgid "Evolution bar _shortcut"
 msgstr "Строка ярлыков Evolution"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:10
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:11
 msgid "Getting _Started"
 msgstr "Краткое руководство"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:12
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Folder Bar"
 msgstr "Показать строку папок"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:14
 msgid "Show the _Shortcut Bar"
 msgstr "Показать строку закладок"
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:15
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:16
 msgid "Submit bug report using Bug Buddy"
 msgstr "Отправить сообщение об ошибке используя Bug Buddy"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the folder bar"
 msgstr "Переключить отображение строки папок"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:18
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Переключить отображение строки закладок"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:19
 msgid "Using the C_ontact Manager"
 msgstr "Использование диспетчера контактов"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Calendar"
 msgstr "Использование календаря"
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:21
 msgid "Using the _Mailer"
 msgstr "Использование почты"
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:22
 msgid "_About Evolution..."
 msgstr "О программе..."
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:23
 msgid "_Appointment (FIXME)"
 msgstr "Встреча (FIXME)"
 
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution.xml.h:24
 msgid "_Contact (FIXME)"
 msgstr "Контакт (FIXME)"
 
-#: ui/evolution.xml.h:26
+#: po/tmp/evolution.xml.h:25
 msgid "_Create New Folder..."
 msgstr "Создать новую папку..."
 
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:28
 msgid "_Folder"
 msgstr "Папка"
 
-#: ui/evolution.xml.h:30
+#: po/tmp/evolution.xml.h:29
 msgid "_Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:31
 msgid "_Index"
 msgstr "Индекс"
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:32
 msgid "_Mail message (FIXME)"
 msgstr "Почтовое сообщение (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:34
 msgid "_Settings"
 msgstr "Установки"
 
-#: ui/evolution.xml.h:36
+#: po/tmp/evolution.xml.h:35
 msgid "_Task (FIXME)"
 msgstr "Задание (FIXME)"
 
@@ -6390,3 +6614,174 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Группа %i"
+
+#: camel/providers/imap/camel-imap-auth.c:124
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Не удалось получить билет Kerberos:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:195
+msgid "Bad authentication response from server."
+msgstr "Отрицательный ответ идентификации от сервера."
+
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Почтовые каталоги в формате UNIX MH (версия CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Почтовые файлы в формате UNIX mbox (версия CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Для хранения локальной почты в почтовых каталогах формата mbox"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "Почтовые файлы в формате почтовых каталогов UNIX qmail (версия CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Не удалось получить папку: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Не удалось переименовать папку %s в %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Нет такого сообщения"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "Неправильное содержимое сообщения"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "\"%s\" не является почтовым каталогом."
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "не является почтовым каталог"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Невозможно получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Видимо папка невостановимо испорчена."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Не удалось суммировать папку: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Не удалось открыть папку для суммаризации: %s: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:512
+#: camel/providers/local/camel-mbox-summary.c:520
+#: camel/providers/local/camel-mbox-summary.c:691
+#: camel/providers/local/camel-mbox-summary.c:699
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Несовпадение папки и итога, даже после синхронизации"
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Сбой записи во временный почтовый ящик: %s: %s"
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Невозможно добавить сообщение к папке mh: %s: %s"