Updated russian translation.

svn path=/trunk/; revision=8345
author: Valek Frob <frob@src.gnome.org> 2001-02-22 23:56:08 +0800
committer: Valek Frob <frob@src.gnome.org> 2001-02-22 23:56:08 +0800
commit: 93a285353c8ee1052422a2d526434bc7c009f971 (patch)
tree: c336d1f8178ae28fe4769403e666ff40a756dd50 /po
parent: fa3dd0054fe2bb2eb17d50540473b82b360f0b4a (diff)
download: gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.tar.gz
gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.tar.zst
gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.zip
2 files changed, 2114 insertions, 1824 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 391d841dc8..7930e580a0 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-21  Valek Filippov  <frob@df.ru>
+
+	* ru.po: updated russian translation.
+
 2001-02-22  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
 
 	* it.po: Updated italian translation from Clara Tattoni
diff --git a/po/ru.po b/po/ru.po
index d5014b4d0b..73919c8489 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,19 +5,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-02-02 19:32+0300\n"
-"PO-Revision-Date: 2001-02-02 19:44+03:00\n"
+"POT-Creation-Date: 2001-02-22 18:20+0300\n"
+"PO-Revision-Date: 2001-02-22 18:52+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3053
 msgid "Card: "
 msgstr "Карточка: "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3055
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3052
+#: addressbook/backend/ebook/e-card.c:3056
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,13 +33,13 @@ msgstr ""
 "\n"
 "  Префикс:    "
 
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3057
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3054
+#: addressbook/backend/ebook/e-card.c:3058
 msgid ""
 "\n"
 "  Additional: "
@@ -47,13 +47,13 @@ msgstr ""
 "\n"
 "  Добавочный: "
 
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3059
 msgid ""
 "\n"
 "  Family:     "
-msgstr ""
+msgstr "\n  Фамилия:    "
 
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3060
 msgid ""
 "\n"
 "  Suffix:     "
@@ -61,7 +61,7 @@ msgstr ""
 "\n"
 "  Суффикс:     "
 
-#: addressbook/backend/ebook/e-card.c:3070
+#: addressbook/backend/ebook/e-card.c:3074
 msgid ""
 "\n"
 "Birth Date: "
@@ -69,7 +69,7 @@ msgstr ""
 "\n"
 "Дата рождения: "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "Address:"
@@ -77,7 +77,7 @@ msgstr ""
 "\n"
 "Адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3087
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -85,7 +85,7 @@ msgstr ""
 "\n"
 "Почтовый ящик:  "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3088
 msgid ""
 "\n"
 "  Ext:         "
@@ -93,7 +93,7 @@ msgstr ""
 "\n"
 "  Расш.:        "
 
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3089
 msgid ""
 "\n"
 "  Street:      "
@@ -101,7 +101,7 @@ msgstr ""
 "\n"
 "  Улица:     "
 
-#: addressbook/backend/ebook/e-card.c:3086
+#: addressbook/backend/ebook/e-card.c:3090
 msgid ""
 "\n"
 "  City:        "
@@ -109,7 +109,7 @@ msgstr ""
 "\n"
 "  Город:      "
 
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3091
 msgid ""
 "\n"
 "  Region:      "
@@ -117,7 +117,7 @@ msgstr ""
 "\n"
 "  Область:      "
 
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3092
 msgid ""
 "\n"
 "  Postal Code: "
@@ -125,7 +125,7 @@ msgstr ""
 "\n"
 "  Почтовый код: "
 
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3093
 msgid ""
 "\n"
 "  Country:     "
@@ -133,13 +133,13 @@ msgstr ""
 "\n"
 "  Страна:     "
 
-#: addressbook/backend/ebook/e-card.c:3102
+#: addressbook/backend/ebook/e-card.c:3106
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3114
+#: addressbook/backend/ebook/e-card.c:3118
 msgid ""
 "\n"
 "Telephones:\n"
@@ -147,7 +147,7 @@ msgstr ""
 "\n"
 "Телефоны:\n"
 
-#: addressbook/backend/ebook/e-card.c:3117
+#: addressbook/backend/ebook/e-card.c:3121
 msgid ""
 "\n"
 "Telephone:"
@@ -155,7 +155,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3141
+#: addressbook/backend/ebook/e-card.c:3145
 msgid ""
 "\n"
 "E-mail:\n"
@@ -163,7 +163,7 @@ msgstr ""
 "\n"
 "Эл.адрес:\n"
 
-#: addressbook/backend/ebook/e-card.c:3144
+#: addressbook/backend/ebook/e-card.c:3148
 msgid ""
 "\n"
 "E-mail:"
@@ -171,13 +171,13 @@ msgstr ""
 "\n"
 "Эл.адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3163
+#: addressbook/backend/ebook/e-card.c:3167
 msgid ""
 "\n"
 "Mailer: "
-msgstr ""
+msgstr "\nПочтовый клиент: "
 
-#: addressbook/backend/ebook/e-card.c:3169
+#: addressbook/backend/ebook/e-card.c:3173
 msgid ""
 "\n"
 "Time Zone: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Часовой пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3177
+#: addressbook/backend/ebook/e-card.c:3181
 msgid ""
 "\n"
 "Geo Location: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "Геогр.положение: "
 
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3185
 msgid ""
 "\n"
 "Business Role: "
@@ -201,13 +201,13 @@ msgstr ""
 "\n"
 "Должность: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3197
 msgid ""
 "\n"
 "Org: "
-msgstr ""
+msgstr "\nОрг.:"
 
-#: addressbook/backend/ebook/e-card.c:3194
+#: addressbook/backend/ebook/e-card.c:3198
 msgid ""
 "\n"
 "  Name:  "
@@ -215,31 +215,31 @@ msgstr ""
 "\n"
 "  Имя:  "
 
-#: addressbook/backend/ebook/e-card.c:3195
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3196
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3201
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3202
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3206
 msgid ""
 "\n"
 "Categories: "
@@ -247,7 +247,7 @@ msgstr ""
 "\n"
 "категории: "
 
-#: addressbook/backend/ebook/e-card.c:3203
+#: addressbook/backend/ebook/e-card.c:3207
 msgid ""
 "\n"
 "Comment: "
@@ -265,7 +265,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3220
 msgid ""
 "\n"
 "Unique String: "
@@ -273,7 +273,7 @@ msgstr ""
 "\n"
 "Уникальная строка: "
 
-#: addressbook/backend/ebook/e-card.c:3219
+#: addressbook/backend/ebook/e-card.c:3223
 msgid ""
 "\n"
 "Public Key: "
@@ -281,6 +281,14 @@ msgstr ""
 "\n"
 "Публичный ключ: "
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
+msgid "Factory to import GnomeCard files into Evolution."
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:2
+msgid "Imports GnomeCard files into Evolution."
+msgstr "Импортирует файлы GnomeCard в Evolution."
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
@@ -436,405 +444,404 @@ msgstr "Не удалось запустить wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Невозможно прочесть блок приложения адресов Пилота"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
-msgid "Delete Contact?"
-msgstr "Удалить контакт?"
+#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:1
+msgid "Configure the address conduit"
+msgstr "Настроить кондуит адресной книги"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:7
-msgid "_Add"
+#: addressbook/conduit/e-address-conduit-control-applet.desktop.in.h:2
+msgid "Evolution Address conduit "
+msgstr "Кондуит адресной книги Evolution"
+
+#: addressbook/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/component/addressbook-config.glade.h:1
+#: calendar/gui/e-meeting-dialog.glade.h:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config.glade.h:5
+msgid "Add"
 msgstr "Добавить"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:62 po/tmp/evolution-mail.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:74
-msgid "_Delete"
-msgstr "Удалить"
+#: addressbook/contact-editor/contact-editor.glade.h:2
+msgid "Anni_versary:"
+msgstr "Годовщина:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:9
-msgid "Phone Types"
-msgstr "Тип телефона"
+#: addressbook/contact-editor/contact-editor.glade.h:3
+msgid "B_usiness"
+msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:10
-#: addressbook/contact-editor/e-contact-editor-strings.h:12
-msgid "New phone type"
-msgstr "Новый тип телефона"
+#: addressbook/contact-editor/contact-editor.glade.h:4
+msgid "Business _Fax"
+msgstr "Рабочий факс"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/addressbook-config.glade.h:6 po/tmp/event-editor-dialog.glade.h:7
-#: po/tmp/filter.glade.h:6 po/tmp/mail-config.glade.h:10
-msgid "Add"
-msgstr "Добавить"
+#: addressbook/contact-editor/contact-editor.glade.h:5
+msgid "C_ontacts..."
+msgstr "Контакты..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#: addressbook/contact-editor/contact-editor.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:3
+#: calendar/gui/event-editor-dialog.glade.h:5
+msgid "Ca_tegories..."
+msgstr "Категории..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:7
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:14
-msgid "_Full Name..."
-msgstr "Полное имя..."
+#: addressbook/contact-editor/contact-editor.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+msgid "Details"
+msgstr "Детали"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:15
+#: addressbook/contact-editor/contact-editor.glade.h:9
 msgid "File As:"
 msgstr "Файл как:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:16
-msgid "Web page address:"
-msgstr "Адрес web-страницы:"
+#: addressbook/contact-editor/contact-editor.glade.h:10
+#: executive-summary/component/executive-summary-config.glade.h:3
+#: mail/mail-config.glade.h:28
+msgid "General"
+msgstr "Общее"
+
+#: addressbook/contact-editor/contact-editor.glade.h:11
+msgid "New phone type"
+msgstr "Новый тип телефона"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:17
+#: addressbook/contact-editor/contact-editor.glade.h:12
+msgid "No_tes:"
+msgstr "Заметки:"
+
+#: addressbook/contact-editor/contact-editor.glade.h:13
+msgid "Phone Types"
+msgstr "Тип телефона"
+
+#: addressbook/contact-editor/contact-editor.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1339
+msgid "Primary Email"
+msgstr "Первый эл.адрес"
+
+#: addressbook/contact-editor/contact-editor.glade.h:15
 msgid "Wants to receive _HTML mail"
 msgstr "Хочет получать почту в HTML"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "_Business"
-msgstr "Рабочий"
+#: addressbook/contact-editor/contact-editor.glade.h:16
+msgid "Web page address:"
+msgstr "Адрес web-страницы:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
-msgid "_Home"
-msgstr "Домашний"
+#: addressbook/contact-editor/contact-editor.glade.h:17
+msgid "_Add"
+msgstr "Добавить"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
-msgid "Business _Fax"
-msgstr "Рабочий факс"
+#: addressbook/contact-editor/contact-editor.glade.h:18
+msgid "_Address..."
+msgstr "Адрес..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
-msgid "_Mobile"
-msgstr "Мобильный"
+#: addressbook/contact-editor/contact-editor.glade.h:19
+msgid "_Assistant's name:"
+msgstr "Имя помощника:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1336
-msgid "Primary Email"
-msgstr "Первый эл.адрес"
+#: addressbook/contact-editor/contact-editor.glade.h:20
+msgid "_Birthday:"
+msgstr "День рождения:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-msgid "B_usiness"
+#: addressbook/contact-editor/contact-editor.glade.h:21
+msgid "_Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
-msgid "_This is the mailing address"
-msgstr "Это почтовый адрес"
+#: addressbook/contact-editor/contact-editor.glade.h:22
+msgid "_Company:"
+msgstr "Компания:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
-msgid "C_ontacts..."
-msgstr "Контакты..."
+#: addressbook/contact-editor/contact-editor.glade.h:23
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:69
+msgid "_Delete"
+msgstr "Удалить"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/event-editor-dialog.glade.h:9 po/tmp/task-editor-dialog.glade.h:8
-msgid "Ca_tegories..."
-msgstr "Категории..."
+#: addressbook/contact-editor/contact-editor.glade.h:24
+msgid "_Department:"
+msgstr "Отдел"
+
+#: addressbook/contact-editor/contact-editor.glade.h:25
+msgid "_Full Name..."
+msgstr "Полное имя..."
+
+#: addressbook/contact-editor/contact-editor.glade.h:26
+msgid "_Home"
+msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
+#: addressbook/contact-editor/contact-editor.glade.h:27
 msgid "_Job title:"
 msgstr "Должность:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
-msgid "_Company:"
-msgstr "Компания:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
-msgid "_Address..."
-msgstr "Адрес..."
+#: addressbook/contact-editor/contact-editor.glade.h:28
+msgid "_Manager's Name:"
+msgstr "Имя менеджера:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:16 po/tmp/mail-config.glade.h:31
-msgid "General"
-msgstr "Общее"
+#: addressbook/contact-editor/contact-editor.glade.h:29
+msgid "_Mobile"
+msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:31
-msgid "_Department:"
-msgstr "Отдел"
+#: addressbook/contact-editor/contact-editor.glade.h:30
+msgid "_Nickname:"
+msgstr "Псевдоним:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:32
+#: addressbook/contact-editor/contact-editor.glade.h:31
 msgid "_Office:"
 msgstr "Офис:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:33
+#: addressbook/contact-editor/contact-editor.glade.h:32
 msgid "_Profession:"
 msgstr "Профессия:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:34
-msgid "_Nickname:"
-msgstr "Псевдоним:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:35
+#: addressbook/contact-editor/contact-editor.glade.h:33
 msgid "_Spouse:"
 msgstr "Супруг(а):"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:36
-msgid "_Birthday:"
-msgstr "День рождения:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:37
-msgid "_Assistant's name:"
-msgstr "Имя помощника:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:38
-msgid "_Manager's Name:"
-msgstr "Имя менеджера:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:39
-msgid "Anni_versary:"
-msgstr "Годовщина:"
+#: addressbook/contact-editor/contact-editor.glade.h:34
+msgid "_This is the mailing address"
+msgstr "Это почтовый адрес"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:40
-msgid "No_tes:"
-msgstr "Заметки:"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "Удалить контакт?"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
-msgid "Details"
-msgstr "Детали"
+#: addressbook/contact-editor/e-contact-editor.c:574
+msgid "This contact belongs to these categories:"
+msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:594
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-#: addressbook/contact-editor/e-contact-editor.c:1379
-#: addressbook/gui/widgets/e-addressbook-view.c:568
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1382
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
-#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
-#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/gui/widgets/e-addressbook-view.c:572
+#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-#: addressbook/contact-editor/e-contact-editor.c:1380
-#: addressbook/gui/widgets/e-addressbook-view.c:569
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1383
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:582
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/gui/widgets/e-addressbook-view.c:583
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/gui/widgets/e-addressbook-view.c:571
+#: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-#: addressbook/contact-editor/e-contact-editor.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: po/tmp/mail-config.glade.h:50
+#: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/contact-editor/e-contact-editor.c:1384
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:47
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/gui/widgets/e-addressbook-view.c:585
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-#: addressbook/gui/widgets/e-addressbook-view.c:567
+#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
+#: addressbook/contact-editor/e-contact-editor.c:1293
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:1294
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
+#: addressbook/contact-editor/e-contact-editor.c:1295
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1337
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/gui/widgets/e-addressbook-view.c:586
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1338
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1341
+#: addressbook/gui/widgets/e-addressbook-view.c:587
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Адрес 2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Канада"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Проверить адрес"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Страна:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Финляндия"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "США"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "Адрес:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "Город:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "Аб.ящик:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "Область/Район (Штат/Провинция):"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "Почтовый индекс:"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/fullname-strings.h:7
+#: addressbook/contact-editor/fullname.glade.h:1
 msgid "Check Full Name"
 msgstr "Проверить полное имя"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid ""
-"\n"
-"Mr.\n"
-"Mrs.\n"
-"Ms.\n"
-"Miss\n"
-"Dr.\n"
-msgstr ""
-"\n"
-"г.\n"
-"г-жа.\n"
-"гжа\n"
-"госпожа\n"
-"д-р.\n"
+#: addressbook/contact-editor/fullname.glade.h:2
+msgid "Dr."
+msgstr "Др."
 
-#: addressbook/contact-editor/fullname-strings.h:15
-msgid ""
-"\n"
-"Sr.\n"
-"Jr.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-msgstr ""
-"\n"
-"Sr.\n"
-"мл.\n"
-"I\n"
-"II\n"
-"III\n"
-"Esq.\n"
-
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname.glade.h:3
+msgid "Esq."
+msgstr "Эскв."
+
+#: addressbook/contact-editor/fullname.glade.h:4
+msgid "I"
+msgstr "I"
+
+#: addressbook/contact-editor/fullname.glade.h:5
+msgid "II"
+msgstr "II"
+
+#: addressbook/contact-editor/fullname.glade.h:6
+msgid "III"
+msgstr "III"
+
+#: addressbook/contact-editor/fullname.glade.h:7
+msgid "Jr."
+msgstr "мл."
+
+#: addressbook/contact-editor/fullname.glade.h:8
+msgid "Miss"
+msgstr "Мисс"
+
+#: addressbook/contact-editor/fullname.glade.h:9
+msgid "Mr."
+msgstr "Mr."
+
+#: addressbook/contact-editor/fullname.glade.h:10
+msgid "Mrs."
+msgstr "Mrs."
+
+#: addressbook/contact-editor/fullname.glade.h:11
+msgid "Ms."
+msgstr "Ms."
+
+#: addressbook/contact-editor/fullname.glade.h:12
+msgid "Sr."
+msgstr "Sr."
+
+#: addressbook/contact-editor/fullname.glade.h:13
 msgid "_First:"
 msgstr "Имя:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
-msgid "_Title:"
-msgstr "Заголовок:"
+#: addressbook/contact-editor/fullname.glade.h:14
+msgid "_Last:"
+msgstr "Фамилия:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname.glade.h:15
 msgid "_Middle:"
 msgstr "Отчество:"
 
-#: addressbook/contact-editor/fullname-strings.h:26
-msgid "_Last:"
-msgstr "Фамилия:"
-
-#: addressbook/contact-editor/fullname-strings.h:27
+#: addressbook/contact-editor/fullname.glade.h:16
 msgid "_Suffix:"
 msgstr "Суффикс:"
 
-#: addressbook/gui/component/addressbook.c:231
+#: addressbook/contact-editor/fullname.glade.h:17
+msgid "_Title:"
+msgstr "Заголовок:"
+
+#: addressbook/gui/component/addressbook.c:230
 msgid "As _Minicards"
 msgstr "Как миникарточки"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/addressbook.c:237
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:236
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Как таблица"
 
-#: addressbook/gui/component/addressbook.c:406
+#: addressbook/gui/component/addressbook.c:405
 #, c-format
 msgid "Enter password for %s"
 msgstr "Введите пароль для %s"
 
-#: addressbook/gui/component/addressbook.c:434
+#: addressbook/gui/component/addressbook.c:433
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:439
+#: addressbook/gui/component/addressbook.c:438
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -854,27 +861,27 @@ msgstr ""
 "использовать LDAP, вам надо скачать и установить \n"
 "OpenLDAP и перекомпилировать и установить evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:562 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:561 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Показать все"
 
-#: addressbook/gui/component/addressbook.c:564 mail/folder-browser.c:223
+#: addressbook/gui/component/addressbook.c:563 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Расширенные..."
 
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:593
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:595
+#: addressbook/gui/component/addressbook.c:594
 msgid "Name contains"
 msgstr "Имя содержит"
 
-#: addressbook/gui/component/addressbook.c:596
+#: addressbook/gui/component/addressbook.c:595
 msgid "Email contains"
 msgstr "Эл.адрес содержит"
 
-#: addressbook/gui/component/addressbook.c:739
+#: addressbook/gui/component/addressbook.c:738
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -899,9 +906,9 @@ msgid "None (anonymous mode)"
 msgstr "Нет (анонимный режим)"
 
 #: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:249
+#: camel/providers/imap/camel-imap-store.c:250
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:146
+#: camel/providers/pop3/camel-pop3-store.c:140
 msgid "Password"
 msgstr "Пароль"
 
@@ -929,314 +936,355 @@ msgstr "Поддерево"
 msgid "Unknown scope type"
 msgstr "Неизвестный тип области действия"
 
-#: addressbook/gui/component/addressbook-config.c:340
+#: addressbook/gui/component/addressbook-config.c:348
 msgid "Bind DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:341
+#: addressbook/gui/component/addressbook-config.c:349
 msgid "FIXME Bind DN Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:343
+#: addressbook/gui/component/addressbook-config.c:351
 msgid "Remember this password"
 msgstr "Запомнить этот пароль"
 
-#: addressbook/gui/component/addressbook-config.c:393
-#: po/tmp/mail-config.glade.h:32
+#: addressbook/gui/component/addressbook-config.c:401
+#: mail/mail-config.glade.h:29
 msgid "Host:"
 msgstr "Хост:"
 
-#: addressbook/gui/component/addressbook-config.c:394
+#: addressbook/gui/component/addressbook-config.c:402
 msgid "FIXME Host help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:396
+#: addressbook/gui/component/addressbook-config.c:404
 msgid "Port:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/addressbook-config.c:397
+#: addressbook/gui/component/addressbook-config.c:405
 msgid "FIXME Port help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:409
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:410
 msgid "FIXME Root DN help text here."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:422
+#: addressbook/gui/component/addressbook-config.c:430
 msgid "Search Scope:"
 msgstr "Поиск области действия:"
 
-#: addressbook/gui/component/addressbook-config.c:476
-#: po/tmp/mail-config.glade.h:14
+#: addressbook/gui/component/addressbook-config.c:484
+#: mail/mail-config.glade.h:9
 msgid "Authentication:"
 msgstr "Идентификация:"
 
-#: addressbook/gui/component/addressbook-config.c:494
-#: mail/mail-config-druid.c:461 po/tmp/mail-config.glade.h:53
+#: addressbook/gui/component/addressbook-config.c:502
+#: mail/mail-config-druid.c:491 mail/mail-config.glade.h:50
 msgid "Path:"
 msgstr "Путь:"
 
-#: addressbook/gui/component/addressbook-config.c:495
+#: addressbook/gui/component/addressbook-config.c:503
 msgid "FIXME Path Help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:500
+#: addressbook/gui/component/addressbook-config.c:508
 msgid "Create path if it doesn't exist."
 msgstr "Создать путь, если он не существует."
 
-#: addressbook/gui/component/addressbook-config.c:634
+#: addressbook/gui/component/addressbook-config.c:642
 msgid "Edit Addressbook"
 msgstr "Правка адресной книги"
 
-#: addressbook/gui/component/addressbook-config.c:636
+#: addressbook/gui/component/addressbook-config.c:644
 msgid "Add Addressbook"
 msgstr "Добавить адресную книгу"
 
-#: addressbook/gui/component/addressbook-config.c:652
+#: addressbook/gui/component/addressbook-config.c:660
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
 msgstr ""
 "Выберите вид вашей адресной книги и введите соответствующую информацию о ней."
 
-#: addressbook/gui/component/addressbook-config.c:658
-#: po/tmp/mail-config.glade.h:45
+#: addressbook/gui/component/addressbook-config.c:666
+#: mail/mail-config.glade.h:42
 msgid "Name:"
 msgstr "Имя:"
 
-#: addressbook/gui/component/addressbook-config.c:659
+#: addressbook/gui/component/addressbook-config.c:667
 msgid "FIXME Name help text here"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:661
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:669
+#: calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "Description:"
 msgstr "Описание:"
 
-#: addressbook/gui/component/addressbook-config.c:662
+#: addressbook/gui/component/addressbook-config.c:670
 msgid "FIXME Description help text here"
 msgstr ""
 
-#: po/tmp/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:2
 msgid "Addressbook Sources"
 msgstr "Источники адресных книг"
 
-#: calendar/gui/e-calendar-table.c:403 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:684 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
-#: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:22
-#: po/tmp/evolution-mail.xml.h:11 po/tmp/evolution-task-editor-dialog.xml.h:23
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:24
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-meeting-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:7 mail/folder-browser.c:684
+#: mail/mail-config.glade.h:21 mail/mail-view.c:150
+#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
+#: ui/evolution-mail.xml.h:6 ui/evolution-task-editor-dialog.xml.h:18
 msgid "Delete"
 msgstr "Удалить"
 
-#: mail/folder-browser.c:670 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
+#: mail/folder-browser.c:670 mail/mail-config.glade.h:24
 msgid "Edit"
 msgstr "Правка"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:565
-#: po/tmp/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:5
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Name"
 msgstr "Имя"
 
-#: po/tmp/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:6
 msgid "URI"
 msgstr "URI"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+msgid "Control that displays an Evolution addressbook minicard."
+msgstr "Что показывать в миникарточках адресной книги Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "Evolution Addressbook minicard viewer"
+msgstr "Просмотрщик миникарточек адресной книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+msgid "Evolution component for handling contacts."
+msgstr "Компонент Evolution для обработки контактов."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Factory for the Addressbook Minicard control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution addressbook component."
+msgstr "Средство настройки для кондуита адресной книги Evolution.\n"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the sample Addressbook control"
+msgstr "Щелкните здесь для адресной книги"
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "Интерфейс выбора имени в адресной книге Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Найти..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Получатели сообщения"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Выбрать имена"
 
-#: po/tmp/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Select name from:"
 msgstr "Выбрать имена из:"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: addressbook/gui/search/e-addressbook-search-dialog.c:150
 msgid "Search"
 msgstr "Поиск"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:1
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:469
-#: addressbook/gui/widgets/e-minicard.c:374
+#: addressbook/gui/widgets/e-addressbook-view.c:474
+#: addressbook/gui/widgets/e-minicard.c:376
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:566
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "* Click here to add a contact *"
+msgstr "* Щелкните здесь для добавления контакта *"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Email"
 msgstr "Эл.адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:570
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Web Site"
 msgstr "Сайт в Интернет"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:589
 msgid "Department"
 msgstr "Отдел"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/gui/widgets/e-addressbook-view.c:590
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/gui/widgets/e-addressbook-view.c:591
 msgid "Title"
 msgstr "Заголовок"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/gui/widgets/e-addressbook-view.c:592
 msgid "Profession"
 msgstr "Профессия"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/gui/widgets/e-addressbook-view.c:593
 msgid "Manager"
 msgstr "Управляющий"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/gui/widgets/e-addressbook-view.c:595
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/gui/widgets/e-addressbook-view.c:596
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:591
+#: addressbook/gui/widgets/e-addressbook-view.c:597
 msgid "Note"
 msgstr "Заметка"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/gui/widgets/e-addressbook-view.c:598
 msgid "Free-busy URL"
 msgstr ""
 
+#: addressbook/gui/widgets/e-addressbook-view.c:599
+msgid "Click here to add a contact"
+msgstr "Щелкните здесь для добавления контакта"
+
 #: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Сохранить в адресной книге"
@@ -1255,175 +1303,172 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь для создания нового контакта."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Пустая форма в конце:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Тело"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Снизу:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Размеры:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "Font..."
 msgstr "Шрифт..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Шрифты..."
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Сноска:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Формат"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Заголовок"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Заголовок/Сноска"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Заголовки"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Заголовки для каждой буквы"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "Высота:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Один за другим"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Включить:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Блокнот"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Слева:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Закладки букв сбоку"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Поля"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:22
+#: executive-summary/component/executive-summary-config.glade.h:4
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Параметры"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "Ориентация"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Страница"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Настройка страницы:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Бумага"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Источник бумаги:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Портрет"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "Просмотр:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Печать с использованием полутонов"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Обращать на четных страницах"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "Справа:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Разделы:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Полутона"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "Размер:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Начинать с новой страницы"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Название стиля:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Сверху:"
 
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:75
+#: addressbook/printing/e-contact-print.glade.h:40 mail/mail-config.glade.h:72
 msgid "Type:"
 msgstr "Тип:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Ширина:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "label26"
 msgstr "метка26"
 
@@ -1445,6 +1490,22 @@ msgstr "Ошибка при подключении к серверу календаря"
 msgid "Could not read pilot's Calendar application block"
 msgstr "Невозможно прочесть блок приложения календарь Пилота"
 
+#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:1
+msgid "Configure the GnomeCal conduit"
+msgstr "Настройка кондуита GnomeCal"
+
+#: calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop.in.h:2
+msgid "Evolution Calendar conduit"
+msgstr "Кондуит календаря Evolution"
+
+#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:1
+msgid "Configure the todo conduit"
+msgstr "Настроить кондуит заданий"
+
+#: calendar/conduits/todo/e-todo-conduit-control-applet.desktop.in.h:2
+msgid "Evolution ToDo conduit "
+msgstr "Кондуит заданий Evolution"
+
 #: calendar/conduits/todo/todo-conduit-control-applet.c:127
 msgid "Evolution ToDo Conduit"
 msgstr "Кондуит заданий Evolution"
@@ -1458,19 +1519,33 @@ msgstr "Средство настройки для кондуита заданий Evolution.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
-#: calendar/gui/calendar-commands.c:248
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
+msgstr "Напоминать обо всех встречах"
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Короткий сон"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/calendar-commands.c:233
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: calendar/gui/calendar-commands.c:272
+#: calendar/gui/calendar-commands.c:257
 msgid "Open calendar"
 msgstr "Открыть календарь"
 
-#: calendar/gui/calendar-commands.c:314
+#: calendar/gui/calendar-commands.c:299
 msgid "Save calendar"
 msgstr "Сохранить календарь"
 
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:444
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
@@ -1478,7 +1553,7 @@ msgstr ""
 "и OAF."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:335
+#: calendar/gui/calendar-model.c:334
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1486,58 +1561,59 @@ msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:339 calendar/gui/calendar-model.c:769
+#: calendar/gui/calendar-model.c:338 calendar/gui/calendar-model.c:768
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:343 calendar/gui/calendar-model.c:772
+#: calendar/gui/calendar-model.c:342 calendar/gui/calendar-model.c:771
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:377 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:376
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/calendar-model.c:380 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:379
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/calendar-model.c:383 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:382
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
-#: calendar/gui/calendar-model.c:386 calendar/gui/calendar-model.c:554
+#: calendar/gui/calendar-model.c:385 calendar/gui/calendar-model.c:553
+#: calendar/gui/event-editor.c:1579 calendar/gui/event-editor.c:1606
 #: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Unknown"
 msgstr "Неизвестное"
 
-#: calendar/gui/calendar-model.c:474
+#: calendar/gui/calendar-model.c:473
 msgid "N"
 msgstr "С"
 
-#: calendar/gui/calendar-model.c:474
+#: calendar/gui/calendar-model.c:473
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/calendar-model.c:476
+#: calendar/gui/calendar-model.c:475
 msgid "E"
 msgstr "В"
 
-#: calendar/gui/calendar-model.c:476
+#: calendar/gui/calendar-model.c:475
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/calendar-model.c:548
+#: calendar/gui/calendar-model.c:547
 msgid "Transparent"
 msgstr "Прозрачный"
 
-#: calendar/gui/calendar-model.c:551
+#: calendar/gui/calendar-model.c:550
 msgid "Opaque"
 msgstr "Непрозрачный"
 
-#: calendar/gui/calendar-model.c:777
+#: calendar/gui/calendar-model.c:776
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1549,7 +1625,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:878 calendar/gui/calendar-model.c:926
+#: calendar/gui/calendar-model.c:877 calendar/gui/calendar-model.c:925
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1557,27 +1633,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:896
+#: calendar/gui/calendar-model.c:895
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:898
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:903
+#: calendar/gui/calendar-model.c:902
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:906
+#: calendar/gui/calendar-model.c:905
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1026
+#: calendar/gui/calendar-model.c:1025
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1587,43 +1663,64 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1066
+#: calendar/gui/calendar-model.c:1065
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значение процента должно быть между 0 и 100, включительно"
 
-#: calendar/gui/calendar-model.c:1106
+#: calendar/gui/calendar-model.c:1105
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Приоритет должен быть между 1 и 9, включительно"
 
-#: calendar/gui/calendar-summary.c:96
+#: calendar/gui/calendar-model.c:1548
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+msgid "Normal"
+msgstr "Нормальный"
+
+#: calendar/gui/calendar-model.c:1550
+msgid "Recurring"
+msgstr "Повторение"
+
+#: calendar/gui/calendar-model.c:1552
+msgid "Assigned"
+msgstr "Связанное"
+
+#: calendar/gui/calendar-model.c:1558
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/calendar-model.c:1558
+msgid "No"
+msgstr "Нет"
+
+#: calendar/gui/calendar-summary.c:197
 msgid "%A, %e %B %Y"
 msgstr "%A, %e %B %Y"
 
-#: calendar/gui/calendar-summary.c:137 calendar/gui/calendar-summary.c:143
+#: calendar/gui/calendar-summary.c:240 calendar/gui/calendar-summary.c:246
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:301
+#: calendar/gui/calendar-summary.c:438
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Ошибка при загрузке календаря</b>"
 
-#: calendar/gui/calendar-summary.c:313
+#: calendar/gui/calendar-summary.c:450
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Ошибка загрузки календаря:<br>Метод не поддерживается"
 
-#: calendar/gui/calendar-summary.c:483
+#: calendar/gui/calendar-summary.c:620
 msgid "Display"
 msgstr "Отобразить"
 
-#: calendar/gui/calendar-summary.c:488
+#: calendar/gui/calendar-summary.c:625
 msgid "Show appointments"
 msgstr "Показать встречи"
 
-#: calendar/gui/calendar-summary.c:496
+#: calendar/gui/calendar-summary.c:633
 msgid "Show tasks"
 msgstr "Показать задания"
 
-#: calendar/gui/calendar-summary.c:582
+#: calendar/gui/calendar-summary.c:719 calendar/gui/e-itip-control.glade.h:7
 msgid "Loading Calendar"
 msgstr "Загрузка календаря"
 
@@ -1643,263 +1740,262 @@ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Итог не доступен."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:15
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:16 po/tmp/evolution.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:10
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
+#: ui/evolution-task-editor-dialog.xml.h:11 ui/evolution.xml.h:2
 msgid "Close"
 msgstr "Закрыть"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
 msgid "Edit appointment"
 msgstr "Правка встречи"
 
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Короткий сон"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Время дремания (минут)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 минут"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 минут"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "12 hour (am/pm)"
 msgstr "12-часовой (ДП/ПП)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 минут"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24-часовой"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 минут"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 минут"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Alarms timeout after"
 msgstr "Задержка таймера на"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Audio Alarms"
 msgstr "Аудио Таймеры"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Гудок при возникновении окна таймера."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16 po/tmp/evolution-calendar.xml.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar"
 msgstr "Календарь"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Calendar Preferences"
 msgstr "Настройки календаря"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Цвета"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends"
 msgstr "Сжать выходные дни"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Date navigator options"
 msgstr "Параметры навигатора дат"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Исх.значения"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display options"
 msgstr "Отобразить параметры"
 
-#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/e-calendar-table.c:159
 msgid "Due Date"
 msgstr "Условленная дата"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "Разрешить краткий сон для "
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Конец дня:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "First day of week:"
 msgstr "Первый день недели:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Fri"
 msgstr "Пят"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:477
 msgid "Friday"
 msgstr "Пятница"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Highlight"
 msgstr "Подсвеченные дни:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
 msgstr "Задания установленные на сегодня"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Items Due Today:"
 msgstr "Задания установленные на сегодня:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Items Not Yet Due"
 msgstr "Еще не просроченные задания"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Items Not Yet Due:"
 msgstr "Еще не просроченные задания:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Mon"
 msgstr "Пон"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:473
 msgid "Monday"
 msgstr "Понедельник"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Overdue Items"
 msgstr "Просроченные задания"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Overdue Items:"
 msgstr "Просроченные задания:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:162
 msgid "Priority"
 msgstr "Приоритет"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Remind me of all appointments"
 msgstr "Напоминать обо всех встречах"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Reminders"
 msgstr "Напоминания"
 
-#: po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Sat"
 msgstr "Суб"
 
-#: calendar/gui/event-editor.c:440 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:478
 msgid "Saturday"
 msgstr "Суббота"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Show"
 msgstr "Показать"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Show appointment end times"
 msgstr "Показать время окончании встречи"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week numbers"
 msgstr "Показать номера недель"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Start of day:"
 msgstr "Начало дня:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Sun"
 msgstr "Вск"
 
-#: calendar/gui/event-editor.c:441 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:479
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "TaskPad"
 msgstr "Панель заданий"
 
-#: po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Thu"
 msgstr "Чтв"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:476
 msgid "Thursday"
 msgstr "Четверг"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Time Until Due"
 msgstr "Время до условленного"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time divisions:"
 msgstr "Разделители времени:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Time format:"
 msgstr "Формат времени:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "Tue"
 msgstr "Втр"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:474
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Visual Alarms"
 msgstr "Видимые таймеры"
 
-#: po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Wed"
 msgstr "Срд"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:475
 msgid "Wednesday"
 msgstr "Среда"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work week"
 msgstr "Рабочая неделя"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "minutes before they occur."
 msgstr "минут до назначенного времени."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63 po/tmp/mail-config.glade.h:81
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: mail/mail-config.glade.h:79
 msgid "seconds."
 msgstr "секунд."
 
@@ -1930,192 +2026,200 @@ msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
 msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы уверены что хотите удалить эту неозаглавленную журнальную запись?"
 
-#: calendar/gui/dialogs/save-comp.c:50
+#: calendar/gui/dialogs/save-comp.c:51
 msgid "Do you want to save changes?"
 msgstr "Хотите сохранить изменения?"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
+#, no-c-format
 msgid "% Comp_lete:"
 msgstr "% Выполнения:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
-msgid "C_lassification:"
-msgstr "Классификация:"
-
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
 msgid "Cancelled"
 msgstr "Отменено"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
+#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/event-editor-dialog.glade.h:6
+msgid "Classification"
+msgstr "Классификация"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "Completed"
 msgstr "Выполнено"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: calendar/gui/event-editor-dialog.glade.h:8
+msgid "Date & Time"
+msgstr "Дата и время"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Date Completed:"
 msgstr "Дата выполнения:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "High"
 msgstr "Высокий"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "In Progress"
 msgstr "В процессе"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Low"
 msgstr "Низкий"
 
-#. add a "None" option to the stores menu
-#: mail/mail-account-editor.c:675 mail/mail-account-editor.c:677
-#: mail/mail-account-editor.c:726 mail/mail-accounts.c:114
-#: mail/mail-config-druid.c:875 po/tmp/mail-config.glade.h:47
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1119
-#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
-#: widgets/misc/e-dateedit.c:1445
-msgid "None"
-msgstr "Нет"
-
-#: po/tmp/task-editor-dialog.glade.h:18
-msgid "Normal"
-msgstr "Нормальный"
-
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "Not Started"
 msgstr "Не начато"
 
-#: po/tmp/task-editor-dialog.glade.h:22
-msgid "S_ummary"
-msgstr "Итог"
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:16
+msgid "Pri_vate"
+msgstr "Личное"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+msgid "Progress"
+msgstr "Продвижение"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
+msgid "Pu_blic"
+msgstr "Общее"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Sta_rt Date:"
 msgstr "Дата начала:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:27
+msgid "Su_mmary:"
+msgstr "Итог:"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Task"
 msgstr "Задание"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "Undefined"
 msgstr "Неопределенное"
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Confidential"
+msgstr "Конфиденциальное"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "_Contacts..."
 msgstr "Контакты..."
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "_Due Date:"
 msgstr "Условленная дата:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Priority:"
 msgstr "Приоритет:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Status:"
 msgstr "Состояние:"
 
-#: po/tmp/task-editor-dialog.glade.h:31
-msgid "task-editor-dialog"
-msgstr "диалог редактора заданий"
-
-#: calendar/gui/dialogs/task-editor.c:693
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Правка задания"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:337
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:375
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:343
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:381
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:346
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:384
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/dialogs/task-editor.c:711 calendar/gui/event-editor.c:349
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:387
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
 
-#: calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-calendar-table.c:154
 msgid "Categories"
 msgstr "Категории"
 
-#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr "Классификация"
-
-#: calendar/gui/e-calendar-table.c:155
+#: calendar/gui/e-calendar-table.c:156
 msgid "Completion Date"
 msgstr "Дата выполненения"
 
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
 msgid "End Date"
 msgstr "Дата окончания"
 
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
 msgid "Start Date"
 msgstr "Дата начала"
 
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
 msgid "Geographical Position"
 msgstr "Географическое расположение"
 
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
 msgid "Precent complete"
 msgstr "Процент выполненного"
 
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
 msgid "Summary"
 msgstr "Итог"
 
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
 msgid "Transparency"
 msgstr "Прозрачность"
 
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
 msgid "URL"
 msgstr "URL"
 
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
 msgid "Alarms"
 msgstr "Аудио Таймеры"
 
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
 msgid "Click here to add a task"
 msgstr "Щелкните здесь для добавления задачи"
 
-#: calendar/gui/e-calendar-table.c:397
-msgid "Open..."
-msgstr "Открыть..."
-
 #: calendar/gui/e-calendar-table.c:398
-msgid "Open the task"
-msgstr "Открыть задание"
-
-#: calendar/gui/e-calendar-table.c:400
 msgid "Mark Complete"
 msgstr "Пометить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:401
+#: calendar/gui/e-calendar-table.c:399
 msgid "Mark the task complete"
 msgstr "Пометить задание как выполненное"
 
 #: calendar/gui/e-calendar-table.c:404
+msgid "Edit this task..."
+msgstr "Правка этого задания..."
+
+#: calendar/gui/e-calendar-table.c:405
+msgid "Edit the task"
+msgstr "Правка задания"
+
+#: calendar/gui/e-calendar-table.c:407
+#: ui/evolution-task-editor-dialog.xml.h:19
+msgid "Delete this task"
+msgstr "Удалить это задание"
+
+#: calendar/gui/e-calendar-table.c:408
 msgid "Delete the task"
 msgstr "Удалить задание"
 
@@ -2126,149 +2230,274 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1270
+#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1273
 #: calendar/gui/e-week-view-main-item.c:321
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1284
+#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1287
 #: calendar/gui/e-week-view-main-item.c:330
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1297
+#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1300
 #: calendar/gui/e-week-view-main-item.c:344
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:552 calendar/gui/e-week-view.c:286
+#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
 #: calendar/gui/print.c:612
 msgid "am"
 msgstr "д.п."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:555 calendar/gui/e-week-view.c:289
+#: calendar/gui/e-day-view.c:558 calendar/gui/e-week-view.c:292
 #: calendar/gui/print.c:611
 msgid "pm"
 msgstr "п.п."
 
-#: calendar/gui/e-day-view.c:3007 calendar/gui/e-day-view.c:3014
-#: calendar/gui/e-day-view.c:3023 calendar/gui/e-week-view.c:3210
-#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3226
+#: calendar/gui/e-day-view.c:3010 calendar/gui/e-day-view.c:3023
+#: calendar/gui/e-day-view.c:3038 calendar/gui/e-week-view.c:3213
+#: calendar/gui/e-week-view.c:3226 calendar/gui/e-week-view.c:3241
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:3011 calendar/gui/e-day-view.c:3018
-#: calendar/gui/e-week-view.c:3214 calendar/gui/e-week-view.c:3221
+#: calendar/gui/e-day-view.c:3014 calendar/gui/e-day-view.c:3028
+#: calendar/gui/e-week-view.c:3217 calendar/gui/e-week-view.c:3231
+msgid "Schedule meeting"
+msgstr "Вставить встречу в расписание"
+
+#: calendar/gui/e-day-view.c:3018 calendar/gui/e-day-view.c:3032
+#: calendar/gui/e-week-view.c:3221 calendar/gui/e-week-view.c:3235
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:3012 calendar/gui/e-week-view.c:3215
-#: po/tmp/evolution-event-editor.xml.h:23
+#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
+#: ui/evolution-event-editor.xml.h:18
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:3019 calendar/gui/e-week-view.c:3222
+#: calendar/gui/e-day-view.c:3027 calendar/gui/e-week-view.c:3230
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-week-view.c:3223
+#: calendar/gui/e-day-view.c:3033 calendar/gui/e-week-view.c:3236
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:3021 calendar/gui/e-week-view.c:3224
+#: calendar/gui/e-day-view.c:3034 calendar/gui/e-week-view.c:3237
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
-#: calendar/gui/e-itip-control.c:152
+#: calendar/gui/e-itip-control.c:153
 msgid "I couldn't update your calendar file!\n"
 msgstr "Не удалось обновить ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:158 calendar/gui/e-itip-control.c:501
+#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
 msgid "Component successfully updated."
 msgstr "Компонент успешно обновлен."
 
-#: calendar/gui/e-itip-control.c:164
+#: calendar/gui/e-itip-control.c:165
 msgid "There was an error loading the calendar file."
 msgstr "При загрузке файла календаря возникла ошибка."
 
-#: calendar/gui/e-itip-control.c:188
+#: calendar/gui/e-itip-control.c:189
 msgid "I couldn't open your calendar file!\n"
 msgstr "Не удалось открыть ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:449 calendar/gui/e-itip-control.c:520
+#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
 msgid "I couldn't load your calendar file!\n"
 msgstr "Не удалось загрузить ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:461
+#: calendar/gui/e-itip-control.c:462
 msgid "I couldn't read your calendar file!\n"
 msgstr "Не удалось прочесть ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:474
+#: calendar/gui/e-itip-control.c:475
 msgid "This is a reply from someone who was uninvited!"
 msgstr "Это ответ от кого-то кто не был приглашен!"
 
-#: calendar/gui/e-itip-control.c:490
+#: calendar/gui/e-itip-control.c:491
 msgid "I couldn't update your calendar store."
 msgstr "Не удалось обновить хранилище вашего календаря."
 
-#: calendar/gui/e-itip-control.c:531
+#: calendar/gui/e-itip-control.c:532
 msgid "I couldn't delete the calendar component!\n"
 msgstr "Не удалось удалить компонент календаря!\n"
 
-#: calendar/gui/e-itip-control.c:541
+#: calendar/gui/e-itip-control.c:542
 msgid "Component successfully deleted."
 msgstr "Компонент успешно удален."
 
-#: calendar/gui/e-itip-control.c:685
+#: calendar/gui/e-itip-control.c:686
 msgid "I don't recognize this type of calendar component."
 msgstr "Не распознан этот тип компонента календаря."
 
-#: calendar/gui/e-itip-control.c:771
+#: calendar/gui/e-itip-control.c:772
 msgid "Add to Calendar"
 msgstr "Добавить к календарю"
 
-#: calendar/gui/e-itip-control.c:805
+#: calendar/gui/e-itip-control.c:806
 msgid "Accept"
 msgstr "Принять"
 
-#: calendar/gui/e-itip-control.c:806
+#: calendar/gui/e-itip-control.c:807
 msgid "Decline"
 msgstr "Отклонить"
 
-#: calendar/gui/e-itip-control.c:807
+#: calendar/gui/e-itip-control.c:808
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Экспериментальный"
 
-#: calendar/gui/e-itip-control.c:851
+#: calendar/gui/e-itip-control.c:852
 msgid "Update Calendar"
 msgstr "Обновить календарь"
 
-#: calendar/gui/e-itip-control.c:874
+#: calendar/gui/e-itip-control.c:875
 msgid "Cancel Meeting"
 msgstr "Отменить встречу"
 
-#: calendar/gui/e-tasks.c:139 calendar/gui/e-tasks.c:453
-#: calendar/gui/e-tasks.c:486
+#: calendar/gui/e-itip-control.glade.h:2
+#, no-c-format
+msgid "%P %%"
+msgstr "%P %%"
+
+#: calendar/gui/e-itip-control.glade.h:3
+msgid "--to--"
+msgstr ""
+
+#: calendar/gui/e-itip-control.glade.h:4
+msgid "Calendar Message"
+msgstr "Сообщение календаря"
+
+#: calendar/gui/e-itip-control.glade.h:5
+msgid "Date:"
+msgstr "Дата:"
+
+#: calendar/gui/e-itip-control.glade.h:8
+msgid "Loading calendar..."
+msgstr "Загрузка календаря..."
+
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
+#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:18
+msgid "Sender"
+msgstr "Отправитель"
+
+#: calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Итог:"
+
+#: calendar/gui/e-itip-control.glade.h:12
+msgid "date-end"
+msgstr "дата-завершения"
+
+#: calendar/gui/e-itip-control.glade.h:13
+msgid "date-start"
+msgstr "дата-начала"
+
+#: calendar/gui/e-meeting-dialog.glade.h:2
+msgid "Attendee"
+msgstr "Сопровождение"
+
+#: calendar/gui/e-meeting-dialog.glade.h:3
+msgid "Attendee address"
+msgstr "Адрес сопровождения"
+
+#: calendar/gui/e-meeting-dialog.glade.h:4
+msgid "Attendees: "
+msgstr "Сопровождение:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:5
+msgid ""
+"Cancel\n"
+"Meeting"
+msgstr ""
+"Отменить\n"
+"встречу"
+
+#: calendar/gui/e-meeting-dialog.glade.h:7
+msgid "Chair"
+msgstr "Председатель"
+
+#: calendar/gui/e-meeting-dialog.glade.h:10
+msgid "Meeting Invitations"
+msgstr "Приглашение на встречу"
+
+#: calendar/gui/e-meeting-dialog.glade.h:11
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:12
+msgid "Optional Participant"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/e-meeting-dialog.glade.h:13
+msgid "Organizer: "
+msgstr "Организатор:"
+
+#: calendar/gui/e-meeting-dialog.glade.h:15
+msgid ""
+"Publish\n"
+"Event"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:17
+msgid "RSVP"
+msgstr ""
+
+#: calendar/gui/e-meeting-dialog.glade.h:18
+msgid ""
+"Request\n"
+"Meeting"
+msgstr ""
+"Запросить\n"
+"встречу"
+
+#: calendar/gui/e-meeting-dialog.glade.h:20
+msgid "Required Participant"
+msgstr "Требуемые участники"
+
+#: calendar/gui/e-meeting-dialog.glade.h:21
+msgid "Role"
+msgstr "Роль"
+
+#: calendar/gui/e-meeting-dialog.glade.h:22
+msgid ""
+"Schedule\n"
+"Time"
+msgstr ""
+"Вставить встречу\n"
+"в расписание"
+
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:22
+#: mail/message-list.c:1171
+msgid "Status"
+msgstr "Состояние"
+
+#: calendar/gui/e-tasks.c:144 calendar/gui/e-tasks.c:459
+#: calendar/gui/e-tasks.c:492
 msgid "All"
 msgstr "Все"
 
-#: calendar/gui/e-tasks.c:145
+#: calendar/gui/e-tasks.c:150
 msgid "Category:"
 msgstr "Категории:"
 
-#: calendar/gui/e-tasks.c:283
+#: calendar/gui/e-tasks.c:288
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Невозможно загрузить задание в \"%s\""
 
-#: calendar/gui/e-tasks.c:295
+#: calendar/gui/e-tasks.c:300
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
@@ -2280,201 +2509,283 @@ msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:1
 msgid "A_ll day event"
 msgstr "Все события дня"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:3
+msgid "Appointment"
+msgstr "Встреча"
+
+#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Appointment Basics"
 msgstr "Основания встречи"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:7
 msgid "Custom recurrence"
 msgstr "Другое повторение"
 
-#: po/tmp/event-editor-dialog.glade.h:12
-msgid "Days"
-msgstr "Дни"
-
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Every"
 msgstr "Каждый"
 
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Exceptions"
 msgstr "Исключения"
 
-#: po/tmp/event-editor-dialog.glade.h:17
-msgid "Hours"
-msgstr "Часы"
-
-#: po/tmp/event-editor-dialog.glade.h:18
-msgid "Mail _to:"
-msgstr "Почта для:"
-
-#: po/tmp/event-editor-dialog.glade.h:19
-msgid "Minutes"
-msgstr "Минуты"
-
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Modify"
 msgstr "Изменить"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "No recurrence"
 msgstr "Без повторения"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1566
+msgid "Play a sound"
+msgstr "Воспроизвести звук"
+
+#: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Preview"
 msgstr "Просмотр"
 
-#: po/tmp/event-editor-dialog.glade.h:23
-msgid "Pri_vate"
-msgstr "Личное"
-
-#: po/tmp/event-editor-dialog.glade.h:24
-msgid "Pu_blic"
-msgstr "Общее"
-
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Recurrence Rule"
 msgstr "Правило повторения"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "Reminder"
 msgstr "Напоминание"
 
-#: po/tmp/event-editor-dialog.glade.h:28
-msgid "Simple recurrence"
-msgstr "Простое повторение"
-
-#: po/tmp/event-editor-dialog.glade.h:29
-msgid "Su_mmary:"
-msgstr "Итог:"
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1575
+msgid "Run a program"
+msgstr "Запустить программу"
 
-#: po/tmp/event-editor-dialog.glade.h:30
-msgid "Time"
-msgstr "Время"
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1572
+msgid "Send an email"
+msgstr "Отправить почту"
 
-#: po/tmp/event-editor-dialog.glade.h:31
-msgid "_Audio"
-msgstr "Аудио"
+#: calendar/gui/event-editor-dialog.glade.h:24
+msgid "Settings..."
+msgstr "Установки..."
 
-#: po/tmp/event-editor-dialog.glade.h:32
-msgid "_Confidential"
-msgstr "Конфиденциальное"
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1569
+msgid "Show a dialog"
+msgstr "Показать диалог"
 
-#: po/tmp/event-editor-dialog.glade.h:33
-msgid "_Contacts"
-msgstr "Контакты"
-
-#: po/tmp/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "Отобразить"
+#: calendar/gui/event-editor-dialog.glade.h:26
+msgid "Simple recurrence"
+msgstr "Простое повторение"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_End time:"
 msgstr "Время окончания:"
 
-#: po/tmp/event-editor-dialog.glade.h:36
-msgid "_Mail"
-msgstr "Почта"
-
-#: po/tmp/event-editor-dialog.glade.h:37
-msgid "_Program"
-msgstr "Программа"
-
-#: po/tmp/event-editor-dialog.glade.h:38
-msgid "_Run program:"
-msgstr "Запустить программу:"
-
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Start time:"
 msgstr "Время начала:"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Starting date:"
 msgstr "Дата начала:"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:25
+msgid "after"
+msgstr "после"
+
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:26
+msgid "before"
+msgstr "до"
+
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "day(s)"
 msgstr "день"
 
-#: po/tmp/event-editor-dialog.glade.h:42
-msgid "event-editor-dialog"
-msgstr "диалог редактора событий"
+#: calendar/gui/event-editor-dialog.glade.h:36
+msgid "end of appointment"
+msgstr "завершение встречи"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "for"
 msgstr "в"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "forever"
 msgstr "всегда"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:39
+msgid "hour(s)"
+msgstr "часы"
+
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "label21"
 msgstr "метка26"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:41
+msgid "label55"
+msgstr "метка26"
+
+#: calendar/gui/event-editor-dialog.glade.h:42
+msgid "minute(s)"
+msgstr "минуты"
+
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "month(s)"
-msgstr "месяц"
+msgstr "месяцы"
+
+#: calendar/gui/event-editor-dialog.glade.h:44
+msgid "start of appointment"
+msgstr "начало встречи"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "до"
 
-#: po/tmp/event-editor-dialog.glade.h:48
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "неделя"
 
-#: po/tmp/event-editor-dialog.glade.h:49
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "год"
 
-#: calendar/gui/event-editor.c:331
+#: calendar/gui/event-editor.c:369
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/event-editor.c:409
+#: calendar/gui/event-editor.c:447
 msgid "on"
 msgstr "в"
 
-#: calendar/gui/event-editor.c:434 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:472 filter/filter-datespec.c:65
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/event-editor.c:561
+#: calendar/gui/event-editor.c:599
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:568
+#: calendar/gui/event-editor.c:606
 msgid "th"
 msgstr "ый"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:752
 msgid "occurrences"
 msgstr "случаи"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:869
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Эта встреча имеет правила повторения, которые не могут быть отредактированы "
 "в Evolution."
 
-#: calendar/gui/event-editor.c:3091 calendar/gui/print.c:1092
+#: calendar/gui/event-editor.c:1521
+#, c-format
+msgid " %d days"
+msgstr "%d дней"
+
+#: calendar/gui/event-editor.c:1523
+msgid " 1 day"
+msgstr " 1 день"
+
+#: calendar/gui/event-editor.c:1526
+#, c-format
+msgid " %d weeks"
+msgstr " %d недель"
+
+#: calendar/gui/event-editor.c:1528
+msgid " 1 week"
+msgstr " 1 неделя"
+
+#: calendar/gui/event-editor.c:1531
+#, c-format
+msgid " %d hours"
+msgstr " %d часов"
+
+#: calendar/gui/event-editor.c:1533
+msgid " 1 hour"
+msgstr " 1 час"
+
+#: calendar/gui/event-editor.c:1536
+#, c-format
+msgid " %d minutes"
+msgstr " %d минут"
+
+#: calendar/gui/event-editor.c:1538
+msgid " 1 minute"
+msgstr " 1 минута"
+
+#: calendar/gui/event-editor.c:1541
+#, c-format
+msgid " %d seconds"
+msgstr " %d секунд"
+
+#: calendar/gui/event-editor.c:1543
+msgid " 1 second"
+msgstr " 1 секунда"
+
+#: calendar/gui/event-editor.c:1590
+msgid " before start of appointment"
+msgstr " до начала встречи"
+
+#: calendar/gui/event-editor.c:1592
+msgid " after start of appointment"
+msgstr " после начала встречи"
+
+#: calendar/gui/event-editor.c:1600
+msgid " before end of appointment"
+msgstr " перед окончанием встречи"
+
+#: calendar/gui/event-editor.c:1602
+msgid " after end of appointment"
+msgstr " после окончания встречи"
+
+#: calendar/gui/event-editor.c:3101 calendar/gui/print.c:1092
 #: calendar/gui/print.c:1094 calendar/gui/print.c:1095
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "Evolution calendar executive summary component."
+msgstr "Компонент Executive Summary программы Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Просмотрщик iTip/iMip календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution component for handling the calendar."
+msgstr "Компонент Evolution для обработки календаря."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Средство настройки для кондуита календаря Evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
 #: calendar/gui/gnome-cal.c:694
 #, c-format
 msgid "Could not open the folder in `%s'"
@@ -2485,63 +2796,59 @@ msgstr "Невозможно открыть папку \"%s\""
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/goto-dialog.glade.h:6
+#: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Апрель"
 
-#: po/tmp/goto-dialog.glade.h:7
+#: calendar/gui/goto-dialog.glade.h:2
 msgid "August"
 msgstr "Август"
 
-#: po/tmp/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:3
 msgid "December"
 msgstr "Декабрь"
 
-#: po/tmp/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:4
 msgid "February"
 msgstr "Февраль"
 
-#: po/tmp/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:5
 msgid "Go To Date"
 msgstr "Перейти к дате"
 
-#: po/tmp/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "Go To Today"
 msgstr "Сегодня"
 
-#: po/tmp/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Январь"
 
-#: po/tmp/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "July"
 msgstr "Июль"
 
-#: po/tmp/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "June"
 msgstr "Июнь"
 
-#: po/tmp/goto-dialog.glade.h:15
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "March"
 msgstr "Март"
 
-#: po/tmp/goto-dialog.glade.h:16
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "May"
 msgstr "Май"
 
-#: po/tmp/goto-dialog.glade.h:17
+#: calendar/gui/goto-dialog.glade.h:12
 msgid "November"
 msgstr "Ноябрь"
 
-#: po/tmp/goto-dialog.glade.h:18
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "October"
 msgstr "Октябрь"
 
-#: po/tmp/goto-dialog.glade.h:19
+#: calendar/gui/goto-dialog.glade.h:14
 msgid "September"
 msgstr "Сентябрь"
 
@@ -2737,11 +3044,11 @@ msgstr "Текущий год (%Y)"
 msgid "Print Calendar"
 msgstr "Напечатать календарь"
 
-#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1035
+#: calendar/gui/print.c:1316 mail/mail-callbacks.c:1229
 msgid "Print Preview"
 msgstr "Просмотр печати"
 
-#: calendar/gui/tasks-control.c:104
+#: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "URI, который будет показан в папке заданий "
 
@@ -2749,12 +3056,12 @@ msgstr "URI, который будет показан в папке заданий "
 msgid "SMTWTFS"
 msgstr "ПВСЧПСВ"
 
-#: camel/camel-filter-driver.c:767
+#: camel/camel-filter-driver.c:773
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ошибка анализа фильтра: %s: %s"
 
-#: camel/camel-filter-driver.c:772
+#: camel/camel-filter-driver.c:778
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
@@ -2782,18 +3089,18 @@ msgstr ""
 "Ошибка при выполнении выражения поиска \"%s\":\n"
 "%s"
 
-#: camel/camel-folder-search.c:475 camel/camel-folder-search.c:503
+#: camel/camel-folder-search.c:477 camel/camel-folder-search.c:505
 msgid "(match-all) requires a single bool result"
-msgstr ""
+msgstr "(совпадает все) требует единственного логического результата"
 
-#: camel/camel-folder-search.c:547
+#: camel/camel-folder-search.c:549
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Совершение запроса на неизвестном заголовке: %s"
 
-#: camel/camel-folder-search.c:656 camel/camel-folder-search.c:693
+#: camel/camel-folder-search.c:658 camel/camel-folder-search.c:695
 msgid "Invalid type in body-contains, expecting string"
-msgstr ""
+msgstr "Недопустимый тип в тело-содержит, ожидается строка"
 
 #. well, this is really only a programatic error
 #: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
@@ -2883,72 +3190,80 @@ msgstr "Невозможно загрузить %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Невозможно загрузить %s: нет инициализационного кода в модуле."
 
-#: camel/camel-remote-store.c:184
+#: camel/camel-remote-store.c:176
 #, c-format
 msgid "%s server %s"
 msgstr "%s сервер %s"
 
-#: camel/camel-remote-store.c:188
+#: camel/camel-remote-store.c:180
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s сервис для %s на %s"
 
-#: camel/camel-remote-store.c:314
+#: camel/camel-remote-store.c:306
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:330
+#: camel/camel-remote-store.c:309 camel/camel-remote-store.c:322
 #: camel/providers/smtp/camel-smtp-transport.c:214
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
 
-#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
+#: camel/camel-remote-store.c:310 camel/camel-remote-store.c:323
 msgid "(unknown host)"
 msgstr "(неизвестный хост)"
 
-#: camel/camel-remote-store.c:422 camel/camel-remote-store.c:484
-#: camel/camel-remote-store.c:552
+#: camel/camel-remote-store.c:408 camel/camel-remote-store.c:470
+#: camel/camel-remote-store.c:538
 #: camel/providers/imap/camel-imap-command.c:289
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
-#: camel/camel-search-private.c:101
+#: camel/camel-search-private.c:105
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Сбой компиляции регулярного выражения: %s: %s"
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:142
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
 
-#: camel/camel-service.c:146
+#: camel/camel-service.c:151
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
 
-#: camel/camel-service.c:155
+#: camel/camel-service.c:160
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
 
-#: camel/camel-service.c:520
+#: camel/camel-service.c:512
 #, c-format
 msgid "No such host %s."
 msgstr "Нет такого хоста %s."
 
-#: camel/camel-service.c:523
+#: camel/camel-service.c:515
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Временно невозможно найти имя хоста %s."
 
-#: camel/camel-session.c:299
+#: camel/camel-session.c:54
+msgid "Virtual folder email provider"
+msgstr "Провайдер виртуальных папок электронной почты"
+
+#: camel/camel-session.c:56
+msgid "For reading mail as a query of another set of folders"
+msgstr "Для чтения почты по запросу к другому набору папок"
+
+#: camel/camel-session.c:323
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:390
+#: camel/camel-session.c:418
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2995,7 +3310,7 @@ msgstr "Неожиданный ответ от сервера IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:433
+#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:449
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -3018,8 +3333,8 @@ msgstr "Неожиданный ответ \"OK\" от IMAP сервера: %s"
 msgid "Could not load summary for %s"
 msgstr "Невозможно загрузить итог для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:697
-#: camel/providers/imap/camel-imap-folder.c:859
+#: camel/providers/imap/camel-imap-folder.c:708
+#: camel/providers/imap/camel-imap-folder.c:870
 msgid "Could not find message body in FETCH response."
 msgstr "Невозможно найти тело сообщения в ответе FETCH."
 
@@ -3031,29 +3346,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:251
+#: camel/providers/imap/camel-imap-store.c:252
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/imap/camel-imap-store.c:260
+#: camel/providers/imap/camel-imap-store.c:261
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:262
+#: camel/providers/imap/camel-imap-store.c:263
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием для "
 "идентификации протокола Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:361
+#: camel/providers/imap/camel-imap-store.c:369
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:389
+#: camel/providers/imap/camel-imap-store.c:397
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3064,7 +3379,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:674
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Невозможно создать каталог %s: %s"
@@ -3093,50 +3408,42 @@ msgstr "Почтовые файлы в формате почтовых каталогов qmail"
 msgid "For storing local mail in qmail maildir directories"
 msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
 
-#: camel/providers/local/camel-local-store.c:122
+#: camel/providers/local/camel-local-store.c:128
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:135
 #, 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
+#: camel/providers/local/camel-local-store.c:143
+#: camel/providers/local/camel-local-store.c:159
 #, 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."
+#: camel/providers/local/camel-local-store.c:174
+msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
+#: camel/providers/local/camel-local-store.c:184
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: camel/providers/local/camel-local-store.c:256
+#: camel/providers/local/camel-local-store.c:240
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не удалось переименовать папку %s в %s: %s"
 
-#: camel/providers/local/camel-local-store.c:297
+#: camel/providers/local/camel-local-store.c:282
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:306
+#: camel/providers/local/camel-local-store.c:292
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
@@ -3146,7 +3453,7 @@ msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
 #: camel/providers/local/camel-maildir-folder.c:167
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
-msgstr ""
+msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
 #: camel/providers/local/camel-maildir-folder.c:207
@@ -3174,8 +3481,8 @@ msgstr "Нет такого сообщения"
 msgid "Invalid message contents"
 msgstr "Неправильное содержимое сообщения"
 
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
+#: camel/providers/local/camel-maildir-store.c:94
+#: camel/providers/local/camel-mh-store.c:88
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -3184,15 +3491,15 @@ 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/local/camel-maildir-store.c:98
+#: camel/providers/local/camel-mbox-store.c:99
+#: camel/providers/local/camel-mh-store.c:95
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Папка \"%s\" не существует."
 
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
+#: camel/providers/local/camel-maildir-store.c:105
+#: camel/providers/local/camel-mh-store.c:101
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -3201,21 +3508,21 @@ msgstr ""
 "Не удалось создать папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:128
+#: camel/providers/local/camel-maildir-store.c:120
 #, c-format
 msgid "`%s' is not a maildir 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/local/camel-maildir-store.c:149
+#: camel/providers/local/camel-maildir-store.c:186
+#: camel/providers/local/camel-mh-store.c:125
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr ""
 "Невозможно удалить папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:158
+#: camel/providers/local/camel-maildir-store.c:150
 msgid "not a maildir directory"
 msgstr "не является почтовым каталог"
 
@@ -3248,7 +3555,7 @@ msgstr "Видимо папка невостановимо испорчена."
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
 
-#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mbox-store.c:92
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -3257,7 +3564,7 @@ msgstr ""
 "Невозможно открыть файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:108
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3266,14 +3573,14 @@ msgstr ""
 "Не удалось создать файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:126
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:117
+#: camel/providers/local/camel-mbox-store.c:144
 #, 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/local/camel-mbox-store.c:136
+#: camel/providers/local/camel-mbox-store.c:159
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3282,71 +3589,82 @@ msgstr ""
 "Невозможно удалить папку \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:160
+#: camel/providers/local/camel-mbox-store.c:151
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папка \"%s\" не пуста. Не удалена."
 
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:240
+msgid "Summarising folder"
+msgstr "Суммаризация папки"
+
+#: camel/providers/local/camel-mbox-summary.c:245
 #, c-format
 msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:274
+#: camel/providers/local/camel-mbox-summary.c:287
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
 
-#: camel/providers/local/camel-mbox-summary.c:349
+#: camel/providers/local/camel-mbox-summary.c:362
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Не удалось суммировать папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:483
-#: camel/providers/local/camel-mbox-summary.c:674
+#: camel/providers/local/camel-mbox-summary.c:493
+#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1270
+msgid "Synchronising folder"
+msgstr "Синхронизация папки"
+
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Не удалось открыть папку для суммаризации: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:499
+#: camel/providers/local/camel-mbox-summary.c:515
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:528
-#: camel/providers/local/camel-mbox-summary.c:707
-#: camel/providers/local/camel-mbox-summary.c:715
+#: camel/providers/local/camel-mbox-summary.c:540
+#: camel/providers/local/camel-mbox-summary.c:548
+#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:745
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несовпадение папки и итога, даже после синхронизации"
 
-#: camel/providers/local/camel-mbox-summary.c:571
+#: camel/providers/local/camel-mbox-summary.c:591
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
+#: camel/providers/local/camel-mbox-summary.c:608
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:606
-#: camel/providers/local/camel-mbox-summary.c:765
+#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:795
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Невозможно закрыть исходную папку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:635
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Невозможно закрыть временную папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:626
+#: camel/providers/local/camel-mbox-summary.c:646
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:836
+#: camel/providers/local/camel-mbox-summary.c:870
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
@@ -3357,7 +3675,7 @@ msgstr "Неизвестная ошибка: %s"
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:116
+#: camel/providers/local/camel-mh-store.c:108
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не является каталогом."
@@ -3432,16 +3750,25 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Не удалось открыть или создать файл .newsrc для %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:180
+#: camel/providers/pop3/camel-pop3-folder.c:145
+msgid "Retrieving POP summary"
+msgstr "Получение итога POP"
+
+#: camel/providers/pop3/camel-pop3-folder.c:188
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Не удалось открыть папку: список сообщений был неполон."
 
-#: camel/providers/pop3/camel-pop3-folder.c:274
+#: camel/providers/pop3/camel-pop3-folder.c:282
 #, c-format
 msgid "No message with uid %s"
 msgstr "Нет сообщения с uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:288
+#: camel/providers/pop3/camel-pop3-folder.c:286
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "Получение сообщения %d по POP"
+
+#: camel/providers/pop3/camel-pop3-folder.c:304
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Не удалось получить сообщение с POP сервера %s: %s"
@@ -3459,7 +3786,7 @@ msgstr ""
 "для получения почты от обычных провайдеров Web-почты и специфических систем "
 "электронной почты."
 
-#: camel/providers/pop3/camel-pop3-store.c:148
+#: camel/providers/pop3/camel-pop3-store.c:142
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3468,7 +3795,7 @@ msgstr ""
 "незашифрованного пароля. Большинством POP серверов поддерживается только "
 "этот вариант."
 
-#: camel/providers/pop3/camel-pop3-store.c:158
+#: camel/providers/pop3/camel-pop3-store.c:152
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3478,29 +3805,29 @@ msgstr ""
 "пароля по протоколу APOP. Это может работать не для всех пользователей даже "
 "на серверах, которые якобы поддерживают это."
 
-#: camel/providers/pop3/camel-pop3-store.c:170
+#: camel/providers/pop3/camel-pop3-store.c:164
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Подключение к POP серверу будет производиться с использованием Kerberos 4 "
 "для идентификации."
 
-#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:209
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Не удалось идентифицироваться на KPOP сервере: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:326
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Не удалось подключиться к POP серверу на %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:375
+#: camel/providers/pop3/camel-pop3-store.c:373
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sПожалуйста, введите POP3 пароль для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:394
+#: camel/providers/pop3/camel-pop3-store.c:392
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3509,12 +3836,12 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Ошибка отправки имени пользователя: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:397
-#: camel/providers/pop3/camel-pop3-store.c:434
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:432
 msgid "(Unknown)"
 msgstr "(Неизвестное)"
 
-#: camel/providers/pop3/camel-pop3-store.c:424
+#: camel/providers/pop3/camel-pop3-store.c:422
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3522,7 +3849,7 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Не поддерживается затребованный механизм идентификации."
 
-#: camel/providers/pop3/camel-pop3-store.c:432
+#: camel/providers/pop3/camel-pop3-store.c:430
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3531,13 +3858,13 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Ошибка отправки пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:541
+#: camel/providers/pop3/camel-pop3-store.c:530
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:64
+#: mail/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3586,7 +3913,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:34 po/tmp/mail-config.glade.h:59
+#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:56
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3694,8 +4021,7 @@ msgstr ""
 "идентификации. Этот вариант поддерживается большинством SMTP серверов."
 
 #: camel/providers/smtp/camel-smtp-transport.c:348
-#: camel/providers/smtp/camel-smtp-transport.c:353
-#: po/tmp/mail-config.glade.h:15
+#: camel/providers/smtp/camel-smtp-transport.c:353 mail/mail-config.glade.h:11
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3800,19 +4126,6 @@ msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Ошибка ответа QUIT: %s: не фатально"
 
-#: camel/providers/vee/camel-vee-folder.c:604
-#, c-format
-msgid "No such message: %s"
-msgstr "Нет такого сообщения: %s"
-
-#: camel/providers/vee/camel-vee-provider.c:30
-msgid "Virtual folder email provider"
-msgstr "Провайдер виртуальных папок электронной почты"
-
-#: camel/providers/vee/camel-vee-provider.c:32
-msgid "For reading mail as a query of another set of folders"
-msgstr "Для чтения почты по запросу к другому набору папок"
-
 #: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 байт"
@@ -3843,11 +4156,11 @@ msgid "attachment"
 msgstr "вложение"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Удалить"
@@ -3864,68 +4177,64 @@ msgstr "Добавить вложение..."
 msgid "Attach a file to the message"
 msgstr "Присоединить файл к сообщению"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: mail/message-list.c:1152 po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
 msgid "Attachment"
 msgstr "Вложение"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:2
 msgid "Attachment properties"
 msgstr "Свойства вложения"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "File name:"
 msgstr "Имя файла:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:10
+#: composer/e-msg-composer-attachment.glade.h:5
 msgid "Inline attachment"
 msgstr "Встроенное вложение"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:11
+#: composer/e-msg-composer-attachment.glade.h:6
 msgid "MIME type:"
 msgstr "Тип MIME:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:12
+#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Send as:"
 msgstr "Отправить как:"
 
-#: composer/e-msg-composer-hdrs.c:149 composer/e-msg-composer-hdrs.c:357
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:176 composer/e-msg-composer-hdrs.c:386
+#: mail/mail-format.c:627
 msgid "From:"
 msgstr "От:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:330
 msgid "Click here for the address book"
 msgstr "Щелкните здесь для адресной книги"
 
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:387
 msgid "Enter the identity you wish to send this message from"
 msgstr "Введите именование, от которого вы хотите отправить это сообщение"
 
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:391 mail/mail-format.c:631
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:392
 msgid "Enter the recipients of the message"
 msgstr "Введите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:367 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:396 mail/mail-format.c:633
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:368
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адресатов, которые получат копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:373
+#: composer/e-msg-composer-hdrs.c:402
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:403
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3933,15 +4242,15 @@ msgstr ""
 "Введите адресатов, которые получат копию сообщения не попав в список "
 "получателей."
 
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:409 mail/mail-format.c:635
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:410
 msgid "Enter the subject of the mail"
 msgstr "Введите тему письма"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:512
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3950,38 +4259,26 @@ msgstr ""
 "Невозможно открыть файл подписи %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:665
+#: composer/e-msg-composer.c:680
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:691
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:696
+#: composer/e-msg-composer.c:711
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:718
-msgid "Saving changes to message..."
-msgstr "Сохранить изменения в сообщении..."
-
-#: composer/e-msg-composer.c:720
-msgid "Save changes to message..."
-msgstr "Сохранить изменения в сообщении..."
-
-#: composer/e-msg-composer.c:761
-#, c-format
-msgid "Error saving composition to 'Drafts': %s"
-msgstr "Ошибка сохранения сочинения в \"Черновиках\": %s"
-
-#: composer/e-msg-composer.c:819 shell/e-shell-view-menu.c:183
+#: composer/e-msg-composer.c:791 evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:192
 msgid "Evolution"
 msgstr "Эволюция"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:797
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3991,27 +4288,27 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: composer/e-msg-composer.c:850
+#: composer/e-msg-composer.c:822
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:948
 msgid "That file does not exist."
 msgstr "Этот файл не существует."
 
-#: composer/e-msg-composer.c:986
+#: composer/e-msg-composer.c:958
 msgid "That is not a regular file."
 msgstr "Это не обычный файл."
 
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:968
 msgid "That file exists but is not readable."
 msgstr "Этот файл существует, но не читается."
 
-#: composer/e-msg-composer.c:1006
+#: composer/e-msg-composer.c:978
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Файл выглядит доступным, но произошел сбой open(2)."
 
-#: composer/e-msg-composer.c:1028
+#: composer/e-msg-composer.c:1000
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4019,28 +4316,46 @@ msgstr ""
 "Файл очень большой (больше 100К).\n"
 "Вы уверены, что хотите вставить его?"
 
-#: composer/e-msg-composer.c:1049
+#: composer/e-msg-composer.c:1021
 msgid "An error occurred while reading the file."
 msgstr "При чтении файла возникла ошибка."
 
-#: composer/e-msg-composer.c:1292 composer/e-msg-composer.c:1527
+#: composer/e-msg-composer.c:1264 composer/e-msg-composer.c:1499
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:1608
+#: composer/e-msg-composer.c:1580
 msgid "Could not create composer window."
 msgstr "Невозможно создать окно редактора."
 
-#: composer/evolution-composer.c:360
+#: composer/evolution-composer.c:359
 msgid "Cannot initialize Evolution's composer."
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
-#: executive-summary/component/component-factory.c:159
+#: data/evolution.keys.in.h:1
+msgid "address card"
+msgstr "визитная карточка"
+
+#: data/evolution.keys.in.h:2
+msgid "calendar information"
+msgstr "информация календаря"
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr ""
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the Evolution executive summary component."
+msgstr ""
+"Невозможно инициализировать компонент Executive Summary программы Evolution."
+
+#: executive-summary/component/component-factory.c:152
 msgid "Cannot initialize Evolution's Executive Summary component."
 msgstr ""
 "Невозможно инициализировать компонент Executive Summary программы Evolution."
 
-#: executive-summary/component/e-summary-callbacks.c:285
+#: executive-summary/component/e-summary-callbacks.c:290
 msgid ""
 "You can select a different HTML page for the background of the Executive "
 "Summary.\n"
@@ -4048,64 +4363,64 @@ msgid ""
 "Just leave it blank for the default"
 msgstr ""
 
-#: executive-summary/component/e-summary-url.c:61
-#: executive-summary/component/e-summary-url.c:66
-#: executive-summary/component/e-summary-url.c:73
+#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:74
+#: executive-summary/component/e-summary-url.c:81
 #, c-format
 msgid "Open %s with the default GNOME application"
 msgstr "Открыть %s с помощью подходящего приложения GNOME"
 
-#: executive-summary/component/e-summary-url.c:62
+#: executive-summary/component/e-summary-url.c:70
 #, c-format
 msgid "Open %s with the default GNOME web browser"
 msgstr "Открыть %s с помощью программы просмотра web для GNOME"
 
-#: executive-summary/component/e-summary-url.c:63
+#: executive-summary/component/e-summary-url.c:71
 #, c-format
 msgid "Send an email to %s"
 msgstr "Отправить почту %s"
 
-#: executive-summary/component/e-summary-url.c:64
+#: executive-summary/component/e-summary-url.c:72
 #, c-format
 msgid "Change the view to %s"
 msgstr "Изменить вид на %s"
 
-#: executive-summary/component/e-summary-url.c:65
+#: executive-summary/component/e-summary-url.c:73
 #, c-format
 msgid "Run %s"
 msgstr "Запустить %s"
 
-#: executive-summary/component/e-summary-url.c:67
+#: executive-summary/component/e-summary-url.c:75
 #, c-format
 msgid "Close %s"
 msgstr "Закрыть %s"
 
-#: executive-summary/component/e-summary-url.c:68
+#: executive-summary/component/e-summary-url.c:76
 #, c-format
 msgid "Move %s to the left"
 msgstr "Переместить %s влево"
 
-#: executive-summary/component/e-summary-url.c:69
+#: executive-summary/component/e-summary-url.c:77
 #, c-format
 msgid "Move %s to the right"
 msgstr "Переместить %s вправо"
 
-#: executive-summary/component/e-summary-url.c:70
+#: executive-summary/component/e-summary-url.c:78
 #, c-format
 msgid "Move %s into the previous row"
 msgstr "Переместить %s в предыдущую строку"
 
-#: executive-summary/component/e-summary-url.c:71
+#: executive-summary/component/e-summary-url.c:79
 #, c-format
 msgid "Move %s into the next row"
 msgstr "Переместить %s в следующую строку"
 
-#: executive-summary/component/e-summary-url.c:72
+#: executive-summary/component/e-summary-url.c:80
 #, c-format
 msgid "Configure %s"
 msgstr "Настроить %s"
 
-#: executive-summary/component/e-summary.c:916
+#: executive-summary/component/e-summary.c:918
 #, c-format
 msgid ""
 "Cannot open the HTML file:\n"
@@ -4114,7 +4429,7 @@ msgstr ""
 "Невозможно открыть HTML файл:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:930
+#: executive-summary/component/e-summary.c:932
 #, c-format
 msgid ""
 "Error reading data:\n"
@@ -4123,24 +4438,74 @@ msgstr ""
 "Ошибка при чтении данных:\n"
 "%s"
 
-#: executive-summary/component/e-summary.c:948
+#: executive-summary/component/e-summary.c:950
 msgid "File does not have a place for the services.\n"
 msgstr ""
 
-#: executive-summary/component/main.c:59
+#: executive-summary/component/executive-summary-config.glade.h:1
+msgid "Appearance"
+msgstr "Внешний вид"
+
+#: executive-summary/component/executive-summary-config.glade.h:2
+msgid "Background:"
+msgstr "Фон:"
+
+#: executive-summary/component/main.c:60
 msgid ""
 "Executive summary component could not initialize Bonobo.\n"
 "If there was a warning message about the RootPOA, it probably means\n"
 "you compiled Bonobo against GOAD instead of OAF."
 msgstr ""
 
-#: executive-summary/test-service/rdf-summary.c:455
-#: executive-summary/test-service/rdf-summary.c:491
-#: executive-summary/test-service/rdf-summary.c:536
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
+msgid "Factory for the RDF summary."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:2
+msgid "RDF Summary"
+msgstr "Итог RDF"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:1
+msgid "Factory for the test bonobo component."
+msgstr ""
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the test component."
+msgstr "Пометить задание как выполненное"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:3
+msgid "Test bonobo service"
+msgstr "Проверить сервис bonobo"
+
+#: executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in.h:4
+msgid "Test service"
+msgstr "Проверить сервис"
+
+#: executive-summary/test-service/rdf-summary.c:509
+#: executive-summary/test-service/rdf-summary.c:546
+#: executive-summary/test-service/rdf-summary.c:591
 #: widgets/misc/e-messagebox.c:155
 msgid "Error"
 msgstr "Ошибка"
 
+#: executive-summary/test-service/rdf-summary.c:765
+msgid "Update automatically"
+msgstr "Обновлять автоматически"
+
+#: executive-summary/test-service/rdf-summary.c:775
+msgid "Update now"
+msgstr "Обновить сейчас"
+
+#: executive-summary/test-service/rdf-summary.c:785
+msgid "Update every "
+msgstr "Обновлять каждые "
+
+#: executive-summary/test-service/rdf-summary.c:793
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr "минуты"
+
 #: filter/filter-datespec.c:62
 msgid "year"
 msgstr "год"
@@ -4181,10 +4546,6 @@ msgstr "часы"
 msgid "minute"
 msgstr "минута"
 
-#: filter/filter-datespec.c:67
-msgid "minutes"
-msgstr "минуты"
-
 #: filter/filter-datespec.c:68
 msgid "second"
 msgstr "секунда"
@@ -4273,7 +4634,7 @@ msgstr "входящие"
 msgid "outgoing"
 msgstr "исходящие"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "Правка фильтров"
 
@@ -4310,7 +4671,7 @@ msgstr "Ввести URI папки"
 msgid "<click here to select a folder>"
 msgstr "<щелкните здесь для выбора папки>"
 
-#: filter/filter-input.c:185
+#: filter/filter-input.c:189
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4355,41 +4716,41 @@ msgstr "Добавить критерий"
 msgid "Remove criterion"
 msgstr "Удалить критерий"
 
-#: filter/filter-system-flag.c:63
+#: filter/filter-system-flag.c:67
 msgid "Replied to"
 msgstr "Ответить"
 
 #. { _("Deleted"), "Deleted" },
 #. { _("Draft"), "Draft" },
-#: filter/filter-system-flag.c:66
+#: filter/filter-system-flag.c:70
 msgid "Important"
 msgstr "Важное"
 
-#: filter/filter-system-flag.c:67
+#: filter/filter-system-flag.c:71
 msgid "Read"
 msgstr "Прочитанное"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "Правка вирт.папок"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Правила фильтра"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Входящие"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "Исходящие"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid "Virtual Folders"
 msgstr "Виртуальные папки"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:11
 msgid "vFolder Sources"
 msgstr "Источники вирт.папки"
 
@@ -4451,14 +4812,10 @@ msgid "Regex Match"
 msgstr "Совпадение рег.выражения"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1152
+#: mail/message-list.c:1171
 msgid "Score"
 msgstr "Подсчет"
 
-#: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Отправитель"
-
 #: filter/libfilter-i18n.h:19
 msgid "Set Status"
 msgstr "Установить состояние"
@@ -4471,26 +4828,14 @@ msgstr "Источник"
 msgid "Specific header"
 msgstr "Специфический заголовок"
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:1152
-msgid "Status"
-msgstr "Состояние"
-
 #: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:24 mail/message-list.c:1153
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1172
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "после"
-
-#: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "до"
-
 #: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "содержит"
@@ -4579,11 +4924,11 @@ msgstr "Добавить правило вирт.папки"
 msgid "Edit VFolder Rule"
 msgstr "Правка правила вирт.папки"
 
-#: mail/component-factory.c:294
+#: mail/component-factory.c:302
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:320
+#: mail/component-factory.c:375
 msgid "Cannot register storage with shell"
 msgstr ""
 
@@ -4643,8 +4988,8 @@ msgstr "Фильтр по получателю"
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:669 po/tmp/evolution-calendar.xml.h:22
-#: po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:669 ui/evolution-calendar.xml.h:17
+#: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Открыть"
 
@@ -4653,8 +4998,8 @@ msgid "Save As..."
 msgstr "Сохранить как..."
 
 #: mail/folder-browser.c:672 mail/mail-view.c:148
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:25
-#: po/tmp/evolution-mail.xml.h:31 po/tmp/evolution-tasks.xml.h:9
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:20
+#: ui/evolution-mail.xml.h:26 ui/evolution-tasks.xml.h:4
 msgid "Print"
 msgstr "Печать"
 
@@ -4662,17 +5007,15 @@ msgstr "Печать"
 msgid "Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:675 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:37
+#: mail/folder-browser.c:675 mail/mail-view.c:141 ui/evolution-mail.xml.h:32
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:144
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:676 mail/mail-view.c:144 ui/evolution-mail.xml.h:12
 msgid "Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:677 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:677 ui/evolution-mail.xml.h:13
 msgid "Forward inline"
 msgstr "Переслать встроенное"
 
@@ -4711,38 +5054,96 @@ msgstr "Создать правило из сообщения"
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/local-config.glade.h:6
+#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+msgid "Evolution component for handling mail."
+msgstr "Компонент Evolution для обработки почты."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+msgid "Evolution mail composer."
+msgstr "Компонент редактора писем Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+msgid "Evolution mail executive summary component."
+msgstr "Компонент Executive Summary программы Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+msgid "Evolution mail folder display component."
+msgstr "Компонент отображения почтовой папки Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+msgid "Evolution mail folder factory component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#, fuzzy
+msgid "Factory for the Evolution composer."
+msgstr "Невозможно инициализировать редактор почты Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#, fuzzy
+msgid "Factory for the Evolution mail component."
+msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+msgid "Factory for the Mail Summary component."
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+msgid "Factory to import mbox into Evolution"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "Имортирует файлы Outlook Express 4 в Evolution"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+msgid "Imports mbox files into Evolution"
+msgstr "Импортирует mbox файлы в Evolution"
+
+#: mail/local-config.glade.h:1
 msgid "Current store format:"
 msgstr "Текущий формат хранения:"
 
-#: po/tmp/local-config.glade.h:7
+#: mail/local-config.glade.h:2
 msgid "Mailbox Format"
 msgstr "Формат почтового ящика"
 
-#: po/tmp/local-config.glade.h:8
+#: mail/local-config.glade.h:3
 msgid "New store format:"
 msgstr "Новый формат хранения:"
 
-#: po/tmp/local-config.glade.h:9
-msgid "Note: When converting between mailbox formats, a failure\n"
-msgstr "Внимание: при преобразовании между форматами почтовых ящиков, ошибка\n"
+#: mail/local-config.glade.h:4
+msgid ""
+"Note: When converting between mailbox formats, a failure\n"
+"(such as lack of disk space) may not be automatically\n"
+"recoverable.  Please use this feature with care."
+msgstr ""
 
-#: po/tmp/local-config.glade.h:12
+#: mail/local-config.glade.h:7
 msgid "maildir"
 msgstr "maildir"
 
-#: po/tmp/local-config.glade.h:13
+#: mail/local-config.glade.h:8
 msgid "mbox"
 msgstr "mbox"
 
-#: po/tmp/local-config.glade.h:14
+#: mail/local-config.glade.h:9
 msgid "mh"
 msgstr "mh"
 
+#. add a "None" option to the stores menu
+#: mail/mail-account-editor.c:695 mail/mail-account-editor.c:697
+#: mail/mail-account-editor.c:777 mail/mail-accounts.c:114
+#: mail/mail-config-druid.c:916 mail/mail-config.glade.h:44
+#: shell/e-shell-view.c:1119 widgets/misc/e-dateedit.c:421
+#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+msgid "None"
+msgstr "Нет"
+
 #: mail/mail-accounts.c:115
 msgid " (default)"
 msgstr "(Исх.значения)"
@@ -4752,7 +5153,7 @@ msgstr "(Исх.значения)"
 msgid "Evolution Account Manager"
 msgstr "Диспетчер счетов Evolution"
 
-#: mail/mail-account-editor.c:266
+#: mail/mail-account-editor.c:286
 msgid ""
 "One or more of your servers are not configured correctly.\n"
 "Do you wish to save anyway?"
@@ -4761,7 +5162,7 @@ msgstr ""
 "Сохранить в любом случае?"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:626
+#: mail/mail-account-editor.c:646
 msgid "Evolution Account Editor"
 msgstr "Редактор счетов Evolution"
 
@@ -4785,7 +5186,7 @@ msgstr "Почта от %s"
 msgid "%s mailing list"
 msgstr "%s список рассылки"
 
-#: mail/mail-callbacks.c:82
+#: mail/mail-callbacks.c:83
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4797,7 +5198,7 @@ msgstr ""
 "отправлять, принимать или редактировать почту.\n"
 "Вы хотите настроить это сейчас?"
 
-#: mail/mail-callbacks.c:135
+#: mail/mail-callbacks.c:134
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4805,7 +5206,7 @@ msgstr ""
 "Вы должны настроить пользователя\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:147
+#: mail/mail-callbacks.c:146
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4813,11 +5214,11 @@ msgstr ""
 "Вы должны настроить передачу почты\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:191
+#: mail/mail-callbacks.c:190
 msgid "You have not set a mail transport method"
 msgstr "Вы не установили метод транспортировки почты"
 
-#: mail/mail-callbacks.c:224
+#: mail/mail-callbacks.c:223
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4833,19 +5234,24 @@ msgstr "Вы должны настроить счет до того как вы сможете послать почту."
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:571
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "%s, %s написал:\n"
+
+#: mail/mail-callbacks.c:727
 msgid "Forwarded message:\n"
 msgstr "Пересланное сообщение:\n"
 
-#: mail/mail-callbacks.c:618
+#: mail/mail-callbacks.c:812
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:620
+#: mail/mail-callbacks.c:814
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:755
+#: mail/mail-callbacks.c:949
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4853,11 +5259,11 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:788 mail/mail-display.c:83
+#: mail/mail-callbacks.c:982 mail/mail-display.c:83
 msgid "Overwrite file?"
 msgstr "Переписать файл?"
 
-#: mail/mail-callbacks.c:792 mail/mail-display.c:87
+#: mail/mail-callbacks.c:986 mail/mail-display.c:87
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4865,15 +5271,15 @@ msgstr ""
 "Файл с таким названием уже существует.\n"
 "Переписать его?"
 
-#: mail/mail-callbacks.c:836
+#: mail/mail-callbacks.c:1030
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:838
+#: mail/mail-callbacks.c:1032
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:946
+#: mail/mail-callbacks.c:1140
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4882,227 +5288,235 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1189
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/mail-callbacks.c:1042
+#: mail/mail-callbacks.c:1236
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-config.c:799
-msgid "Connecting to server"
-msgstr "Подключение к серверу"
-
-#: mail/mail-config.c:801
-msgid "Connect to server"
-msgstr "Подключиться к серверу"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config.glade.h:6
+#: mail/mail-config.glade.h:1
 msgid "Account"
 msgstr "Счет"
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:2
 msgid "Account Information"
 msgstr "Информация о счете"
 
-#: po/tmp/mail-config.glade.h:8
+#: mail/mail-config.glade.h:3
 msgid "Account Management"
 msgstr "Управление счетами"
 
-#: po/tmp/mail-config.glade.h:9
+#: mail/mail-config.glade.h:4
 msgid "Account Properties"
 msgstr "Свойства счета"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:6
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: po/tmp/mail-config.glade.h:12
+#: mail/mail-config.glade.h:7
 msgid "Authentication"
 msgstr "Идентификация"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:8
 msgid "Authentication Type:"
 msgstr "Тип идентификации"
 
-#: po/tmp/mail-config.glade.h:16
-msgid "Congratulations, your mail configuration is complete.\n"
-msgstr "Поздравляем, настройка почты завершена.\n"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check mail every"
+msgstr "Автоматически проверять почту каждые"
+
+#: mail/mail-config.glade.h:12
+msgid "Check settings"
+msgstr "Проверить установки"
+
+#: mail/mail-config.glade.h:13
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Finish\" to save your settings."
+msgstr ""
+"Поздравляем, ваши почтовые настройки завершены.\n"
+"\n"
+"Вы готовы к отправке и приему эл.почты\n"
+"с использованием Evolution.\n"
+"\n"
+"Нажмите \"Завершить\", чтобы сохранить ваши настройки."
 
-#: po/tmp/mail-config.glade.h:22
+#: mail/mail-config.glade.h:19
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: po/tmp/mail-config.glade.h:23
+#: mail/mail-config.glade.h:20
 msgid "Default"
 msgstr "Исх.значения"
 
-#: po/tmp/mail-config.glade.h:25
+#: mail/mail-config.glade.h:22
 msgid "Done"
 msgstr "Сделано"
 
-#: po/tmp/mail-config.glade.h:26
+#: mail/mail-config.glade.h:23
 msgid "E-Mail Address:"
 msgstr "Эл.адрес:"
 
-#: po/tmp/mail-config.glade.h:28
+#: mail/mail-config.glade.h:25
 msgid "Email Address:"
 msgstr "Эл.адрес:"
 
-#: po/tmp/mail-config.glade.h:29
+#: mail/mail-config.glade.h:26
 msgid "Evolution Mail Configuration"
 msgstr "Настройка почты Evolution"
 
-#: po/tmp/mail-config.glade.h:30
+#: mail/mail-config.glade.h:27
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: po/tmp/mail-config.glade.h:33
+#: mail/mail-config.glade.h:30
 msgid "Hostname:"
 msgstr "Имя хоста:"
 
-#: po/tmp/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "Identity"
 msgstr "Именование"
 
-#: po/tmp/mail-config.glade.h:35
+#: mail/mail-config.glade.h:32
 msgid "Incoming Mail Server"
 msgstr "Входящий почтовый сервер"
 
-#: po/tmp/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Keep mail on server"
 msgstr "Сохранять почту на сервере"
 
-#: po/tmp/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: po/tmp/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "Mail"
 msgstr "Почта"
 
-#: po/tmp/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "Mail Account"
 msgstr "Почтовый счет"
 
-#: po/tmp/mail-config.glade.h:40
+#: mail/mail-config.glade.h:37
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: po/tmp/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "Mail Configuration Druid"
 msgstr "Помощник по настройке почты"
 
-#: po/tmp/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Make this my default account"
 msgstr "Сделать моим счетом по умолчанию"
 
-#: po/tmp/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Mark messages as \"Read\" after:"
 msgstr "Помечать сообщения как \"Прочитанные\" после:"
 
-#: po/tmp/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Miscellaneous"
 msgstr "Разное"
 
-#: po/tmp/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "News"
 msgstr "Новые"
 
-#: po/tmp/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "Optional"
 msgstr "Дополнительные"
 
-#: po/tmp/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "Organization:"
 msgstr "Организация:"
 
-#: po/tmp/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Outgoing Mail Server"
 msgstr "Исходящий почтовый сервер"
 
-#: po/tmp/mail-config.glade.h:52
+#: mail/mail-config.glade.h:49
 msgid "Password:"
 msgstr "Пароль:"
 
-#: po/tmp/mail-config.glade.h:54
+#: mail/mail-config.glade.h:51
 msgid "Plain Text"
 msgstr "Простой текст"
 
-#: po/tmp/mail-config.glade.h:55
+#: mail/mail-config.glade.h:52
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: po/tmp/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Remember my password"
 msgstr "Запомнить мой пароль"
 
-#: mail/mail-format.c:628 po/tmp/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54 mail/mail-format.c:629
 msgid "Reply-To:"
 msgstr "Ответить:"
 
-#: po/tmp/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 msgid "Required"
 msgstr "Требуемый"
 
-#: po/tmp/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: po/tmp/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Select signature file"
 msgstr "Выбрать файл подписи"
 
-#: po/tmp/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Send mail in HTML format by default."
 msgstr "По умолчанию отправлять почту в формате HTML."
 
-#: po/tmp/mail-config.glade.h:63
+#: mail/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: po/tmp/mail-config.glade.h:65
+#: mail/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: po/tmp/mail-config.glade.h:66
+#: mail/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Тип сервера:"
 
-#: po/tmp/mail-config.glade.h:67
+#: mail/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "Сервер требует идентификации"
 
-#: po/tmp/mail-config.glade.h:68
+#: mail/mail-config.glade.h:65
 msgid "Servers"
 msgstr "Серверы"
 
-#: po/tmp/mail-config.glade.h:69
+#: mail/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: po/tmp/mail-config.glade.h:70
+#: mail/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Подпись:"
 
-#: po/tmp/mail-config.glade.h:71
+#: mail/mail-config.glade.h:68
 msgid "Sources"
 msgstr "Источники"
 
-#: po/tmp/mail-config.glade.h:72
+#: mail/mail-config.glade.h:69
 msgid "This server requires a secure connection (SSL)"
 msgstr "Этот сервер требует защищенного подключения (SSL)"
 
-#: po/tmp/mail-config.glade.h:73
+#: mail/mail-config.glade.h:70
 msgid "Type"
 msgstr "Тип"
 
-#: po/tmp/mail-config.glade.h:74
+#: mail/mail-config.glade.h:71
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -5110,19 +5524,29 @@ msgstr ""
 "Введите название, по которому вы хотите указывать эти серверы. Например: "
 "\"Работа\" или \"Дом\"."
 
-#: po/tmp/mail-config.glade.h:76
+#: mail/mail-config.glade.h:73
 msgid "User Information"
 msgstr "Информация о пользователе"
 
-#: po/tmp/mail-config.glade.h:77
+#: mail/mail-config.glade.h:74
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: po/tmp/mail-config.glade.h:78
-msgid "Welcome to the Evolution Mail Configuration Druid.\n"
-msgstr "Добро пожаловать к помощнику по настройке почты в Evolution.\n"
+#: mail/mail-config.glade.h:75
+msgid ""
+"Welcome to the Evolution Mail Configuration Druid.\n"
+"\n"
+"Click \"Next\" to begin. "
+msgstr ""
+"Добро пожаловать к помощнику по настройке почты в Evolution.\n"
+"\n"
+"Нажмите \"След.\" для начала."
+
+#: mail/mail-config.glade.h:78
+msgid "minutes."
+msgstr "минут."
 
-#: mail/mail-config-druid.c:364
+#: mail/mail-config-druid.c:399
 #, c-format
 msgid ""
 "Failed to verify the incoming mail configuration.\n"
@@ -5131,11 +5555,11 @@ msgstr ""
 "Сбой при проверке настроек входящей почты.\n"
 "У вас могут возникнуть проблемы с получением вашей почты с %s"
 
-#: mail/mail-config-druid.c:459
+#: mail/mail-config-druid.c:489
 msgid "Namespace:"
 msgstr "Пространство имен:"
 
-#: mail/mail-config-druid.c:644
+#: mail/mail-config-druid.c:677
 #, c-format
 msgid ""
 "Failed to verify the outgoing mail configuration.\n"
@@ -5145,7 +5569,7 @@ msgstr ""
 "У вас могут возникнуть проблемы с отправкой вашей почты через %s"
 
 #. set window title
-#: mail/mail-config-druid.c:995
+#: mail/mail-config-druid.c:1036
 msgid "Evolution Account Wizard"
 msgstr "Помощник по счетам Evolution"
 
@@ -5158,154 +5582,133 @@ msgstr "Сохранить вложение"
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/mail-display.c:271
+#: mail/mail-display.c:290
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:273
+#: mail/mail-display.c:292
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:294
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:323
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:346
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:350
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:506
 #, c-format
 msgid "%s attachment"
 msgstr "%s вложение"
 
-#: mail/mail-format.c:653
+#: mail/mail-format.c:654
 msgid "Loading message content"
 msgstr "Загрузка содержимого сообщения"
 
-#: mail/mail-format.c:941
+#: mail/mail-format.c:943
 msgid "Encrypted message not displayed"
 msgstr "Зашифрованное сообщение не отображается"
 
-#: mail/mail-format.c:947
+#: mail/mail-format.c:949
 msgid "Encrypted message"
 msgstr "Зашифрованное сообщение"
 
-#: mail/mail-format.c:948
+#: mail/mail-format.c:950
 msgid "Click icon to decrypt."
 msgstr "Щелкните на пиктограмме для дешифрации."
 
-#: mail/mail-format.c:1350
+#: mail/mail-format.c:1019 mail/mail-format.c:1404
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 "Это сообщение с цифровой подписью, которая прошла проверку идентичности."
 
-#: mail/mail-format.c:1358
+#: mail/mail-format.c:1027 mail/mail-format.c:1412
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 "Это сообщение с цифровой подписью, которая не может быть проверена на "
 "идентичность."
 
-#: mail/mail-format.c:1562
+#: mail/mail-format.c:1622
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/mail-format.c:1574
+#: mail/mail-format.c:1634
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1578
+#: mail/mail-format.c:1638
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: mail/mail-format.c:1612
+#: mail/mail-format.c:1672
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: mail/mail-format.c:1617
+#: mail/mail-format.c:1677
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1788
-#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s, %s написал:\n"
-
-#: mail/mail-local.c:204
+#: mail/mail-local.c:728
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Изменение папки \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:208
+#: mail/mail-local.c:732
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Изменить папку \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:251
+#: mail/mail-local.c:756
 msgid "Reconfiguring folder"
 msgstr "Перенастройка папки"
 
-#: mail/mail-local.c:269
+#. first, 'close' the old folder
+#: mail/mail-local.c:785
 msgid "Closing current folder"
 msgstr "Закрытие текущей папки"
 
-#: mail/mail-local.c:295
+#: mail/mail-local.c:817
 msgid "Renaming old folder and opening"
 msgstr "Переименование старой папки и открытие"
 
-#: mail/mail-local.c:313
+#: mail/mail-local.c:835
 msgid "Creating new folder"
 msgstr "Создание новой папки"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:849
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: mail/mail-local.c:348
+#: mail/mail-local.c:870
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:379
+#: mail/mail-local.c:909
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:787
-msgid "Registering local folder"
-msgstr "Регистрация локальной папки"
-
-#: mail/mail-local.c:789
-msgid "Register local folder"
-msgstr "Зарегистрировать локальную папку"
-
-#: mail/mail-local.c:893
-#, c-format
-msgid ""
-"Unable to register folder '%s':\n"
-"%s"
-msgstr ""
-"Не удалось зарегистрировать папку \"%s\":\n"
-"%s"
-
-#: mail/mail-mt.c:87
+#: mail/mail-mt.c:92
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -5314,7 +5717,7 @@ msgstr ""
 "Ошибка при \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:89
+#: mail/mail-mt.c:94
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -5323,121 +5726,88 @@ msgstr ""
 "Ошибка при выполнении операции:\n"
 "%s"
 
-#: mail/mail-mt.c:385 mail/mail-mt.c:414
+#: mail/mail-mt.c:393 mail/mail-mt.c:422
 msgid "Working"
 msgstr "Обработка"
 
-#: mail/mail-ops.c:510
+#: mail/mail-ops.c:518
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:512
+#: mail/mail-ops.c:520
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: mail/mail-ops.c:740 mail/mail-ops.c:747
-#, c-format
-msgid "Appending \"%s\""
-msgstr "Присоединение \"%s\""
-
-#: mail/mail-ops.c:744 mail/mail-ops.c:750
-msgid "Appending a message without a subject"
-msgstr "Присоединение сообщения без темы"
+#: mail/mail-ops.c:746
+msgid "Saving message to folder"
+msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:833
+#: mail/mail-ops.c:819
 #, c-format
-msgid "Moving messages from \"%s\" into \"%s\""
-msgstr "Перемещение сообщений из \"%s\" в \"%s\""
+msgid "Moving messages to %s"
+msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:835
+#: mail/mail-ops.c:819
 #, c-format
-msgid "Copying messages from \"%s\" into \"%s\""
-msgstr "Копирование сообщений из \"%s\" в \"%s\""
+msgid "Copying messages to %s"
+msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:838
-#, c-format
-msgid "Move messages from \"%s\" into \"%s\""
-msgstr "Переместить сообщения из \"%s\" в \"%s\""
-
-#: mail/mail-ops.c:840
-#, c-format
-msgid "Copy messages from \"%s\" into \"%s\""
-msgstr "Скопировать сообщения из \"%s\" в \"%s\""
-
-#: mail/mail-ops.c:871
+#: mail/mail-ops.c:836
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:874
+#: mail/mail-ops.c:839
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:894
+#: mail/mail-ops.c:850
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:921
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1035 mail/subscribe-dialog.c:359
-msgid "(No description)"
-msgstr "(Нет описания)"
-
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1033
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1141 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1074 mail/mail-ops.c:1208
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1206
+#: mail/mail-ops.c:1139
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1337
-msgid "Synchronising folder"
-msgstr "Синхронизация папки"
-
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1320
 msgid "Expunging folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-ops.c:1436
+#: mail/mail-ops.c:1369
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1436
 msgid "Retrieving messages"
 msgstr "Получение сообщений"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1446
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1661
-#, c-format
-msgid "Loading %s Folder for %s"
-msgstr "Загрузка папки %s для %s"
-
-#: mail/mail-ops.c:1663
-#, c-format
-msgid "Load %s Folder for %s"
-msgstr "Загрузить папку %s для %s"
-
-#: mail/mail-ops.c:1829
+#: mail/mail-ops.c:1520
 msgid "Saving messages"
 msgstr "Сохранение сообщений"
 
-#: mail/mail-ops.c:1908
+#: mail/mail-ops.c:1599
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5446,12 +5816,12 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1612
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
 
-#: mail/mail-ops.c:1935
+#: mail/mail-ops.c:1626
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5460,11 +5830,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2009
+#: mail/mail-ops.c:1700
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1715
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -5473,7 +5843,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2052
+#: mail/mail-ops.c:1743
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
@@ -5482,100 +5852,66 @@ msgstr "Невозможно записать данные: %s"
 msgid "_Search"
 msgstr "Поиск"
 
-#: mail/mail-send-recv.c:105
+#: mail/mail-send-recv.c:127
 msgid "Cancelling ..."
 msgstr "Отмена..."
 
-#: mail/mail-send-recv.c:187
+#: mail/mail-send-recv.c:218
 msgid "Send & Receive mail"
 msgstr "Получение и отправка почты"
 
-#: mail/mail-send-recv.c:191
+#: mail/mail-send-recv.c:221
 msgid "Receiving"
 msgstr "Получение"
 
-#: mail/mail-send-recv.c:220
+#: mail/mail-send-recv.c:267
 msgid "Updating ..."
 msgstr "Обновление..."
 
-#: mail/mail-send-recv.c:222 mail/mail-send-recv.c:262
+#: mail/mail-send-recv.c:269 mail/mail-send-recv.c:313
 msgid "Waiting ..."
 msgstr "Ожидание..."
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:288
 msgid "Sending"
 msgstr "Отправка"
 
-#: mail/mail-send-recv.c:408
+#: mail/mail-send-recv.c:483
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: mail/mail-send-recv.c:412
+#: mail/mail-send-recv.c:487
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-summary.c:111 mail/mail-threads.c:729
+#: mail/mail-summary.c:111
 msgid "Incomplete message written on pipe!"
 msgstr "Неполное сообщение записано в канал!"
 
-#: mail/mail-threads.c:302
-#, c-format
-msgid ""
-"Error while preparing to %s:\n"
-"%s"
-msgstr ""
-"Ошибка при подготовке к %s:\n"
-"%s"
-
-#: mail/mail-threads.c:676
-#, c-format
-msgid ""
-"Error while `%s':\n"
-"%s"
-msgstr ""
-"Ошибка при \"%s\":\n"
-"%s"
-
-#: mail/mail-threads.c:733
-msgid "Error reading commands from dispatching thread."
-msgstr "Ошибка чтения команд из проверяемой нити."
-
-#: mail/mail-threads.c:798
-msgid "Corrupted message from dispatching thread?"
-msgstr "Поврежденное сообщение из проверяемой нити?"
-
-#: mail/mail-threads.c:917
-msgid "Could not create dialog box."
-msgstr "Невозможно создать окно диалога."
-
-#: mail/mail-threads.c:928
-msgid "User cancelled query."
-msgstr "Пользователь отменил запрос."
-
-#: mail/mail-tools.c:192
+#: mail/mail-tools.c:199
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не удалось создать временный mbox \"%s\": %s"
 
-#: mail/mail-tools.c:250
+#: mail/mail-tools.c:257
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (пересланное сообщение)"
 
-#: mail/mail-tools.c:260
+#: mail/mail-tools.c:267
 msgid "Fwd: (no subject)"
 msgstr "Пересл.: (нет темы)"
 
-#: mail/mail-tools.c:277
+#: mail/mail-tools.c:284
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:279
+#: mail/mail-tools.c:286
 msgid "Forwarded message (no subject)"
 msgstr "Пересланное сообщение (без темы)"
 
-#: mail/mail-tools.c:380
+#: mail/mail-tools.c:365
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5584,199 +5920,311 @@ msgstr ""
 "Невозможно открыть положение \"%s\":\n"
 "%s"
 
-#: mail/mail-vfolder.c:150
+#: mail/mail-vfolder.c:170
 msgid "VFolders"
 msgstr "Вирт.папки"
 
-#: mail/mail-vfolder.c:303
+#: mail/mail-vfolder.c:321
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:31
 msgid "Reply"
 msgstr "Ответить"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:36
 msgid "Reply to the sender of this message"
 msgstr "Ответить отправителю этого сообщения"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:35
 msgid "Reply to all recipients of this message"
 msgstr "Ответить всем получателям этого сообщения"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
 msgid "Forward this message"
 msgstr "Переслать это сообщение"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:30
 msgid "Print the selected message"
 msgstr "Распечатать выделенное сообщение"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/message-list.c:608
+#: mail/message-list.c:618
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:611
+#: mail/message-list.c:621
 msgid "Seen"
 msgstr "Прочитанное"
 
-#: mail/message-list.c:614
+#: mail/message-list.c:624
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:617
+#: mail/message-list.c:627
 msgid "Multiple Unseen Messages"
 msgstr "Множество непросмотренных сообщений"
 
-#: mail/message-list.c:620
+#: mail/message-list.c:630
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:933
+#: mail/message-list.c:952
 #, 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:945 mail/message-list.c:961
+#: mail/message-list.c:964 mail/message-list.c:980
 #, c-format
 msgid "%s, et al."
 msgstr "%s, и т.д."
 
-#: mail/message-list.c:948 mail/message-list.c:964
+#: mail/message-list.c:967 mail/message-list.c:983
 msgid "<unknown>"
 msgstr "<неизвестное>"
 
-#: mail/message-list.c:1016
+#: mail/message-list.c:1035
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1023
+#: mail/message-list.c:1042
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:1032
+#: mail/message-list.c:1051
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1044
+#: mail/message-list.c:1063
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1052
+#: mail/message-list.c:1071
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1054
+#: mail/message-list.c:1073
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:1152
+#: mail/message-list.c:1171
 msgid "Flagged"
 msgstr "Отмеченное"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1172
 msgid "From"
 msgstr "От"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1172
 msgid "Date"
 msgstr "Дата"
 
-#: mail/message-list.c:1153
+#: mail/message-list.c:1172
 msgid "Received"
 msgstr "Получения"
 
-#: mail/message-list.c:1154
+#: mail/message-list.c:1173
 msgid "To"
 msgstr "Кому"
 
-#: mail/message-list.c:1154
+#: mail/message-list.c:1173
 msgid "Size"
 msgstr "Размер"
 
-#: mail/openpgp-utils.c:77
+#: mail/openpgp-utils.c:84
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
 
-#: mail/openpgp-utils.c:80
+#: mail/openpgp-utils.c:87
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Пожалуйста введите вашу %s парольную фразу."
 
-#: mail/openpgp-utils.c:431 mail/openpgp-utils.c:534 mail/openpgp-utils.c:738
-#: mail/openpgp-utils.c:887 mail/openpgp-utils.c:1043
+#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:541 mail/openpgp-utils.c:745
+#: mail/openpgp-utils.c:894 mail/openpgp-utils.c:1050
 msgid "No GPG/PGP program available."
 msgstr "Недоступна программа GPG/PGP."
 
-#: mail/openpgp-utils.c:438 mail/openpgp-utils.c:543 mail/openpgp-utils.c:745
-#: mail/openpgp-utils.c:894
+#: mail/openpgp-utils.c:445 mail/openpgp-utils.c:550 mail/openpgp-utils.c:752
+#: mail/openpgp-utils.c:901
 msgid "No password provided."
 msgstr "Пароль не предоставлен."
 
-#: mail/openpgp-utils.c:444 mail/openpgp-utils.c:551 mail/openpgp-utils.c:752
-#: mail/openpgp-utils.c:901 mail/openpgp-utils.c:1049
+#: mail/openpgp-utils.c:451 mail/openpgp-utils.c:558 mail/openpgp-utils.c:759
+#: mail/openpgp-utils.c:908 mail/openpgp-utils.c:1056
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: mail/openpgp-utils.c:562 mail/openpgp-utils.c:607 mail/openpgp-utils.c:646
+#: mail/openpgp-utils.c:569 mail/openpgp-utils.c:614 mail/openpgp-utils.c:653
 msgid "No recipients specified"
 msgstr "Не указаны получатели"
 
-#: mail/openpgp-utils.c:1060
+#: mail/openpgp-utils.c:1067
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Не удалось создать временный файл: %s"
 
-#: mail/subscribe-dialog.c:62 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
 msgid "Folder"
 msgstr "Папка"
 
-#: mail/subscribe-dialog.c:63
+#: mail/subscribe-dialog.c:65
 msgid "Store"
 msgstr "Хранить"
 
-#: mail/subscribe-dialog.c:145
+#: mail/subscribe-dialog.c:147
 msgid "Display folders starting with:"
 msgstr "Показать папки начинающиеся с:"
 
-#: mail/subscribe-dialog.c:178
+#: mail/subscribe-dialog.c:177
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:181
-#, c-format
-msgid "Get store for \"%s\""
-msgstr ""
-
-#: mail/subscribe-dialog.c:292
+#: mail/subscribe-dialog.c:280
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписывание на папку \"%s\""
 
-#: mail/subscribe-dialog.c:296
+#: mail/subscribe-dialog.c:282
 #, c-format
-msgid "Unsubscribing from folder \"%s\""
+msgid "Unsubscribing to folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:300
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "Название папки:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "Тип папки:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "Указать где создать папку:"
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:156
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"Импортирование %s\n"
+"Импортер не готов.\n"
+"5 секунд ожидания перед повтором."
+
+#: shell/importer/importer.c:174 shell/importer/importer.c:201
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Импортирование %s\n"
+"Импортирование элемента %d."
+
+#: shell/importer/importer.c:308
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"Нет импортера, который способен обработать\n"
+"%s"
+
+#: shell/importer/importer.c:318
+msgid "Importing"
+msgstr "Импортирование"
+
+#: shell/importer/importer.c:326
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"Импортирование %s.\n"
+"Начато %s"
+
+#: shell/importer/importer.c:341
 #, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Подписать на папку \"%s\""
+msgid "Error loading %s"
+msgstr "Ошибка при загрузке %s"
 
-#: mail/subscribe-dialog.c:303
+#: shell/importer/importer.c:356
 #, c-format
-msgid "Unsubscribe from folder \"%s\""
-msgstr "Отписаться от папки \"%s\""
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Импортирование %s\n"
+"Импортирование элемента 1."
+
+#: shell/importer/importer.c:427
+msgid "Automatic"
+msgstr "Автоматическое"
+
+#: shell/importer/importer.c:477
+msgid "Filename:"
+msgstr "Имя файла:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:482
+msgid "Select a file"
+msgstr "Выбрать файл"
+
+#: shell/importer/importer.c:492
+msgid "File type:"
+msgstr "Тип файла:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:573
+msgid "Import"
+msgstr "Импортировать"
+
+#: shell/importer/importer.c:606
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Выберите файл, который вы хотите импортировать в Evolution и выберите тип "
+"файла из списка.\n"
+"\n"
+"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
+"попытается опознать его."
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "Средство импортирования Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "Средство импортирования Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Средство импортирования Evolution.\n"
+"Этот помощник проведет вас через процесс импорта\n"
+"внешних файлов в Evolution."
 
 #: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
@@ -5804,14 +6252,14 @@ msgid "Evolution files successfully installed."
 msgstr "Файлы Evolution успешно установлены."
 
 #: shell/e-setup.c:189
-msgid "This seems to be the first time you run Evolution."
-msgstr "Похоже вы запустили \"Эволюцию\" в первые."
+msgid "This seems to be the first time you are running Evolution."
+msgstr "Похоже вы запустили Evolution в первый раз."
 
 #: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
-"Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы "
-"\"Эволюции\" в"
+"Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы Evolution "
+"в"
 
 #: shell/e-setup.c:209
 #, c-format
@@ -5855,7 +6303,7 @@ msgstr ""
 "Пожалуйста, удалите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-shell-folder-creation-dialog.c:82
+#: shell/e-shell-folder-creation-dialog.c:96
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -5864,11 +6312,11 @@ msgstr ""
 "Невозможно создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:134
+#: shell/e-shell-folder-creation-dialog.c:153
 msgid "The specified folder name is not valid."
 msgstr "Указанное имя папки не допустимо."
 
-#: shell/e-shell-folder-creation-dialog.c:225
+#: shell/e-shell-folder-creation-dialog.c:245
 msgid "Evolution - Create new folder"
 msgstr "Эволюция - Создать новую папку"
 
@@ -5880,7 +6328,7 @@ msgstr ""
 "Тип выбранной папки не подходит для\n"
 "запрошенного действия."
 
-#: shell/e-shell-folder-selection-dialog.c:297
+#: shell/e-shell-folder-selection-dialog.c:318
 msgid "New..."
 msgstr "Новая..."
 
@@ -5888,19 +6336,19 @@ msgstr "Новая..."
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
-#: shell/e-shell-view-menu.c:127
+#: shell/e-shell-view-menu.c:159
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy не был найден в вашем $PATH."
 
-#: shell/e-shell-view-menu.c:133
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy не может быть запущен."
 
-#: shell/e-shell-view-menu.c:185
+#: shell/e-shell-view-menu.c:194
 msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
 msgstr "Copyright (C) 1999-2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:187
+#: shell/e-shell-view-menu.c:196
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5910,7 +6358,7 @@ msgstr ""
 "ведения календарей и контактной информации для\n"
 "групповой работы в среде GNOME."
 
-#: shell/e-shell-view-menu.c:347
+#: shell/e-shell-view-menu.c:360
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
@@ -6023,10 +6471,9 @@ msgstr "Удалить эту закладку из строки закладок"
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения закладок."
 
-#: po/tmp/evolution-event-editor.xml.h:81
-#: po/tmp/evolution-message-composer.xml.h:49
-#: po/tmp/evolution-task-editor-dialog.xml.h:95 po/tmp/evolution.xml.h:46
-#: shell/e-storage-set-view.c:345
+#: shell/e-storage-set-view.c:345 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:41
 msgid "_View"
 msgstr "Просмотр"
 
@@ -6034,54 +6481,58 @@ msgstr "Просмотр"
 msgid "View the selected folder"
 msgstr "Просмотр выбранной папки"
 
-#: shell/e-storage.c:160
+#: shell/e-storage.c:176
 msgid "(No name)"
 msgstr "(Без имени)"
 
-#: shell/e-storage.c:411
+#: shell/e-storage.c:427
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: shell/e-storage.c:413
+#: shell/e-storage.c:429
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
-#: shell/e-storage.c:415
+#: shell/e-storage.c:431
 msgid "A folder with the same name already exists"
 msgstr "Папка с таким названием уже существует"
 
-#: shell/e-storage.c:417
+#: shell/e-storage.c:433
 msgid "The specified folder type is not valid"
 msgstr "Указанный тип папки не допустим"
 
-#: shell/e-storage.c:419
+#: shell/e-storage.c:435
 msgid "I/O error"
 msgstr "Ошибка ввода/вывода"
 
-#: shell/e-storage.c:421
+#: shell/e-storage.c:437
 msgid "Not enough space to create the folder"
 msgstr "Недостаточно места для создания папки"
 
-#: shell/e-storage.c:423
+#: shell/e-storage.c:439
 msgid "The specified folder was not found"
 msgstr "Указанная папка не найдена"
 
-#: shell/e-storage.c:425
+#: shell/e-storage.c:441
 msgid "Function not implemented in this storage"
 msgstr "Функция не реализована для этого носителя"
 
-#: shell/e-storage.c:427
+#: shell/e-storage.c:443
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
-#: shell/e-storage.c:429
+#: shell/e-storage.c:445
 msgid "Operation not supported"
 msgstr "Операция не поддерживается"
 
-#: shell/e-storage.c:431
+#: shell/e-storage.c:447
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
+#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+msgid "The Evolution shell."
+msgstr "Оболочка Evolution."
+
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -6144,1273 +6595,1084 @@ msgstr "Отключено."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:155
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"Импортирование %s\n"
-"Импортер не готов.\n"
-"5 секунд ожидания перед повтором."
-
-#: shell/importer/importer.c:173 shell/importer/importer.c:200
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Импортирование %s\n"
-"Импортирование элемента %d."
-
-#: shell/importer/importer.c:307
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Нет импортера, который способен обработать\n"
-"%s"
-
-#: shell/importer/importer.c:317
-msgid "Importing"
-msgstr "Импортирование"
-
-#: shell/importer/importer.c:325
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Импортирование %s.\n"
-"Начато %s"
-
-#: shell/importer/importer.c:340
-#, c-format
-msgid "Error loading %s"
-msgstr "Ошибка при загрузке %s"
-
-#: shell/importer/importer.c:355
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Импортирование %s\n"
-"Импортирование элемента 1."
-
-#: shell/importer/importer.c:426
-msgid "Automatic"
-msgstr "Автоматическое"
-
-#: shell/importer/importer.c:476
-msgid "Filename:"
-msgstr "Имя файла:"
-
-#: shell/importer/importer.c:481
-msgid "Select a file"
-msgstr "Выбрать файл"
-
-#: shell/importer/importer.c:491
-msgid "File type:"
-msgstr "Тип файла:"
-
-#: shell/importer/importer.c:572
-msgid "Import"
-msgstr "Импортировать"
-
-#: shell/importer/importer.c:605
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Выберите файл, который вы хотите импортировать в Evolution и выберите тип файла из списка.\n"
-"\n"
-"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution попытается опознать его."
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:2
 msgid "Create new contact"
 msgstr "Создать новый контакт"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:4
 msgid "Delete a contact"
 msgstr "Удалить контакт"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:28
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-task-editor-dialog.xml.h:23
 msgid "Find"
 msgstr "Поиск"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:6
 msgid "Find a contact"
 msgstr "Поиск контакта"
 
-#: po/tmp/evolution-addressbook.xml.h:12
+#: ui/evolution-addressbook.xml.h:7
 msgid "New contact"
 msgstr "Новый контакт"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:9
 msgid "Print contacts"
 msgstr "Печать контактов"
 
-#: po/tmp/evolution-addressbook.xml.h:15 po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-mail.xml.h:41
 msgid "Stop"
 msgstr "Стоп"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:11
 msgid "Stop Loading"
 msgstr "Остановить загрузку"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:12
 msgid "View All"
 msgstr "Просмотреть все"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:13
 msgid "View all contacts"
 msgstr "Просмотреть все контакты"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:14
 msgid "_Addressbook Configuration..."
 msgstr "Настройка адресной книги..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:15
 msgid "_Print Contacts..."
 msgstr "Напечатать контакты..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:16
 msgid "_Search for contacts"
 msgstr "Поиск контактов"
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:79
-#: po/tmp/evolution-task-editor-dialog.xml.h:93
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:74
+#: ui/evolution-task-editor-dialog.xml.h:88
 msgid "_Tools"
 msgstr "Инструменты"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:1
 msgid "5 Days"
 msgstr "5 дней"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:7 po/tmp/evolution-tasks.xml.h:6
+#: ui/evolution-calendar.xml.h:2 ui/evolution-tasks.xml.h:1
 msgid "Alter preferences"
 msgstr "Другие настройки"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:3
 msgid "Ca_lendar"
 msgstr "Календарь"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:5
 msgid "Calendar Preferences..."
 msgstr "Настройки календаря..."
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:7
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:8
 msgid "Day"
 msgstr "День"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:9
 msgid "Go back in time"
 msgstr "Перейти в прошлое"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:10
 msgid "Go forward in time"
 msgstr "Перейти в будущее"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to"
 msgstr "Перейти к"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:13
 msgid "Go to present time"
 msgstr "Перейти к настоящему времени"
 
-#: po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:14
 msgid "Month"
 msgstr "Месяц"
 
-#: po/tmp/evolution-calendar.xml.h:20
+#: ui/evolution-calendar.xml.h:15
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: po/tmp/evolution-calendar.xml.h:21 po/tmp/evolution-event-editor.xml.h:34
-#: po/tmp/evolution-task-editor-dialog.xml.h:37
+#: ui/evolution-calendar.xml.h:16 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:32
 msgid "Next"
 msgstr "След."
 
-#: po/tmp/evolution-calendar.xml.h:23
+#: ui/evolution-calendar.xml.h:18
 msgid "Open Calendar"
 msgstr "Открыть календарь"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:19
 msgid "Prev"
 msgstr "Пред."
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Print this Calendar"
 msgstr "Напечатать этот календарь"
 
-#: po/tmp/evolution-calendar.xml.h:27
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-calendar.xml.h:22 ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Сохранить как"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:23
 msgid "Save calendar as something else"
 msgstr "Сохранить календарь как что-нибудь еще"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:24
 msgid "Show 1 day"
 msgstr "Показать 1 день"
 
-#: po/tmp/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:25
 msgid "Show 1 month"
 msgstr "Показать 1 месяц"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 week"
 msgstr "Показать 1 неделю"
 
-#: po/tmp/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:27
 msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
-#: po/tmp/evolution-calendar.xml.h:33 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:28 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Сегодня"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:29
 msgid "Week"
 msgstr "Неделя"
 
-#: po/tmp/evolution-calendar.xml.h:35 po/tmp/evolution-event-editor.xml.h:71
-#: po/tmp/evolution-task-editor-dialog.xml.h:84 po/tmp/evolution.xml.h:43
+#: ui/evolution-calendar.xml.h:30 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
 msgid "_New"
 msgstr "Новый"
 
-#: po/tmp/evolution-calendar.xml.h:36
+#: ui/evolution-calendar.xml.h:31
 msgid "_Open Calendar"
 msgstr "Открыть календарь"
 
-#: po/tmp/evolution-calendar.xml.h:37
+#: ui/evolution-calendar.xml.h:32
 msgid "_Print this calendar"
 msgstr "Напечатать этот календарь"
 
-#: po/tmp/evolution-calendar.xml.h:38 po/tmp/evolution-tasks.xml.h:13
+#: ui/evolution-calendar.xml.h:33 ui/evolution-tasks.xml.h:8
 msgid "_Save As..."
 msgstr "Сохранить как..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete..."
 msgstr "Удалить..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Справка"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Печать конверта..."
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:42
-#: po/tmp/evolution-task-editor-dialog.xml.h:45
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:37
+#: ui/evolution-task-editor-dialog.xml.h:40
 msgid "Print this item"
 msgstr "Печать этого элемента"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:43
-#: po/tmp/evolution-task-editor-dialog.xml.h:46
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
+#: ui/evolution-task-editor-dialog.xml.h:41
 msgid "Print..."
 msgstr "Печать..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:46
-#: po/tmp/evolution-message-composer.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:56
+#: ui/evolution-contact-editor.xml.h:8 ui/evolution-event-editor.xml.h:41
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-task-editor-dialog.xml.h:51
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:52
 msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
 msgstr "Послать контакт другому..."
 
-#: po/tmp/evolution-contact-editor.xml.h:17
+#: ui/evolution-contact-editor.xml.h:12
 msgid "See online help"
 msgstr "Просмотр онлайновой справки"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Послать сообщение к контакту..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:64
-#: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16
-#: po/tmp/evolution-task-editor-dialog.xml.h:76 po/tmp/evolution.xml.h:36
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
+#: ui/evolution-message-composer.xml.h:38 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
 msgid "_File"
 msgstr "Файл"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "Печать..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:76
-#: po/tmp/evolution-message-composer.xml.h:47
-#: po/tmp/evolution-task-editor-dialog.xml.h:90
+#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:71
+#: ui/evolution-message-composer.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:85
 msgid "_Save"
 msgstr "Сохранить"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
-#: po/tmp/evolution-task-editor-dialog.xml.h:6
+#: ui/evolution-event-editor.xml.h:1 ui/evolution-task-editor-dialog.xml.h:1
 msgid "About this application"
 msgstr "Об этой программе"
 
-#: po/tmp/evolution-event-editor.xml.h:7
-#: po/tmp/evolution-task-editor-dialog.xml.h:7
+#: ui/evolution-event-editor.xml.h:2 ui/evolution-task-editor-dialog.xml.h:2
 msgid "About..."
 msgstr "О программе..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:8
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor-dialog.xml.h:3
 msgid "Actio_ns"
 msgstr "Действия"
 
-#: po/tmp/evolution-event-editor.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:9
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor-dialog.xml.h:4
 msgid "Address _Book... (FIXME)"
 msgstr "Адресная книга... (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:10
-#: po/tmp/evolution-task-editor-dialog.xml.h:11
+#: ui/evolution-event-editor.xml.h:5 ui/evolution-task-editor-dialog.xml.h:6
 msgid "C_lear"
 msgstr "Очистить"
 
-#: po/tmp/evolution-event-editor.xml.h:11
-#: po/tmp/evolution-task-editor-dialog.xml.h:12
+#: ui/evolution-event-editor.xml.h:6 ui/evolution-task-editor-dialog.xml.h:7
 msgid "C_ut"
 msgstr "Вырезать"
 
-#: po/tmp/evolution-event-editor.xml.h:12
-#: po/tmp/evolution-task-editor-dialog.xml.h:13
+#: ui/evolution-event-editor.xml.h:7 ui/evolution-task-editor-dialog.xml.h:8
 msgid "Chec_k Names (FIXME)"
 msgstr "Проверить имена (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-task-editor-dialog.xml.h:14
+#: ui/evolution-event-editor.xml.h:8 ui/evolution-task-editor-dialog.xml.h:9
 msgid "Clear"
 msgstr "Очистить"
 
-#: po/tmp/evolution-event-editor.xml.h:14
-#: po/tmp/evolution-task-editor-dialog.xml.h:15
+#: ui/evolution-event-editor.xml.h:9 ui/evolution-task-editor-dialog.xml.h:10
 msgid "Clear the selection"
 msgstr "Очистить выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:11
 msgid "Close this appointment"
 msgstr "Закрыть эту встречу"
 
-#: po/tmp/evolution-event-editor.xml.h:17
-#: po/tmp/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-event-editor.xml.h:12 ui/evolution-task-editor-dialog.xml.h:13
 msgid "Cop_y to Folder... (FIXME)"
 msgstr "Скопировать в папку... (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:18 po/tmp/evolution-mail.xml.h:8
-#: po/tmp/evolution-task-editor-dialog.xml.h:19
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:3
+#: ui/evolution-task-editor-dialog.xml.h:14
 msgid "Copy"
 msgstr "Скопировать"
 
-#: po/tmp/evolution-event-editor.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:20
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-task-editor-dialog.xml.h:15
 msgid "Copy the selection"
 msgstr "Скопировать выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:20
-#: po/tmp/evolution-task-editor-dialog.xml.h:21
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-task-editor-dialog.xml.h:16
 msgid "Cut"
 msgstr "Вырезать"
 
-#: po/tmp/evolution-event-editor.xml.h:21
-#: po/tmp/evolution-task-editor-dialog.xml.h:22
+#: ui/evolution-event-editor.xml.h:16 ui/evolution-task-editor-dialog.xml.h:17
 msgid "Cut the selection"
 msgstr "Вырезать выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:24
-#: po/tmp/evolution-task-editor-dialog.xml.h:25
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-task-editor-dialog.xml.h:20
 msgid "Dump XML"
 msgstr "Дамп XML"
 
-#: po/tmp/evolution-event-editor.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:26
+#: ui/evolution-event-editor.xml.h:20 ui/evolution-task-editor-dialog.xml.h:21
 msgid "Dump the UI Xml description"
 msgstr "Дамп XML описания интерфейса"
 
-#: po/tmp/evolution-event-editor.xml.h:26
-#: po/tmp/evolution-task-editor-dialog.xml.h:27
+#: ui/evolution-event-editor.xml.h:21 ui/evolution-task-editor-dialog.xml.h:22
 msgid "Fi_rst Item in Folder (FIXME)"
 msgstr "Первый элемент в папке (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:27
-#: po/tmp/evolution-task-editor-dialog.xml.h:30
+#: ui/evolution-event-editor.xml.h:22 ui/evolution-task-editor-dialog.xml.h:25
 msgid "For_ward (FIXME)"
 msgstr "Переслать (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:23
 msgid "Forward as v_Calendar (FIXME)"
 msgstr "Переслать как v_Calendar (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:29
-#: po/tmp/evolution-task-editor-dialog.xml.h:31
+#: ui/evolution-event-editor.xml.h:24 ui/evolution-task-editor-dialog.xml.h:26
 msgid "Go to the next item"
 msgstr "Перейти к следующему элементу"
 
-#: po/tmp/evolution-event-editor.xml.h:30
-#: po/tmp/evolution-task-editor-dialog.xml.h:32
+#: ui/evolution-event-editor.xml.h:25 ui/evolution-task-editor-dialog.xml.h:27
 msgid "Go to the previous item"
 msgstr "Перейти к предыдущему элементу"
 
-#: po/tmp/evolution-event-editor.xml.h:31
-#: po/tmp/evolution-task-editor-dialog.xml.h:33
+#: ui/evolution-event-editor.xml.h:26 ui/evolution-task-editor-dialog.xml.h:28
 msgid "In_complete Task (FIXME)"
 msgstr "Незавершенное задание (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:32
-#: po/tmp/evolution-task-editor-dialog.xml.h:35
+#: ui/evolution-event-editor.xml.h:27 ui/evolution-task-editor-dialog.xml.h:30
 msgid "Modify the file's properties"
 msgstr "Изменить свойства файла"
 
-#: po/tmp/evolution-event-editor.xml.h:33
-#: po/tmp/evolution-task-editor-dialog.xml.h:36
+#: ui/evolution-event-editor.xml.h:28 ui/evolution-task-editor-dialog.xml.h:31
 msgid "N_ext"
 msgstr "След."
 
-#: po/tmp/evolution-event-editor.xml.h:35
-#: po/tmp/evolution-task-editor-dialog.xml.h:38
+#: ui/evolution-event-editor.xml.h:30 ui/evolution-task-editor-dialog.xml.h:33
 msgid "Paste"
 msgstr "Вставить"
 
-#: po/tmp/evolution-event-editor.xml.h:36
-#: po/tmp/evolution-task-editor-dialog.xml.h:39
+#: ui/evolution-event-editor.xml.h:31 ui/evolution-task-editor-dialog.xml.h:34
 msgid "Paste the clipboard"
 msgstr "Вставить выделение"
 
-#: po/tmp/evolution-event-editor.xml.h:37
-#: po/tmp/evolution-task-editor-dialog.xml.h:40
+#: ui/evolution-event-editor.xml.h:32 ui/evolution-task-editor-dialog.xml.h:35
 msgid "Pre_vious"
 msgstr "Пред."
 
-#: po/tmp/evolution-event-editor.xml.h:38
-#: po/tmp/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-event-editor.xml.h:33 ui/evolution-task-editor-dialog.xml.h:36
 msgid "Previous"
 msgstr "Пред."
 
-#: po/tmp/evolution-event-editor.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:42
+#: ui/evolution-event-editor.xml.h:34 ui/evolution-task-editor-dialog.xml.h:37
 msgid "Print Pre_view"
 msgstr "Просмотр печати"
 
-#: po/tmp/evolution-event-editor.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:43
+#: ui/evolution-event-editor.xml.h:35 ui/evolution-task-editor-dialog.xml.h:38
 msgid "Print S_etup..."
 msgstr "Настройка печати..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:44
+#: ui/evolution-event-editor.xml.h:36 ui/evolution-task-editor-dialog.xml.h:39
 msgid "Print Setup"
 msgstr "Настройка страницы"
 
-#: po/tmp/evolution-event-editor.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:47
+#: ui/evolution-event-editor.xml.h:39 ui/evolution-task-editor-dialog.xml.h:42
 msgid "Properties"
 msgstr "Свойства"
 
-#: po/tmp/evolution-event-editor.xml.h:45
-#: po/tmp/evolution-message-composer.xml.h:19
-#: po/tmp/evolution-task-editor-dialog.xml.h:55
+#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
+#: ui/evolution-task-editor-dialog.xml.h:50
 msgid "Save"
 msgstr "Сохранить"
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:43
 msgid "Save the appointment and close the dialog box"
 msgstr "Сохранить встречу и закрыть окно диалога"
 
-#: po/tmp/evolution-event-editor.xml.h:49
-#: po/tmp/evolution-message-composer.xml.h:25
-#: po/tmp/evolution-task-editor-dialog.xml.h:58
+#: ui/evolution-event-editor.xml.h:44 ui/evolution-message-composer.xml.h:20
+#: ui/evolution-task-editor-dialog.xml.h:53
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:45
 msgid "Schedule Meeting"
 msgstr "Вставить встречу в расписание"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:46
 msgid "Schedule _Meeting"
 msgstr "Вставить встречу в расписание"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:47
 msgid "Schedule some sort of a meeting"
 msgstr "Вставить в расписание встречу некоторого типа"
 
-#: po/tmp/evolution-event-editor.xml.h:53
-#: po/tmp/evolution-task-editor-dialog.xml.h:62
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: po/tmp/evolution-event-editor.xml.h:54
-#: po/tmp/evolution-task-editor-dialog.xml.h:63
+#: ui/evolution-event-editor.xml.h:49 ui/evolution-task-editor-dialog.xml.h:58
 msgid "Select everything"
 msgstr "Выбрать все"
 
-#: po/tmp/evolution-event-editor.xml.h:55
-#: po/tmp/evolution-task-editor-dialog.xml.h:64
+#: ui/evolution-event-editor.xml.h:50 ui/evolution-task-editor-dialog.xml.h:59
 msgid "Setup the page settings for your current printer"
 msgstr "Настройки страницы для вашего текущего принтера"
 
-#: po/tmp/evolution-event-editor.xml.h:56
-#: po/tmp/evolution-task-editor-dialog.xml.h:65
+#: ui/evolution-event-editor.xml.h:51 ui/evolution-task-editor-dialog.xml.h:60
 msgid "Task _Request (FIXME)"
 msgstr "Запрос задания (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:57
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-task-editor-dialog.xml.h:68
+#: ui/evolution-event-editor.xml.h:52 ui/evolution-message-composer.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:63
 msgid "_About..."
 msgstr "О программе..."
 
-#: po/tmp/evolution-event-editor.xml.h:58
-#: po/tmp/evolution-message-composer.xml.h:40
-#: po/tmp/evolution-task-editor-dialog.xml.h:70 po/tmp/evolution.xml.h:33
+#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:35
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Закрыть"
 
-#: po/tmp/evolution-event-editor.xml.h:59
-#: po/tmp/evolution-task-editor-dialog.xml.h:71 po/tmp/evolution.xml.h:34
+#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution.xml.h:29
 msgid "_Contact (FIXME)"
 msgstr "Контакт (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:60
-#: po/tmp/evolution-task-editor-dialog.xml.h:72
+#: ui/evolution-event-editor.xml.h:55 ui/evolution-task-editor-dialog.xml.h:67
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: po/tmp/evolution-event-editor.xml.h:61
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-task-editor-dialog.xml.h:73
+#: ui/evolution-event-editor.xml.h:56 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-task-editor-dialog.xml.h:68
 msgid "_Debug"
 msgstr "Отладка"
 
-#: po/tmp/evolution-event-editor.xml.h:63
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15
-#: po/tmp/evolution-task-editor-dialog.xml.h:75 po/tmp/evolution.xml.h:35
+#: ui/evolution-event-editor.xml.h:58 ui/evolution-message-composer.xml.h:37
+#: ui/evolution-subscribe.xml.h:10 ui/evolution-task-editor-dialog.xml.h:70
+#: ui/evolution.xml.h:30
 msgid "_Edit"
 msgstr "Правка"
 
-#: po/tmp/evolution-event-editor.xml.h:65
-#: po/tmp/evolution-message-composer.xml.h:44
-#: po/tmp/evolution-task-editor-dialog.xml.h:77 po/tmp/evolution.xml.h:39
+#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
 msgid "_Help"
 msgstr "Справка"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-task-editor-dialog.xml.h:78
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-task-editor-dialog.xml.h:73
 msgid "_Item (FIXME)"
 msgstr "Элемент (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:67
-#: po/tmp/evolution-task-editor-dialog.xml.h:79
+#: ui/evolution-event-editor.xml.h:62 ui/evolution-task-editor-dialog.xml.h:74
 msgid "_Journal Entry (FIXME)"
 msgstr "Журнальная запись (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:68
-#: po/tmp/evolution-task-editor-dialog.xml.h:80
+#: ui/evolution-event-editor.xml.h:63 ui/evolution-task-editor-dialog.xml.h:75
 msgid "_Last Item in Folder (FIXME)"
 msgstr "Последний элемент в папке (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:69
-#: po/tmp/evolution-task-editor-dialog.xml.h:81
+#: ui/evolution-event-editor.xml.h:64 ui/evolution-task-editor-dialog.xml.h:76
 msgid "_Mail Message (FIXME)"
 msgstr "Почтовое сообщение (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:70
-#: po/tmp/evolution-task-editor-dialog.xml.h:83
+#: ui/evolution-event-editor.xml.h:65 ui/evolution-task-editor-dialog.xml.h:78
 msgid "_Move to Folder... (FIXME)"
 msgstr "Переместить в папку... (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:72
-#: po/tmp/evolution-task-editor-dialog.xml.h:85
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-task-editor-dialog.xml.h:80
 msgid "_Note (FIXME)"
 msgstr "Заметка (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:73
-#: po/tmp/evolution-task-editor-dialog.xml.h:86
+#: ui/evolution-event-editor.xml.h:68 ui/evolution-task-editor-dialog.xml.h:81
 msgid "_Paste"
 msgstr "Вставить"
 
-#: po/tmp/evolution-event-editor.xml.h:74
-#: po/tmp/evolution-task-editor-dialog.xml.h:87
-#: po/tmp/evolution-tasks.xml.h:12
+#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-tasks.xml.h:7
 msgid "_Print"
 msgstr "Печать"
 
-#: po/tmp/evolution-event-editor.xml.h:75
-#: po/tmp/evolution-task-editor-dialog.xml.h:88
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-task-editor-dialog.xml.h:83
 msgid "_Properties..."
 msgstr "Свойства..."
 
-#: po/tmp/evolution-event-editor.xml.h:77
-#: po/tmp/evolution-task-editor-dialog.xml.h:91
+#: ui/evolution-event-editor.xml.h:72 ui/evolution-task-editor-dialog.xml.h:86
 msgid "_Select All"
 msgstr "Выбрать все"
 
-#: po/tmp/evolution-event-editor.xml.h:78
-#: po/tmp/evolution-task-editor-dialog.xml.h:92 po/tmp/evolution.xml.h:45
+#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
+#: ui/evolution.xml.h:40
 msgid "_Task (FIXME)"
 msgstr "Задание (FIXME)"
 
-#: po/tmp/evolution-event-editor.xml.h:80
-#: po/tmp/evolution-task-editor-dialog.xml.h:94
+#: ui/evolution-event-editor.xml.h:75 ui/evolution-task-editor-dialog.xml.h:89
 msgid "_Unread Item (FIXME)"
 msgstr "Непрочитанный элемент (FIXME)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-executive-summary.xml.h:6
+#: ui/evolution-executive-summary.xml.h:1
 msgid "Add Service"
 msgstr "Добавить сервис"
 
-#: po/tmp/evolution-executive-summary.xml.h:7
+#: ui/evolution-executive-summary.xml.h:2
 msgid "Add a new service to the Executive Summary"
 msgstr "Добавить новый сервис к Executive Summary"
 
-#: po/tmp/evolution-executive-summary.xml.h:8
+#: ui/evolution-executive-summary.xml.h:3
 msgid "Create a new email"
 msgstr "Создать новое сообщение"
 
-#: po/tmp/evolution-executive-summary.xml.h:9
+#: ui/evolution-executive-summary.xml.h:4
 msgid "Executive Summary Settings..."
 msgstr "Установки Executive Summary"
 
-#: po/tmp/evolution-executive-summary.xml.h:10
+#: ui/evolution-executive-summary.xml.h:5
 msgid "New Mail"
 msgstr "Новое сообщение"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:1
 msgid "Compose"
 msgstr "Создать"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:2
 msgid "Compose a new message"
 msgstr "Создать новое сообщение"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:4
 msgid "Copy message to a new folder"
 msgstr "Скопировать сообщение в новую папку"
 
-#: po/tmp/evolution-mail.xml.h:10
+#: ui/evolution-mail.xml.h:5
 msgid "Create Rule"
 msgstr "Создать правило"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
 msgid "F_older"
 msgstr "Папка"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:9
 msgid "Fi_lter on Sender"
 msgstr "Фильтр по отправителю"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:10
 msgid "Filter on Rec_ipients"
 msgstr "Фильтр по получателю"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:11
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:15
 msgid "Get Mail"
 msgstr "Получить почту"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:16
 msgid "Hide S_elected Messages"
 msgstr "Скрыть выделенные сообщения"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:17
 msgid "Hide _Deleted Messages"
 msgstr "Скрыть удаленные сообщения"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:18
 msgid "Hide _Read messages"
 msgstr "Скрыть прочитанные сообщения"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:19
 msgid "Mail _Filters..."
 msgstr "Почтовые фильтры..."
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:20
 msgid "Manage Subscriptions..."
 msgstr "Управление подписками..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:21
 msgid "Mar_k As Read"
 msgstr "Пометить как прочитанное"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:22
 msgid "Mark As U_nread"
 msgstr "Пометить как непрочтенное"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:23
 msgid "Move"
 msgstr "Переместить"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:24
 msgid "Move message to a new folder"
 msgstr "Переместить сообщение в новую папку"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:25
 msgid "Previews the message to be printed"
 msgstr "Просмотр печатаемых сообщений"
 
-#: po/tmp/evolution-mail.xml.h:32
+#: ui/evolution-mail.xml.h:27
 msgid "Print Preview of message..."
 msgstr "Просмотр печати сообщения..."
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:28
 msgid "Print message to the printer"
 msgstr "Распечатать сообщение на принтере"
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:29
 msgid "Print message..."
 msgstr "Печать сообщения..."
 
-#: po/tmp/evolution-mail.xml.h:38
+#: ui/evolution-mail.xml.h:33
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:34
 msgid "Reply to _Sender"
 msgstr "Ответить отправителю"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:37
 msgid "S_ource"
 msgstr "Источник"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Выбрать все"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:39
 msgid "Send queued mail and retrieve new mail"
 msgstr "Отправить почту из очереди и получить новую почту"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:40
 msgid "Show _All Messages"
 msgstr "Показать все сообщения"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:42
 msgid "Threaded Message list"
 msgstr "Список подшитых сообщений"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:44
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:45
 msgid "View Raw Message Source"
 msgstr "Просмотр исходного текста сообщения"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:46
 msgid "_Apply Filters"
 msgstr "Применить фильтры"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:47
 msgid "_Configure Folder..."
 msgstr "Настроить папку..."
 
-#: po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:48
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:50
 msgid "_Edit Message"
 msgstr "Правка сообщения"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:51
 msgid "_Expunge"
 msgstr "Вычеркнуть"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:52
 msgid "_Filter on Subject"
 msgstr "Фильтр по теме"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:53
 msgid "_Forward"
 msgstr "Переслать"
 
-#: po/tmp/evolution-mail.xml.h:59 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:54 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Обратить выделение"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:55
 msgid "_Mail Configuration..."
 msgstr "Настройка почты..."
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:56
 msgid "_Message"
 msgstr "Сообщение"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:57
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:58
 msgid "_Open in New Window"
 msgstr "Открыть в новом окне"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:59
 msgid "_Print Message"
 msgstr "Печать сообщения"
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:60
 msgid "_Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "Подшитые"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "Вирт.папка по теме"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:64
 msgid "_Virtual Folder Editor..."
 msgstr "Редактор виртуальных папок..."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Присоединить"
 
-#: po/tmp/evolution-message-composer.xml.h:9
-#: po/tmp/evolution-task-editor-dialog.xml.h:17
+#: ui/evolution-message-composer.xml.h:4
+#: ui/evolution-task-editor-dialog.xml.h:12
 msgid "Close the current file"
 msgstr "Закрыть текущий файл"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
 msgstr "Зашифровать это сообщение с помощью PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
 msgstr "Формат"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:7
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:8
 msgid "Insert a file as text into the message"
 msgstr "Вставить файл как текст в сообщение"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:9
 msgid "Insert text file..."
 msgstr "Вставить текстовый файл..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "Открыть файл"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "Шифрование PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "Подпись PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save _Draft"
 msgstr "Сохранить черновик"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save in _folder... (FIXME)"
 msgstr "Сохранить в папке... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save in folder..."
 msgstr "Сохранить в папке..."
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save the current file with a different name"
 msgstr "Сохранить текущий файл под другим именем"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save the message in a specified folder"
 msgstr "Сохранить сообщение в указанной папке"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:23
 msgid "Send"
 msgstr "Отправить"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send _Later"
 msgstr "Отправить позже"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:25
 msgid "Send _later"
 msgstr "Отправить позже"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send the mail in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send the message later"
 msgstr "Отправить сообщение позже"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send the message now"
 msgstr "Отправить сообщение сейчас"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send this message now"
 msgstr "Отправить это сообщение сейчас"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:30
 msgid "Show / hide attachments"
 msgstr "Показать/Скрыть вложения"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:31
 msgid "Show _attachments"
 msgstr "Показать вложения"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:32
 msgid "Show attachments"
 msgstr "Показать вложения"
 
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
 msgstr "Подписать это сообщение с вашим PGP-ключом"
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "Вставить текстовый файл... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:46
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "Открыть..."
 
-#: po/tmp/evolution-message-composer.xml.h:48
+#: ui/evolution-message-composer.xml.h:43
 msgid "_Security"
 msgstr "Безопасность"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Добавить папку к вашему списку папок подписок"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:5
 msgid "Refresh List of Folders"
 msgstr "Обновить список папок"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:6
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Удалить папку из вашего списка папок подписок"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:8
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:9
 msgid "Unsubscribe"
 msgstr "Отказаться"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:10
+#: ui/evolution-task-editor-dialog.xml.h:5
 msgid "Assig_n Task (FIXME)"
 msgstr "Назначить задание (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:24
-msgid "Delete this task"
-msgstr "Удалить это задание"
-
-#: po/tmp/evolution-task-editor-dialog.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:24
 msgid "Find Again"
 msgstr "Повторный поиск"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:34
+#: ui/evolution-task-editor-dialog.xml.h:29
 msgid "Meeting Re_quest (FIXME)"
 msgstr "Запрос встречи (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:48
+#: ui/evolution-task-editor-dialog.xml.h:43
 msgid "Redo"
 msgstr "Возврат"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:49
+#: ui/evolution-task-editor-dialog.xml.h:44
 msgid "Redo the undone action"
 msgstr "Повторить отмененное действие"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:45
 msgid "Replace"
 msgstr "Заменить"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:51
+#: ui/evolution-task-editor-dialog.xml.h:46
 msgid "Replace a string"
 msgstr "Заменить строку"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:52
+#: ui/evolution-task-editor-dialog.xml.h:47
 msgid "Reply to A_ll (FIXME)"
 msgstr "Ответить всем (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:48
 msgid "S_end Status Report (FIXME)"
 msgstr "Послать отчет о состоянии (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:54
+#: ui/evolution-task-editor-dialog.xml.h:49
 msgid "S_kip Occurrence (FIXME)"
 msgstr "Пропустить повторы (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:59
+#: ui/evolution-task-editor-dialog.xml.h:54
 msgid "Save the task and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:60
+#: ui/evolution-task-editor-dialog.xml.h:55
 msgid "Search again for the same string"
 msgstr "Искать ту же строку еще раз"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:61
+#: ui/evolution-task-editor-dialog.xml.h:56
 msgid "Search for a string"
 msgstr "Поиск строки"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:61
 msgid "Undo"
 msgstr "Откат"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:67
+#: ui/evolution-task-editor-dialog.xml.h:62
 msgid "Undo the last action"
 msgstr "Отменить последнее действие"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:69 po/tmp/evolution.xml.h:32
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
 msgid "_Appointment (FIXME)"
 msgstr "Встреча (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:82
+#: ui/evolution-task-editor-dialog.xml.h:77
 msgid "_Mark Complete (FIXME)"
 msgstr "Пометить как выполненное (FIXME)"
 
-#: po/tmp/evolution-task-editor-dialog.xml.h:89
+#: ui/evolution-task-editor-dialog.xml.h:84
 msgid "_Reply (FIXME)"
 msgstr "Ответить (FIXME)"
 
-#: po/tmp/evolution-tasks.xml.h:7
+#: ui/evolution-tasks.xml.h:2
 msgid "Create a new task"
 msgstr "Создать новое задание"
 
-#: po/tmp/evolution-tasks.xml.h:8
+#: ui/evolution-tasks.xml.h:3
 msgid "New"
 msgstr "Новый"
 
-#: po/tmp/evolution-tasks.xml.h:10
+#: ui/evolution-tasks.xml.h:5
 msgid "Save task as something else"
 msgstr "Сохранить задание как что-нибудь еще"
 
-#: po/tmp/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:6
 msgid "Tasks Preferences..."
 msgstr "Настройки заданий..."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "О программе..."
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:3
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:4
 msgid "Customi_ze..."
 msgstr "Настроить..."
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:5
 msgid "Customize"
 msgstr "Настроить"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:6
 msgid "Customize toolbars"
 msgstr "Настроить панели инструментов"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Показать другую папку"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:8
 msgid "E_xit"
 msgstr "Выход"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:9
 msgid "Evolution bar _shortcut"
 msgstr "Строка ярлыков Evolution"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:10
 msgid "Exit"
 msgstr "Выход"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:12
 msgid "Getting _Started"
 msgstr "Краткое руководство"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:13
 msgid "Import an external file format"
 msgstr "Импортировать во внешний формат файла"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:14
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:15
 msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Evolution"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:16
 msgid "Show the _Folder Bar"
 msgstr "Показать строку папок"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:17
 msgid "Show the _Shortcut Bar"
 msgstr "Показать строку закладок"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:18
 msgid "Submit Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: po/tmp/evolution.xml.h:24
+#: ui/evolution.xml.h:19
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: po/tmp/evolution.xml.h:25
+#: ui/evolution.xml.h:20
 msgid "Submit bug report using Bug Buddy."
 msgstr "Отправить сообщение об ошибке используя Bug Buddy."
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:21
 msgid "Toggle whether to show the folder bar"
 msgstr "Переключить отображение строки папок"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:22
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Переключить отображение строки закладок"
 
-#: po/tmp/evolution.xml.h:28
+#: ui/evolution.xml.h:23
 msgid "Using the C_ontact Manager"
 msgstr "Использование диспетчера контактов"
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:24
 msgid "Using the _Calendar"
 msgstr "Использование календаря"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:25
 msgid "Using the _Mailer"
 msgstr "Использование почты"
 
-#: po/tmp/evolution.xml.h:31
+#: ui/evolution.xml.h:26
 msgid "_About Evolution..."
 msgstr "О программе..."
 
-#: po/tmp/evolution.xml.h:37
+#: ui/evolution.xml.h:32
 msgid "_Folder"
 msgstr "Папка"
 
-#: po/tmp/evolution.xml.h:38
+#: ui/evolution.xml.h:33
 msgid "_Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: po/tmp/evolution.xml.h:40
+#: ui/evolution.xml.h:35
 msgid "_Import file..."
 msgstr "Импортировать файл..."
 
-#: po/tmp/evolution.xml.h:41
+#: ui/evolution.xml.h:36
 msgid "_Index"
 msgstr "Индекс"
 
-#: po/tmp/evolution.xml.h:42
+#: ui/evolution.xml.h:37
 msgid "_Mail message"
 msgstr "Почтовое сообщение"
 
-#: po/tmp/evolution.xml.h:44
+#: ui/evolution.xml.h:39
 msgid "_Settings"
 msgstr "Установки"
 
@@ -7548,3 +7810,27 @@ msgstr "Не показывать это сообщение снова."
 #: widgets/misc/e-search-bar.c:135
 msgid "Sear_ch"
 msgstr "Поиск"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
+msgid "The Personal Addressbook Server"
+msgstr "Сервер персональных адресных книг"
+
+#: wombat/GNOME_Evolution_Wombat.oaf.in.h:2
+msgid "The Personal Calendar Server; calendar factory"
+msgstr ""
+
+#: wombat/wombat.c:153
+msgid "setup_vfs(): could not initialize GNOME-VFS"
+msgstr "setup_vfs(): Не удалось инициализировать GNOME-VFS"
+
+#: wombat/wombat.c:165
+msgid "init_corba(): could not initialize GNOME"
+msgstr "init_corba(): Не удалось инициализировать GNOME"
+
+#: wombat/wombat.c:178
+msgid "init_bonobo(): could not initialize Bonobo"
+msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
+
+#: evolution.desktop.in.h:2
+msgid "The Evolution groupware suite"
+msgstr "Набор приложений групповой работы Evolution"
author	Valek Frob <frob@src.gnome.org>	2001-02-22 23:56:08 +0800
committer	Valek Frob <frob@src.gnome.org>	2001-02-22 23:56:08 +0800
commit	93a285353c8ee1052422a2d526434bc7c009f971 (patch)
tree	c336d1f8178ae28fe4769403e666ff40a756dd50 /po
parent	fa3dd0054fe2bb2eb17d50540473b82b360f0b4a (diff)
download	gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.tar.gz gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.tar.zst gsoc2013-evolution-93a285353c8ee1052422a2d526434bc7c009f971.zip