Updated russian translation.

svn path=/trunk/; revision=6569
author: Valek Frob <frob@src.gnome.org> 2000-11-14 19:07:22 +0800
committer: Valek Frob <frob@src.gnome.org> 2000-11-14 19:07:22 +0800
commit: a8a3c49fccc401f78d68142d0664c37a9ec951ac (patch)
tree: b82609a456d2a5820c7a212bcc90fdb0e144898e
parent: 6f4d56f965f60497cfee2bcde5fee02cd1888f65 (diff)
download: gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.gz
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.bz2
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.lz
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.xz
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.zst
gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.zip
2 files changed, 774 insertions, 1067 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 40bff196c7..21792da72d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-14  Valek Filippov  <frob@df.ru>
+
+	* ru.po: updated russian translation.
+
 2000-11-06  Michael Meeks  <michael@helixcode.com>
 
 	* update.pl (GenHeaders, GeneratePot): Kill abortive
diff --git a/po/ru.po b/po/ru.po
index 97556ed184..e54aa6bd4a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,19 +4,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-11-08 18:42+0300\n"
-"PO-Revision-Date: 2000-11-08 18:47+03:00\n"
+"POT-Creation-Date: 2000-11-14 13:59+0300\n"
+"PO-Revision-Date: 2000-11-14 14:06+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:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Карточка: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -32,13 +32,13 @@ msgstr ""
 "\n"
 "  Префикс:    "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -46,13 +46,13 @@ msgstr ""
 "\n"
 "  Добавочный: "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -60,7 +60,7 @@ msgstr ""
 "\n"
 "  Суффикс:     "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -68,7 +68,7 @@ msgstr ""
 "\n"
 "Дата рождения: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -76,7 +76,7 @@ msgstr ""
 "\n"
 "Адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -84,7 +84,7 @@ msgstr ""
 "\n"
 "Почтовый ящик:  "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -92,7 +92,7 @@ msgstr ""
 "\n"
 "  Расш.:        "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -100,7 +100,7 @@ msgstr ""
 "\n"
 "  Улица:     "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -108,7 +108,7 @@ msgstr ""
 "\n"
 "  Город:      "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -116,7 +116,7 @@ msgstr ""
 "\n"
 "  Область:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -124,7 +124,7 @@ msgstr ""
 "\n"
 "  Почтовый код: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -132,13 +132,13 @@ msgstr ""
 "\n"
 "  Страна:     "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -146,7 +146,7 @@ msgstr ""
 "\n"
 "Телефоны:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -154,7 +154,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -162,7 +162,7 @@ msgstr ""
 "\n"
 "Эл.адрес:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -170,13 +170,13 @@ msgstr ""
 "\n"
 "Эл.адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -184,7 +184,7 @@ msgstr ""
 "\n"
 "Часовой пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -192,7 +192,7 @@ msgstr ""
 "\n"
 "Геогр.положение: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -200,13 +200,13 @@ msgstr ""
 "\n"
 "Должность: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -214,31 +214,31 @@ msgstr ""
 "\n"
 "  Имя:  "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -246,7 +246,7 @@ msgstr ""
 "\n"
 "категории: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -264,7 +264,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -272,7 +272,7 @@ msgstr ""
 "\n"
 "Уникальная строка: "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -284,10 +284,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:910
+#: addressbook/conduit/address-conduit.c:1012
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1092
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -410,28 +410,28 @@ msgstr ""
 "При попытке получить список Пилотов\n"
 "от демона gnome-pilot возникла ошибка"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:207
 msgid "Cursor could not be loaded\n"
 msgstr "Курсор не может быть загружен\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:220
 msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
-#: addressbook/conduit/address-conduit.c:490
+#: addressbook/conduit/address-conduit.c:579
 #: calendar/conduits/calendar/calendar-conduit.c:651
 #: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
-#: addressbook/conduit/address-conduit.c:491
+#: addressbook/conduit/address-conduit.c:580
 #: calendar/conduits/calendar/calendar-conduit.c:652
 #: calendar/conduits/todo/todo-conduit.c:525
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:613
+#: addressbook/conduit/address-conduit.c:616
 msgid "Could not read pilot's Address application block"
 msgstr "Невозможно прочесть блок приложения адресов Пилота"
 
@@ -452,114 +452,105 @@ msgstr "Элементы принадлежащие этим категориям:"
 msgid "Available Categories:"
 msgstr "Доступные категории:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
+#: addressbook/contact-editor/e-contact-editor.c:1266
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/contact-editor/e-contact-editor.c:1235
-#: addressbook/contact-editor/e-contact-editor.c:1339
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/contact-editor/e-contact-editor.c:1236
+#: addressbook/contact-editor/e-contact-editor.c:1268
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1237
+#: addressbook/contact-editor/e-contact-editor.c:1269
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1238
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1239
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/contact-editor/e-contact-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1340
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1244
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: mail/mail-config.glade.h:18
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1248
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/contact-editor/e-contact-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1296
+#: addressbook/contact-editor/e-contact-editor.c:1328
 msgid "Primary Email"
 msgstr "Первый эл.адрес"
 
-#: addressbook/contact-editor/e-contact-editor.c:1297
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1298
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить этот контакт?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
 msgid "Delete Contact?"
 msgstr "Удалить контакт?"
 
@@ -586,13 +577,14 @@ msgstr "Тип телефона"
 msgid "New phone type"
 msgstr "Новый тип телефона"
 
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:62 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
 msgid "Add"
 msgstr "Добавить"
 
@@ -645,8 +637,7 @@ msgid "C_ontacts..."
 msgstr "Контакты..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Ca_tegories..."
 msgstr "Категории..."
 
@@ -664,7 +655,6 @@ msgstr "Адрес..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
 #: calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:69
 msgid "General"
 msgstr "Общее"
 
@@ -709,68 +699,47 @@ msgid "No_tes:"
 msgstr "Заметки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Details"
 msgstr "Детали"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/contact-editor/fulladdr.glade.h:19
+msgid "Address _2:"
+msgstr "Адрес 2:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Проверить адрес"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/contact-editor/fulladdr.glade.h:21
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Страна:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_Address:"
 msgstr "Адрес:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/contact-editor/fulladdr.glade.h:22
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_City:"
 msgstr "Город:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/contact-editor/fulladdr.glade.h:23
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_PO Box:"
 msgstr "Аб.ящик:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "Address _2:"
-msgstr "Адрес 2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#: addressbook/contact-editor/fulladdr.glade.h:24
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_State/Province:"
 msgstr "Область/Район (Штат/Провинция):"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "США"
-
 #: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Канада"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Финляндия"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-#: addressbook/contact-editor/fulladdr.glade.h:25
 msgid "_ZIP Code:"
 msgstr "Почтовый индекс:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-#: addressbook/contact-editor/fulladdr.glade.h:20
-msgid "Countr_y:"
-msgstr "Страна:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -830,7 +799,7 @@ msgstr "Фамилия:"
 msgid "_Suffix:"
 msgstr "Суффикс:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:266
 msgid "As _Minicards"
 msgstr "Как миникарточки"
 
@@ -839,16 +808,16 @@ msgstr "Как миникарточки"
 #. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271
+#: addressbook/gui/component/addressbook.c:272
 #: ui/evolution-addressbook.xml.h:7
 msgid "As _Table"
 msgstr "Как таблица"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:392
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:397
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -868,27 +837,27 @@ msgstr ""
 "использовать LDAP, вам надо скачать и установить \n"
 "OpenLDAP и перекомпилировать и установить evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
 msgid "Show All"
 msgstr "Показать все"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
 msgid "Advanced..."
 msgstr "Расширенные..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:539
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:540
 msgid "Name contains"
 msgstr "Имя содержит"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:541
 msgid "Email contains"
 msgstr "Эл.адрес содержит"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:627
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -897,182 +866,65 @@ msgid "External Directories"
 msgstr "Внешние каталоги"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: addressbook/gui/component/ldap-server-dialog.glade.h:12
-#: composer/e-msg-composer-attachment.glade.h:9
-#: composer/e-msg-composer-attachment.glade.h:12
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "Description:"
 msgstr "Описание:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:8
-#: addressbook/gui/component/ldap-server-dialog.glade.h:13
 msgid "LDAP Server:"
 msgstr "Сервер LDAP:"
 
 #: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: addressbook/gui/component/ldap-server-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:37
+msgid "Name:"
+msgstr "Имя:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
 msgid "Port Number:"
 msgstr "Номер порта:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-#: addressbook/gui/component/ldap-server-dialog.glade.h:16
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: addressbook/gui/component/ldap-server-dialog.glade.h:14
-#: mail/mail-config-druid.glade.h:49
-msgid "Name:"
-msgstr "Имя:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/component/select-names/select-names.glade.h:7
-#: addressbook/gui/component/select-names/select-names.glade.h:13
-msgid "Select Names"
-msgstr "Выбрать имена"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#: addressbook/gui/component/select-names/select-names.glade.h:11
 msgid "Find..."
 msgstr "Найти..."
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Message Recipients"
+msgstr "Получатели сообщения"
+
 #: addressbook/gui/component/select-names/select-names.glade.h:9
-#: addressbook/gui/component/select-names/select-names.glade.h:14
-msgid "Select name from List:"
-msgstr "Выбрать имена из списка:"
+msgid "Select Names"
+msgstr "Выбрать имена"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:10
-#: addressbook/gui/component/select-names/select-names.glade.h:12
-msgid "Message Recipients"
-msgstr "Получатели сообщения"
+msgid "Select name from List:"
+msgstr "Выбрать имена из списка:"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/gui/widgets/alphabet.glade.h:7
-#: addressbook/gui/widgets/alphabet.glade.h:36
-msgid "window2"
-msgstr "окно2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-#: addressbook/gui/widgets/alphabet.glade.h:35
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "k"
-msgstr "к"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:28
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:29
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:30
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:31
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:32
-msgid "x"
-msgstr "x"
-
-#: addressbook/gui/widgets/alphabet.glade.h:33
-msgid "y"
-msgstr "y"
-
-#: addressbook/gui/widgets/alphabet.glade.h:34
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/alphabet.glade.h:8
+msgid "window2"
+msgstr "окно2"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:415
 #: addressbook/gui/widgets/e-minicard.c:338
@@ -1097,234 +949,184 @@ msgstr ""
 "\n"
 "Дважды щелкните здесь для создания нового контакта."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "Поиск"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: addressbook/printing/e-contact-print.glade.h:7
-#: addressbook/printing/e-contact-print.glade.h:82
-msgid "Page Setup:"
-msgstr "Настройка страницы:"
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:8
-#: addressbook/printing/e-contact-print.glade.h:94
-msgid "Style name:"
-msgstr "Название стиля:"
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
 #: addressbook/printing/e-contact-print.glade.h:9
-#: addressbook/printing/e-contact-print.glade.h:86
-msgid "Preview:"
-msgstr "Просмотр:"
+msgid "Blank forms at end:"
+msgstr "Пустая форма в конце:"
 
 #: addressbook/printing/e-contact-print.glade.h:10
-#: addressbook/printing/e-contact-print.glade.h:79
-msgid "Options"
-msgstr "Параметры"
+msgid "Body"
+msgstr "Тело"
 
 #: addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/printing/e-contact-print.glade.h:73
-msgid "Include:"
-msgstr "Включить:"
+msgid "Bottom:"
+msgstr "Снизу:"
 
 #: addressbook/printing/e-contact-print.glade.h:12
-#: addressbook/printing/e-contact-print.glade.h:90
-msgid "Sections:"
-msgstr "Разделы:"
+msgid "Dimensions:"
+msgstr "Размеры:"
 
 #: addressbook/printing/e-contact-print.glade.h:13
-#: addressbook/printing/e-contact-print.glade.h:72
-msgid "Immediately follow each other"
-msgstr "Один за другим"
+msgid "Font..."
+msgstr "Шрифт..."
 
 #: addressbook/printing/e-contact-print.glade.h:14
-#: addressbook/printing/e-contact-print.glade.h:76
-msgid "Letter tabs on side"
-msgstr "Закладки букв сбоку"
+msgid "Fonts"
+msgstr "Шрифты..."
 
 #: addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/printing/e-contact-print.glade.h:70
-msgid "Headings for each letter"
-msgstr "Заголовки для каждой буквы"
+msgid "Footer:"
+msgstr "Сноска:"
 
 #: addressbook/printing/e-contact-print.glade.h:16
-#: addressbook/printing/e-contact-print.glade.h:93
-msgid "Start on a new page"
-msgstr "Начинать с новой страницы"
+msgid "Format"
+msgstr "Формат"
 
 #: addressbook/printing/e-contact-print.glade.h:17
-#: addressbook/printing/e-contact-print.glade.h:78
-msgid "Number of columns:"
-msgstr "Число столбцов:"
+msgid "Header"
+msgstr "Заголовок"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: addressbook/printing/e-contact-print.glade.h:59
-msgid "Blank forms at end:"
-msgstr "Пустая форма в конце:"
+msgid "Header/Footer"
+msgstr "Заголовок/Сноска"
 
 #: addressbook/printing/e-contact-print.glade.h:19
-#: addressbook/printing/e-contact-print.glade.h:64
-msgid "Fonts"
-msgstr "Шрифты..."
+msgid "Headings"
+msgstr "Заголовки"
 
 #: addressbook/printing/e-contact-print.glade.h:20
+msgid "Headings for each letter"
+msgstr "Заголовки для каждой буквы"
+
 #: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-#: addressbook/printing/e-contact-print.glade.h:63
-msgid "Font..."
-msgstr "Шрифт..."
+msgid "Height:"
+msgstr "Высота:"
 
 #: addressbook/printing/e-contact-print.glade.h:22
-#: addressbook/printing/e-contact-print.glade.h:69
-msgid "Headings"
-msgstr "Заголовки"
+msgid "Immediately follow each other"
+msgstr "Один за другим"
 
 #: addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:57
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+msgid "Include:"
+msgstr "Включить:"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/printing/e-contact-print.glade.h:60
-msgid "Body"
-msgstr "Тело"
+msgid "Landscape"
+msgstr "Блокнот"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: addressbook/printing/e-contact-print.glade.h:58
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+msgid "Left:"
+msgstr "Слева:"
 
 #: addressbook/printing/e-contact-print.glade.h:26
-#: addressbook/printing/e-contact-print.glade.h:91
-msgid "Shading"
-msgstr "Полутона"
+msgid "Letter tabs on side"
+msgstr "Закладки букв сбоку"
 
 #: addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/printing/e-contact-print.glade.h:87
-msgid "Print using gray shading"
-msgstr "Печать с использованием полутонов"
+msgid "Margins"
+msgstr "Поля"
 
 #: addressbook/printing/e-contact-print.glade.h:28
-#: addressbook/printing/e-contact-print.glade.h:66
-msgid "Format"
-msgstr "Формат"
+msgid "Number of columns:"
+msgstr "Число столбцов:"
 
 #: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-#: addressbook/printing/e-contact-print.glade.h:83
-msgid "Paper"
-msgstr "Бумага"
+msgid "Options"
+msgstr "Параметры"
 
 #: addressbook/printing/e-contact-print.glade.h:30
-#: addressbook/printing/e-contact-print.glade.h:96
-#: mail/mail-config-druid.glade.h:78
-msgid "Type:"
-msgstr "Тип:"
+msgid "Orientation"
+msgstr "Ориентация"
 
 #: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: addressbook/printing/e-contact-print.glade.h:98
-msgid "label26"
-msgstr "метка26"
+msgid "Page"
+msgstr "Страница"
 
 #: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-#: addressbook/printing/e-contact-print.glade.h:62
-msgid "Dimensions:"
-msgstr "Размеры:"
+msgid "Page Setup:"
+msgstr "Настройка страницы:"
 
 #: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-#: addressbook/printing/e-contact-print.glade.h:97
-msgid "Width:"
-msgstr "Ширина:"
+msgid "Paper"
+msgstr "Бумага"
 
 #: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-#: addressbook/printing/e-contact-print.glade.h:71
-msgid "Height:"
-msgstr "Высота:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
-#: addressbook/printing/e-contact-print.glade.h:84
 msgid "Paper source:"
 msgstr "Источник бумаги:"
 
+#: addressbook/printing/e-contact-print.glade.h:35
+msgid "Portrait"
+msgstr "Портрет"
+
 #: addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/printing/e-contact-print.glade.h:77
-msgid "Margins"
-msgstr "Поля"
+msgid "Preview:"
+msgstr "Просмотр:"
 
 #: addressbook/printing/e-contact-print.glade.h:37
-#: addressbook/printing/e-contact-print.glade.h:95
-msgid "Top:"
-msgstr "Сверху:"
+msgid "Print using gray shading"
+msgstr "Печать с использованием полутонов"
 
 #: addressbook/printing/e-contact-print.glade.h:38
-#: addressbook/printing/e-contact-print.glade.h:61
-msgid "Bottom:"
-msgstr "Снизу:"
+msgid "Reverse on even pages"
+msgstr "Обращать на четных страницах"
 
 #: addressbook/printing/e-contact-print.glade.h:39
-#: addressbook/printing/e-contact-print.glade.h:75
-msgid "Left:"
-msgstr "Слева:"
-
-#: addressbook/printing/e-contact-print.glade.h:40
-#: addressbook/printing/e-contact-print.glade.h:89
 msgid "Right:"
 msgstr "Справа:"
 
+#: addressbook/printing/e-contact-print.glade.h:40
+msgid "Sections:"
+msgstr "Разделы:"
+
 #: addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/printing/e-contact-print.glade.h:81
-msgid "Page"
-msgstr "Страница"
+msgid "Shading"
+msgstr "Полутона"
 
 #: addressbook/printing/e-contact-print.glade.h:42
-#: addressbook/printing/e-contact-print.glade.h:92
 msgid "Size:"
 msgstr "Размер:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-#: addressbook/printing/e-contact-print.glade.h:80
-msgid "Orientation"
-msgstr "Ориентация"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-#: addressbook/printing/e-contact-print.glade.h:85
-msgid "Portrait"
-msgstr "Портрет"
+#: addressbook/printing/e-contact-print.glade.h:43
+msgid "Start on a new page"
+msgstr "Начинать с новой страницы"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-#: addressbook/printing/e-contact-print.glade.h:74
-msgid "Landscape"
-msgstr "Блокнот"
+#: addressbook/printing/e-contact-print.glade.h:44
+msgid "Style name:"
+msgstr "Название стиля:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-#: addressbook/printing/e-contact-print.glade.h:67
-msgid "Header"
-msgstr "Заголовок"
+#: addressbook/printing/e-contact-print.glade.h:45
+msgid "Top:"
+msgstr "Сверху:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-#: addressbook/printing/e-contact-print.glade.h:65
-msgid "Footer:"
-msgstr "Сноска:"
+#: addressbook/printing/e-contact-print.glade.h:46
+#: mail/mail-config-druid.glade.h:66
+msgid "Type:"
+msgstr "Тип:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-#: addressbook/printing/e-contact-print.glade.h:88
-msgid "Reverse on even pages"
-msgstr "Обращать на четных страницах"
+#: addressbook/printing/e-contact-print.glade.h:47
+msgid "Width:"
+msgstr "Ширина:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-#: addressbook/printing/e-contact-print.glade.h:68
-msgid "Header/Footer"
-msgstr "Заголовок/Сноска"
+#: addressbook/printing/e-contact-print.glade.h:48
+msgid "label26"
+msgstr "метка26"
 
 #: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
 msgid "am"
@@ -1334,6 +1136,10 @@ msgstr "д.п."
 msgid "pm"
 msgstr "п.п."
 
+#: calendar/cal-util/timeutil.c:100
+msgid "h"
+msgstr "h"
+
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Кондуит календаря Evolution"
@@ -1437,17 +1243,14 @@ msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
 #: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Public"
 msgstr "Общее"
 
 #: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Private"
 msgstr "Личное"
 
 #: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
@@ -1555,456 +1358,302 @@ msgid "No summary available."
 msgstr "Итог не доступен."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/alarm-notify.glade.h:11
 #: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-subscribe.xml.h:8
+#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
 msgid "Close"
 msgstr "Закрыть"
 
 #: calendar/gui/dialogs/alarm-notify.glade.h:8
-#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Короткий сон"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-#: calendar/gui/dialogs/alarm-notify.glade.h:12
 msgid "Edit appointment"
 msgstr "Правка встречи"
 
+#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+msgid "Snooze"
+msgstr "Короткий сон"
+
 #: calendar/gui/dialogs/alarm-notify.glade.h:10
-#: calendar/gui/dialogs/alarm-notify.glade.h:14
 msgid "Snooze time (minutes)"
 msgstr "Время дремания (минут)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
-msgid "Calendar Preferences"
-msgstr "Настройки календаря"
+msgid "12 hour (am/pm)"
+msgstr "12-часовой (ДП/ПП)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
-msgid "Work week"
-msgstr "Рабочая неделя"
+msgid "24 hour"
+msgstr "24-часовой"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Пон"
+msgid "Alarms timeout after"
+msgstr "Задержка таймера на"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Втр"
+msgid "Audio Alarms"
+msgstr "Аудио Таймеры"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Срд"
+msgid "Beep when alarm windows appear."
+msgstr "Гудок при возникновении окна таймера."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Чтв"
+msgid "Calendar"
+msgstr "Календарь"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Пят"
+msgid "Calendar Preferences"
+msgstr "Настройки календаря"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Суб"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+msgid "Colors"
+msgstr "Цвета"
 
-#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Вск"
+msgid "Compress weekends"
+msgstr "Сжать выходные дни"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
-msgid "First day of week:"
-msgstr "Первый день недели:"
+msgid "Date navigator options"
+msgstr "Параметры навигатора дат"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor.c:368 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Понедельник"
+#. populate default frame/box
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+msgid "Defaults"
+msgstr "Исх.значения"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor.c:369
-msgid "Tuesday"
-msgstr "Вторник"
+msgid "Display options"
+msgstr "Отобразить параметры"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor.c:370
-msgid "Wednesday"
-msgstr "Среда"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+msgid "Due Date"
+msgstr "Условленная дата"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor.c:371
-msgid "Thursday"
-msgstr "Четверг"
+msgid "Enable snoozing for"
+msgstr "Разрешить краткий сон для "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor.c:372
-msgid "Friday"
-msgstr "Пятница"
+msgid "End of day:"
+msgstr "Конец дня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor.c:373
-msgid "Saturday"
-msgstr "Суббота"
+msgid "First day of week:"
+msgstr "Первый день недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:374 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Воскресенье"
+#: calendar/gui/gnome-month-item.c:741
+msgid "Fri"
+msgstr "Пят"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
-msgid "Start of day:"
-msgstr "Начало дня:"
+msgid "Highlight"
+msgstr "Подсвеченные дни:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
-msgid "End of day:"
-msgstr "Конец дня:"
+msgid "Items Due Today"
+msgstr "Задания установленные на сегодня"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
-msgid "Display options"
-msgstr "Отобразить параметры"
+msgid "Items Due Today:"
+msgstr "Задания установленные на сегодня:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
-msgid "Time divisions:"
-msgstr "Разделители времени:"
+msgid "Items Not Yet Due"
+msgstr "Еще не просроченные задания"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
-msgid "Time format:"
-msgstr "Формат времени:"
+msgid "Items Not Yet Due:"
+msgstr "Еще не просроченные задания:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
-msgid "Show appointment end times"
-msgstr "Показать время окончании встречи"
+#: calendar/gui/gnome-month-item.c:737
+msgid "Mon"
+msgstr "Пон"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
-msgid "Compress weekends"
-msgstr "Сжать выходные дни"
+msgid "Overdue Items"
+msgstr "Просроченные задания"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
-msgid "12 hour (am/pm)"
-msgstr "12-часовой (ДП/ПП)"
+msgid "Overdue Items:"
+msgstr "Просроченные задания:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
-msgid "24 hour"
-msgstr "24-часовой"
+msgid "Pick a color"
+msgstr "Выбрать цвет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 минут"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
+#: filter/libfilter-i18n.h:18
+msgid "Priority"
+msgstr "Приоритет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 минут"
+msgid "Remind me of all appointments"
+msgstr "Напоминать обо всех встречах"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 минут"
+msgid "Reminders"
+msgstr "Напоминания"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 минут"
+#: calendar/gui/gnome-month-item.c:742
+msgid "Sat"
+msgstr "Суб"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 минут"
+msgid "Show"
+msgstr "Показать"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
-msgid "Date navigator options"
-msgstr "Параметры навигатора дат"
+msgid "Show appointment end times"
+msgstr "Показать время окончании встречи"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
 msgid "Show week numbers"
 msgstr "Показать номера недель"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
-msgid "Calendar"
-msgstr "Календарь"
+msgid "Start of day:"
+msgstr "Начало дня:"
 
+#. Initialize by default to three-letter day names
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
-msgid "Show"
-msgstr "Показать"
+#: calendar/gui/gnome-month-item.c:736
+msgid "Sun"
+msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Условленная дата"
+msgid "TaskPad"
+msgstr "Панель заданий"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
+#: calendar/gui/gnome-month-item.c:740
+msgid "Thu"
+msgstr "Чтв"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
 msgid "Time Until Due"
 msgstr "Время до условленного"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
-msgid "Priority"
-msgstr "Приоритет"
-
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-msgid "Highlight"
-msgstr "Подсвеченные дни:"
+msgid "Time divisions:"
+msgstr "Разделители времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
-msgid "Overdue Items"
-msgstr "Просроченные задания"
+msgid "Time format:"
+msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
-msgid "Items Due Today"
-msgstr "Задания установленные на сегодня"
+#: calendar/gui/gnome-month-item.c:738
+msgid "Tue"
+msgstr "Втр"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
-msgid "Items Not Yet Due"
-msgstr "Еще не просроченные задания"
+msgid "Visual Alarms"
+msgstr "Видимые таймеры"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Цвета"
+#: calendar/gui/gnome-month-item.c:739
+msgid "Wed"
+msgstr "Срд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
-msgid "Pick a color"
-msgstr "Выбрать цвет"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
-msgid "Items Not Yet Due:"
-msgstr "Еще не просроченные задания:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
-msgid "Items Due Today:"
-msgstr "Задания установленные на сегодня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
-msgid "Overdue Items:"
-msgstr "Просроченные задания:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
-msgid "TaskPad"
-msgstr "Панель заданий"
-
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Исх.значения"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
-msgid "Remind me of all appointments"
-msgstr "Напоминать обо всех встречах"
+msgid "Work week"
+msgstr "Рабочая неделя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "minutes before they occur."
 msgstr "минут до назначенного времени."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
-msgid "Visual Alarms"
-msgstr "Видимые таймеры"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
-msgid "Beep when alarm windows appear."
-msgstr "Гудок при возникновении окна таймера."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
-msgid "Audio Alarms"
-msgstr "Аудио Таймеры"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
-msgid "Alarms timeout after"
-msgstr "Задержка таймера на"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "seconds."
 msgstr "секунд."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
-msgid "Enable snoozing for"
-msgstr "Разрешить краткий сон для "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
-msgid "Reminders"
-msgstr "Напоминания"
-
 #: calendar/gui/dialogs/task-editor.c:655
 msgid "Edit Task"
 msgstr "Правка задания"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:307
+#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:313
+#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:316
+#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:319
+#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
-msgid "task-editor-dialog"
-msgstr "диалог редактора заданий"
+msgid "% Comp_lete:"
+msgstr "% Выполнения:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
-msgid "S_ummary"
-msgstr "Итог"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
-msgid "Sta_rt Date:"
-msgstr "Дата начала:"
+msgid "C_lassification:"
+msgstr "Классификация:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
-msgid "_Due Date:"
-msgstr "Условленная дата:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "% Comp_lete:"
-msgstr "% Выполнения:"
+msgid "Date Completed:"
+msgstr "Дата выполнения:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
-msgid "_Status:"
-msgstr "Состояние:"
+msgid "S_ummary"
+msgstr "Итог"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Не начато"
+msgid "Sta_rt Date:"
+msgstr "Дата начала:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "В работе"
+msgid "Task"
+msgstr "Задание"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Выполнено"
+msgid "URL:"
+msgstr "URL:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Отменено"
+msgid "_Contacts..."
+msgstr "Контакты..."
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
-msgid "_Priority:"
-msgstr "Приоритет:"
+msgid "_Due Date:"
+msgstr "Условленная дата:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Высокий"
+msgid "_Priority:"
+msgstr "Приоритет:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Обычный"
+msgid "_Status:"
+msgstr "Состояние:"
 
 #: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Низкий"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
-msgid "C_lassification:"
-msgstr "Классификация:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Нет"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
-msgid "_Contacts..."
-msgstr "Контакты..."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
-msgid "Task"
-msgstr "Задание"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
-msgid "Date Completed:"
-msgstr "Дата выполнения:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
-msgid "URL:"
-msgstr "URL:"
+msgid "task-editor-dialog"
+msgstr "диалог редактора заданий"
 
 #: calendar/gui/e-calendar-table.c:294
 msgid "Open..."
@@ -2023,12 +1672,9 @@ msgid "Mark the task complete"
 msgstr "Пометить задание как выполненное"
 
 #: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/event-editor-dialog.glade.h:66 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
-#: mail/folder-browser.c:476 mail/mail-config-druid.glade.h:35
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-config.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
+#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
 #: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
 #: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
 msgid "Delete"
@@ -2045,50 +1691,50 @@ 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:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
 #: calendar/gui/e-week-view-main-item.c:325
 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:265 calendar/gui/e-day-view.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
 #: calendar/gui/e-week-view-main-item.c:334
 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:269 calendar/gui/e-day-view.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
+#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
+#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
+#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
 #: ui/evolution-event-editor.xml.h:21
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
@@ -2099,32 +1745,64 @@ msgstr "Удалить все случаи"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:301
+#: calendar/gui/event-editor.c:310
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/event-editor.c:346
+#: calendar/gui/event-editor.c:365
 msgid "on"
 msgstr "в"
 
-#: calendar/gui/event-editor.c:367 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
 #: filter/filter-datespec.c:65
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/event-editor.c:417
+#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
+msgid "Monday"
+msgstr "Понедельник"
+
+#: calendar/gui/event-editor.c:391
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: calendar/gui/event-editor.c:392
+msgid "Wednesday"
+msgstr "Среда"
+
+#: calendar/gui/event-editor.c:393
+msgid "Thursday"
+msgstr "Четверг"
+
+#: calendar/gui/event-editor.c:394
+msgid "Friday"
+msgstr "Пятница"
+
+#: calendar/gui/event-editor.c:395
+msgid "Saturday"
+msgstr "Суббота"
+
+#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
+msgid "Sunday"
+msgstr "Воскресенье"
+
+#: calendar/gui/event-editor.c:514
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:424
+#: calendar/gui/event-editor.c:521
 msgid "th"
 msgstr "ый"
 
-#: calendar/gui/event-editor.c:547
-msgid "ocurrences"
+#: calendar/gui/event-editor.c:675
+msgid "occurrences"
 msgstr "случаи"
 
-#: calendar/gui/event-editor.c:2481 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:792
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Эта встреча имеет правила повторения, которые не могут быть отредактированы в Evolution."
+
+#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
@@ -2147,53 +1825,43 @@ msgstr "%a %b %d %Y"
 #. * DO NOT compile it as part of your application.
 #.
 #: calendar/gui/event-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:93
 msgid "event-editor-dialog"
 msgstr "диалог редактора событий"
 
 #: calendar/gui/event-editor-dialog.glade.h:8
 #: calendar/gui/event-editor-dialog.glade.h:38
-#: calendar/gui/event-editor-dialog.glade.h:79
 msgid "Su_mmary:"
 msgstr "Итог:"
 
 #: calendar/gui/event-editor-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:83
 msgid "Time"
 msgstr "Время"
 
 #: calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:91
 msgid "_Start time:"
 msgstr "Время начала:"
 
 #: calendar/gui/event-editor-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:87
 msgid "_End time:"
 msgstr "Время окончания:"
 
 #: calendar/gui/event-editor-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:61
 msgid "A_ll day event"
 msgstr "Все события дня"
 
 #: calendar/gui/event-editor-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:64
 msgid "Classification"
 msgstr "Классификация"
 
 #: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:74
 msgid "Pu_blic"
 msgstr "Общее"
 
 #: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:73
 msgid "Pri_vate"
 msgstr "Личное"
 
 #: calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/event-editor-dialog.glade.h:85
 msgid "_Confidential"
 msgstr "Конфиденциальное"
 
@@ -2219,72 +1887,58 @@ msgid "Days"
 msgstr "Дни"
 
 #: calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/event-editor-dialog.glade.h:86
 msgid "_Display"
 msgstr "Отобразить"
 
 #: calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/event-editor-dialog.glade.h:89
 msgid "_Program"
 msgstr "Программа"
 
 #: calendar/gui/event-editor-dialog.glade.h:32
-#: calendar/gui/event-editor-dialog.glade.h:88
 msgid "_Mail"
 msgstr "Почта"
 
 #: calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/event-editor-dialog.glade.h:70
 msgid "Mail _to:"
 msgstr "Почта для:"
 
 #: calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/event-editor-dialog.glade.h:90
 msgid "_Run program:"
 msgstr "Запустить программу:"
 
 #: calendar/gui/event-editor-dialog.glade.h:35
-#: calendar/gui/event-editor-dialog.glade.h:84
 msgid "_Audio"
 msgstr "Аудио"
 
 #: calendar/gui/event-editor-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:77
 msgid "Reminder"
 msgstr "Напоминание"
 
 #: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:63
 msgid "Appointment Basics"
 msgstr "Основания встречи"
 
 #: calendar/gui/event-editor-dialog.glade.h:39
-#: calendar/gui/event-editor-dialog.glade.h:92
 msgid "_Starting date:"
 msgstr "Дата начала:"
 
 #: calendar/gui/event-editor-dialog.glade.h:40
-#: calendar/gui/event-editor-dialog.glade.h:76
 msgid "Recurrence Rule"
 msgstr "Правило повторения"
 
 #: calendar/gui/event-editor-dialog.glade.h:41
-#: calendar/gui/event-editor-dialog.glade.h:72
 msgid "No recurrence"
 msgstr "Без повторения"
 
 #: calendar/gui/event-editor-dialog.glade.h:42
-#: calendar/gui/event-editor-dialog.glade.h:78
 msgid "Simple recurrence"
 msgstr "Простое повторение"
 
 #: calendar/gui/event-editor-dialog.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:65
 msgid "Custom recurrence"
 msgstr "Другое повторение"
 
 #: calendar/gui/event-editor-dialog.glade.h:44
-#: calendar/gui/event-editor-dialog.glade.h:67
 msgid "Every"
 msgstr "Каждый"
 
@@ -2317,47 +1971,25 @@ msgid "forever"
 msgstr "всегда"
 
 #: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:68
 msgid "Exceptions"
 msgstr "Исключения"
 
 #: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:71
 msgid "Modify"
 msgstr "Изменить"
 
 #: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/event-editor-dialog.glade.h:94
 msgid "label21"
 msgstr "метка26"
 
 #: calendar/gui/event-editor-dialog.glade.h:57
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
-msgstr ""
-"Это встреча с пользовательскими правилами повторения, которые не могут быть "
-"исправлены в Evolution.\n"
-"\n"
-"Однако, встреча будет повторятся в подходящее время и будет правильно "
-"отображаться в окнах календаря."
+msgid "Preview"
+msgstr "Просмотр"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/event-editor-dialog.glade.h:75
+#: calendar/gui/event-editor-dialog.glade.h:58
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution."
-msgstr ""
-"Эта встреча имеет установленные пользователем правила повторения, которые не "
-"могут быть отредактированы в Evolution."
-
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "январь"
@@ -2592,28 +2224,28 @@ msgstr "Приоритет:"
 msgid "Item Comments:"
 msgstr "Комментарии элемента:"
 
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
+#: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
 msgstr "Напоминание о вашей встрече в "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Невозможно загрузить календарь в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Не удалось создать календарь в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
 #: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ок"
@@ -3596,11 +3228,11 @@ msgid "attachment"
 msgstr "вложение"
 
 #: composer/e-msg-composer-attachment-bar.c:397
+#: ui/evolution-message-composer.xml.h:8
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Удалить"
@@ -3618,25 +3250,22 @@ msgid "Attach a file to the message"
 msgstr "Присоединить файл к сообщению"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
 #: composer/e-msg-composer-attachment.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:11
 msgid "Attachment properties"
 msgstr "Свойства вложения"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-#: composer/e-msg-composer-attachment.glade.h:14
-msgid "MIME type:"
-msgstr "Тип MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
-#: composer/e-msg-composer-attachment.glade.h:13
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "File name:"
 msgstr "Имя файла:"
 
+#: composer/e-msg-composer-attachment.glade.h:10
+msgid "MIME type:"
+msgstr "Тип MIME:"
+
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
 #: mail/mail-format.c:599
 msgid "From:"
@@ -3686,7 +3315,7 @@ msgstr "Тема:"
 msgid "Enter the subject of the mail"
 msgstr "Введите тему письма"
 
-#: composer/e-msg-composer.c:332
+#: composer/e-msg-composer.c:426
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3695,38 +3324,38 @@ msgstr ""
 "Невозможно открыть файл подписи %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:488
+#: composer/e-msg-composer.c:593
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:604
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:624
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:541
+#: composer/e-msg-composer.c:646
 msgid "Saving changes to message..."
 msgstr "Сохранить изменения в сообщении..."
 
-#: composer/e-msg-composer.c:543
+#: composer/e-msg-composer.c:648
 msgid "Save changes to message..."
 msgstr "Сохранить изменения в сообщении..."
 
-#: composer/e-msg-composer.c:584
+#: composer/e-msg-composer.c:689
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Ошибка сохранения сочинения в \"Черновиках\": %s"
 
-#: composer/e-msg-composer.c:628 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:733 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Эволюция"
 
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:739
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3736,27 +3365,27 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: composer/e-msg-composer.c:656
+#: composer/e-msg-composer.c:761
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:887
 msgid "That file does not exist."
 msgstr "Этот файл не существует."
 
-#: composer/e-msg-composer.c:792
+#: composer/e-msg-composer.c:897
 msgid "That is not a regular file."
 msgstr "Это не обычный файл."
 
-#: composer/e-msg-composer.c:802
+#: composer/e-msg-composer.c:907
 msgid "That file exists but is not readable."
 msgstr "Этот файл существует, но не читается."
 
-#: composer/e-msg-composer.c:812
+#: composer/e-msg-composer.c:917
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Файл выглядит доступным, но произошел сбой open(2)."
 
-#: composer/e-msg-composer.c:834
+#: composer/e-msg-composer.c:939
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3764,15 +3393,15 @@ msgstr ""
 "Файл очень большой (больше 100К).\n"
 "Вы уверены, что хотите вставить его?"
 
-#: composer/e-msg-composer.c:855
+#: composer/e-msg-composer.c:960
 msgid "An error occurred while reading the file."
 msgstr "При чтении файла возникла ошибка."
 
-#: composer/e-msg-composer.c:1239
+#: composer/e-msg-composer.c:1337
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:1313
+#: composer/e-msg-composer.c:1411
 msgid "Could not create composer window."
 msgstr "Невозможно создать окно редактора."
 
@@ -3875,12 +3504,7 @@ msgstr "Добавить правило фильтра"
 msgid "Edit Filter Rule"
 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.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
+#: filter/filter-editor.c:456 filter/filter.glade.h:10
 msgid "Edit Filters"
 msgstr "Правка фильтров"
 
@@ -3962,34 +3586,24 @@ msgstr "Добавить критерий"
 msgid "Remove criterion"
 msgstr "Удалить критерий"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Входящие\n"
-"Исходящие\n"
-
-#: filter/filter.glade.h:11 filter/filter.glade.h:31
-msgid "Filter Rules"
-msgstr "Правила фильтра"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
-#: mail/folder-browser.c:463 mail/mail-config-druid.glade.h:38
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23 mail/mail-config.glade.h:32
+#: filter/filter.glade.h:9 mail/folder-browser.c:463
+#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
 msgid "Edit"
 msgstr "Правка"
 
-#: filter/filter.glade.h:15 filter/filter.glade.h:30
+#: filter/filter.glade.h:11
 msgid "Edit VFolders"
 msgstr "Правка вирт.папок"
 
-#: filter/filter.glade.h:16 filter/filter.glade.h:33
+#: filter/filter.glade.h:12
+msgid "Filter Rules"
+msgstr "Правила фильтра"
+
+#: filter/filter.glade.h:14
 msgid "Virtual Folders"
 msgstr "Виртуальные папки"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
+#: filter/filter.glade.h:15
 msgid "vFolder Sources"
 msgstr "Источники вирт.папки"
 
@@ -4211,6 +3825,7 @@ msgid "Cannot register storage with shell"
 msgstr ""
 
 #: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save"
 msgstr "Сохранить"
 
@@ -4262,7 +3877,7 @@ msgstr "Фильтр по получателю"
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:462
+#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
 msgid "Open"
 msgstr "Открыть"
 
@@ -4442,32 +4057,31 @@ msgstr "Полное имя:"
 msgid "Email address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
+#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
 msgid "Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
+#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:42
+#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
 msgid "Signature File"
 msgstr "Файл подписи"
 
-#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
+#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
 msgid "Path:"
 msgstr "Путь:"
 
-#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
 msgid "Authentication:"
 msgstr "Идентификация:"
 
@@ -4475,11 +4089,11 @@ msgstr "Идентификация:"
 msgid "Detect supported types..."
 msgstr "Определить поддерживаемые типы..."
 
-#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
+#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
 msgid "Don't delete messages from server"
 msgstr "Не удалять сообщения с сервера"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
+#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
 msgid "Test Settings"
 msgstr "Установки теста"
 
@@ -4572,137 +4186,107 @@ msgid "Query authorization at \"%s\""
 msgstr "Запрос авторизации от \"%s\""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
-msgid "Mail Configuration"
-msgstr "Настройка почты"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Добро пожаловать к помощнику по настройке почты в Evolution!\n"
-"Введя некоторую информацию о ваших почтовых настройках\n"
-"вы сможете начать посылать и принимать почту.\n"
-"Для продолжения нажмите \"След.\"."
-
-#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
-msgid "Identity"
-msgstr "Именование"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Источник почты"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:35
-msgid "Mail Transport"
-msgstr "Передача почты"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Настройка вашей почты завершена.\n"
-"Нажмите \"Завершить\", чтобы сохранить новые установки."
-
-#: mail/mail-config-druid.glade.h:19
+#: mail/mail-config-druid.glade.h:7
 msgid "Account Information"
 msgstr "Учетная информация"
 
-#: mail/mail-config-druid.glade.h:20
+#: mail/mail-config-druid.glade.h:8
 msgid "Account Management"
 msgstr "Управление счетом"
 
-#: mail/mail-config-druid.glade.h:21
+#: mail/mail-config-druid.glade.h:9
 msgid "Accounts"
 msgstr "Счета"
 
-#: mail/mail-config-druid.glade.h:23
+#: mail/mail-config-druid.glade.h:11
 msgid "Add Optional Fields..."
 msgstr "Добавить необязательные поля..."
 
-#: mail/mail-config-druid.glade.h:24
+#: mail/mail-config-druid.glade.h:12
 msgid "Additional Identity Fields"
 msgstr "Дополнительные поля сущности"
 
-#: mail/mail-config-druid.glade.h:25
+#: mail/mail-config-druid.glade.h:13
 msgid "Authentication"
 msgstr "Идентификация"
 
-#: mail/mail-config-druid.glade.h:27
+#: mail/mail-config-druid.glade.h:15
 msgid "Browse..."
 msgstr "Просмотр..."
 
-#: mail/mail-config-druid.glade.h:28
+#: mail/mail-config-druid.glade.h:16
 msgid "Congratulations, your mail configuration is complete."
 msgstr "Поздравляем, настройка вашей почты завершена."
 
-#: mail/mail-config-druid.glade.h:34
+#: mail/mail-config-druid.glade.h:22
 msgid "Default"
 msgstr "Исх.значение"
 
-#: mail/mail-config-druid.glade.h:37
+#: mail/mail-config-druid.glade.h:25
 msgid "Done"
 msgstr "Сделано"
 
-#: mail/mail-config-druid.glade.h:39
+#: mail/mail-config-druid.glade.h:27
 msgid "Edit Mail Configuration Settings"
 msgstr "Правка настроек почты"
 
-#: mail/mail-config-druid.glade.h:40
+#: mail/mail-config-druid.glade.h:28
 msgid "Email Address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config-druid.glade.h:41
+#: mail/mail-config-druid.glade.h:29
 msgid "Evolution Mail Configuration"
 msgstr "Настройка почты Evolution"
 
-#: mail/mail-config-druid.glade.h:42
+#: mail/mail-config-druid.glade.h:30
 msgid "Full Name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config-druid.glade.h:43
+#: mail/mail-config-druid.glade.h:31
 msgid "IMAP"
 msgstr "IMAP"
 
-#: mail/mail-config-druid.glade.h:45
+#: mail/mail-config-druid.glade.h:32
+msgid "Identity"
+msgstr "Именование"
+
+#: mail/mail-config-druid.glade.h:33
 msgid "Mail"
 msgstr "Почта"
 
-#: mail/mail-config-druid.glade.h:47
+#: mail/mail-config-druid.glade.h:34
+msgid "Mail Configuration"
+msgstr "Настройка почты"
+
+#: mail/mail-config-druid.glade.h:35
 msgid "Mail Configuration Druid"
 msgstr "Мастер настройки почты"
 
-#: mail/mail-config-druid.glade.h:48
+#: mail/mail-config-druid.glade.h:36
 msgid "Make this my default account"
 msgstr "Сделать счетом по умолчанию"
 
-#: mail/mail-config-druid.glade.h:50
+#: mail/mail-config-druid.glade.h:38
 msgid "News"
 msgstr "Новые"
 
-#: mail/mail-config-druid.glade.h:51
+#: mail/mail-config-druid.glade.h:39
 msgid "Optional"
 msgstr "Необязательные"
 
-#: mail/mail-config-druid.glade.h:52
+#: mail/mail-config-druid.glade.h:40
 msgid "Optional Information"
 msgstr "Необязательная информация"
 
-#: mail/mail-config-druid.glade.h:54
+#: mail/mail-config-druid.glade.h:42
 msgid "Password:"
 msgstr "Пароль:"
 
-#: mail/mail-config-druid.glade.h:56
+#: mail/mail-config-druid.glade.h:44
 msgid ""
 "Please enter information about your incoming mail server below. If you don't "
 "know what"
@@ -4710,7 +4294,7 @@ msgstr ""
 "Пожалуйста, введите ниже информацию о вашем сервере входящей почты. Если вы "
 "не знаете что"
 
-#: mail/mail-config-druid.glade.h:58
+#: mail/mail-config-druid.glade.h:46
 msgid ""
 "Please enter information about your outgoing mail protocol below. If you "
 "don't know "
@@ -4718,118 +4302,115 @@ msgstr ""
 "Пожалуйста, введите ниже информацию о протоколе отправки почты. Если вы не "
 "знаете "
 
-#: mail/mail-config-druid.glade.h:60
+#: mail/mail-config-druid.glade.h:48
 msgid ""
 "Please enter your name and email address below. The &quot;optional&quot; "
 "fields below do not "
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:62
+#: mail/mail-config-druid.glade.h:50
 msgid "Preferred type: "
 msgstr "Предпочтительный тип:"
 
-#: mail/mail-config-druid.glade.h:63
+#: mail/mail-config-druid.glade.h:51
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config-druid.glade.h:64
+#: mail/mail-config-druid.glade.h:52
 msgid "Receiving Mail"
 msgstr "Получение почты"
 
-#: mail/mail-config-druid.glade.h:65
+#: mail/mail-config-druid.glade.h:53
 msgid "Remember my password"
 msgstr "Запомнить пароль"
 
-#: mail/mail-config-druid.glade.h:66
+#: mail/mail-config-druid.glade.h:54
 msgid "Reply-to:"
 msgstr "Ответить:"
 
-#: mail/mail-config-druid.glade.h:67
+#: mail/mail-config-druid.glade.h:55
 msgid "Required"
 msgstr "Требуемые"
 
-#: mail/mail-config-druid.glade.h:68
+#: mail/mail-config-druid.glade.h:56
 msgid "SMTP"
 msgstr "SMTP"
 
-#: mail/mail-config-druid.glade.h:69
+#: mail/mail-config-druid.glade.h:57
 msgid "SMTP server requires authentication"
 msgstr "SMTP сервер требует идентификации"
 
-#: mail/mail-config-druid.glade.h:70
+#: mail/mail-config-druid.glade.h:58
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config-druid.glade.h:71
+#: mail/mail-config-druid.glade.h:59
 msgid "Sending Mail"
 msgstr "Отправка почты"
 
-#: mail/mail-config-druid.glade.h:72
+#: mail/mail-config-druid.glade.h:60
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config-druid.glade.h:73
+#: mail/mail-config-druid.glade.h:61
 msgid "Server Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:43
+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
 msgid "Sources"
 msgstr "Источники"
 
-#: mail/mail-config-druid.glade.h:80
+#: mail/mail-config-druid.glade.h:68
 msgid "Welcome to the Evolution Mail Configuration Druid! "
 msgstr "Добро пожаловать к мастеру настройки почты Evolution!"
 
-#: mail/mail-config-druid.glade.h:86
+#: mail/mail-config-druid.glade.h:74
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:90
+#: mail/mail-config-druid.glade.h:78
 msgid "Your mail server supports the following types of authentication. Please"
 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.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:33
-msgid "Identities"
-msgstr "Именования"
-
-#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:8
 msgid "Address"
 msgstr "Адрес"
 
-#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
-msgid "Organization"
-msgstr "Организация"
+#: mail/mail-config.glade.h:11
+msgid "Identities"
+msgstr "Именования"
 
-#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:12
 msgid "Mail Sources"
 msgstr "Источники почты"
 
-#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:13
+msgid "Mail Transport"
+msgstr "Передача почты"
+
+#: mail/mail-config.glade.h:14
+msgid "Mark message as seen [ms]: "
+msgstr "Отметить сообщение как просмотренное [мс]:"
+
+#: mail/mail-config.glade.h:15
 msgid "News Servers"
 msgstr "Серверы новостей"
 
-#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:16
 msgid "News Sources"
 msgstr "Источники новостей"
 
-#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:17
+msgid "Organization"
+msgstr "Организация"
+
+#: mail/mail-config.glade.h:19
 msgid "Send messages in HTML format"
 msgstr "Отправить почту в формате HTML"
 
-#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
-msgid "Mark message as seen [ms]: "
-msgstr "Отметить сообщение как просмотренное [мс]:"
-
 #: mail/mail-crypto.c:136
 #, c-format
 msgid "Couldn't create pipe to %s: %s"
@@ -5042,236 +4623,236 @@ msgstr "Фильтрация почты по запросу"
 msgid "Filter email on demand"
 msgstr "Фильтр почты по запросу"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:503
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:508
 msgid "Sending a message without a subject"
 msgstr "Отправка сообщения без темы"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:511
 #, c-format
 msgid "Send \"%s\""
 msgstr "Послать \"%s\""
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:514
 msgid "Send a message without a subject"
 msgstr "Послать сообщение без темы"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:685
 msgid "Sending queue"
 msgstr "Отправка очереди"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:687
 msgid "Send queue"
 msgstr "Отправить очередь"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:823 mail/mail-ops.c:830
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Присоединение \"%s\""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:827 mail/mail-ops.c:833
 msgid "Appending a message without a subject"
 msgstr "Присоединение сообщения без темы"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:905
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Вычеркивание \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:907
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Вычеркнуть \"%s\""
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:966
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:968
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:971
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:973
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1004
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1007
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1027
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1106
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Помечание сообщений в папке \"%s\""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1109
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Пометить сообщения в папке \"%s\""
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1140
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Помечание сообщений в папке %d из %d"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1263
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1265
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Считать папки в \"%s\""
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1334 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1395
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Присоединение сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1398
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Присоединить сообщения из \"%s\""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1501
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Пересылка сообщений \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1506
 msgid "Forwarding a message without a subject"
 msgstr "Пересылка сообщения без темы"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1509
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслать сообщение \"%s\""
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1514
 msgid "Forward a message without a subject"
 msgstr "Переслать сообщение без темы"
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1551
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1565
+#: mail/mail-ops.c:1568
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Не удалось создать mime-часть из сообщения при создании пересылаемого "
 "сообщения."
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1654
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Загрузка \"%s\""
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1656
 #, c-format
 msgid "Load \"%s\""
 msgstr "Загрузить \"%s\""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1758
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Создание \"%s\""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1760
 #, c-format
 msgid "Create \"%s\""
 msgstr "Создать \"%s\""
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1808
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1854
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхронизация \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1856
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхронизовать \"%s\""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1920
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:1923
 msgid "Clearing message display"
 msgstr "Очистка отображения сообщения"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:1926
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Показать UID сообщения \"%s\""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:1929
 msgid "Clear message display"
 msgstr "Очистить отображение сообщения"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2042
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Открытие сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Открыть сообщения из \"%s\""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2149
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Загрузка папки %s"
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2151
 #, c-format
 msgid "Load %s Folder"
 msgstr "Загрузить папку %s"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2218
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Просмотр сообщений из папки \"%s\""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Просмотреть сообщения из  \"%s\""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2247
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Перемещение сообщения %d из %d (uid  \"%s\")"
@@ -5423,11 +5004,11 @@ msgstr "Удалить это сообщение"
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:2043
+#: mail/message-list.c:2045
 msgid "Rebuilding message view"
 msgstr "Перестроение окна сообщения"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:2047
 msgid "Rebuild message view"
 msgstr "Перестроить окно сообщения"
 
@@ -5453,25 +5034,25 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписывание на папку \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:286
 #, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr "Подписать на папку \"%s\""
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:387
+#: mail/subscribe-dialog.c:290
 #, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr ""
+msgid "Subscribe to folder \"%s\""
+msgstr "Подписать на папку \"%s\""
 
-#: mail/subscribe-dialog.c:390
+#: mail/subscribe-dialog.c:293
 #, c-format
-msgid "Unsubscribe to folder \"%s\""
-msgstr ""
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Отписаться от папки \"%s\""
 
 #: shell/e-setup.c:110 shell/e-setup.c:179
 msgid "Evolution installation"
@@ -5621,7 +5202,12 @@ msgstr "(Папки не показаны)"
 msgid "Folders"
 msgstr "Папки"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1002 widgets/misc/e-dateedit.c:212
+#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+msgid "None"
+msgstr "Нет"
+
+#: shell/e-shell-view.c:1006
 #, c-format
 msgid "Evolution - %s"
 msgstr "Эволюция - %s"
@@ -5758,7 +5344,7 @@ msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
 #: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Просмотр"
 
@@ -5971,7 +5557,7 @@ msgid "Print this calendar"
 msgstr "Напечатать этот календарь"
 
 #: ui/evolution-calendar.xml.h:26
-msgid "Save calendar As something else"
+msgid "Save calendar as something else"
 msgstr "Сохранить календарь как что-нибудь еще"
 
 #: ui/evolution-calendar.xml.h:27
@@ -5998,7 +5584,7 @@ msgstr "Сегодня"
 msgid "Week"
 msgstr "Неделя"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:33
+#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
 msgid "_New"
 msgstr "Новый"
 
@@ -6047,6 +5633,7 @@ msgid "Print..."
 msgstr "Печать..."
 
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save _As..."
 msgstr "Сохранить как..."
 
@@ -6058,20 +5645,30 @@ msgstr "Сохранить и закрыть"
 msgid "Save the contact and close the dialog box"
 msgstr "Сохранить задание и закрыть окно диалога"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:99
+#: ui/evolution-contact-editor.xml.h:17
+msgid "Se_nd contact to other..."
+msgstr "Послать контакт другому..."
+
+#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
 msgid "See online help"
 msgstr "Просмотр онлайновой справки"
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-subscribe.xml.h:17 ui/evolution.xml.h:27
+#: ui/evolution-contact-editor.xml.h:19
+msgid "Send _message to contact..."
+msgstr "Послать сообщение к контакту..."
+
+#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
+#: ui/evolution.xml.h:28
 msgid "_File"
 msgstr "Файл"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:21
 msgid "_Print..."
 msgstr "Печать..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Save"
 msgstr "Сохранить"
 
@@ -6308,7 +5905,7 @@ msgstr "FIXME: Непрочитанный элемент"
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67
+#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
 msgid "F_ormat"
 msgstr "Формат"
 
@@ -6384,7 +5981,7 @@ msgstr "Заменить строку"
 msgid "Save the appointment and close the dialog box"
 msgstr "Сохранить встречу и закрыть окно диалога"
 
-#: ui/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
 msgid "Save the current file"
 msgstr "Сохранить текущий файл"
 
@@ -6428,11 +6025,11 @@ msgstr "Откат"
 msgid "Undo the last action"
 msgstr "Отменить последнее действие"
 
-#: ui/evolution-event-editor.xml.h:105
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
 msgid "_About..."
 msgstr "О программе..."
 
-#: ui/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
 msgid "_Close"
 msgstr "Закрыть"
 
@@ -6440,12 +6037,12 @@ msgstr "Закрыть"
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: ui/evolution-event-editor.xml.h:108
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
 msgid "_Debug"
 msgstr "Отладка"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:26
+#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
+#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
 msgid "_Edit"
 msgstr "Правка"
 
@@ -6457,7 +6054,8 @@ msgstr "Найти..."
 msgid "_Forms"
 msgstr "Формы"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution.xml.h:30
+#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
+#: ui/evolution.xml.h:31
 msgid "_Help"
 msgstr "Справка"
 
@@ -6675,6 +6273,111 @@ msgstr "Редактор виртуальных папок..."
 #. * Add this file to your project's POTFILES.in
 #. * DO NOT compile it as part of your application.
 #.
+#: ui/evolution-message-composer.xml.h:7
+msgid "Attach"
+msgstr "Присоединить"
+
+#: ui/evolution-message-composer.xml.h:9
+msgid "Bold"
+msgstr "Полужирное"
+
+#: ui/evolution-message-composer.xml.h:11
+msgid "Close the current file"
+msgstr "Закрыть текущий файл"
+
+#: ui/evolution-message-composer.xml.h:13
+msgid "HTML"
+msgstr "HTML"
+
+#: ui/evolution-message-composer.xml.h:14
+msgid "Insert a file as text into the message"
+msgstr "Вставить файл как текст в сообщение"
+
+#: ui/evolution-message-composer.xml.h:15
+msgid "Insert text file..."
+msgstr "Вставить текстовый файл..."
+
+#: ui/evolution-message-composer.xml.h:17
+msgid "Open a file"
+msgstr "Открыть файл"
+
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save As"
+msgstr "Сохранить как"
+
+#: ui/evolution-message-composer.xml.h:21
+msgid "Save in _folder... (FIXME)"
+msgstr "Сохранить в папке... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save in folder..."
+msgstr "Сохранить в папке..."
+
+#: ui/evolution-message-composer.xml.h:24
+msgid "Save the current file with a different name"
+msgstr "Сохранить текущий файл под другим именем"
+
+#: ui/evolution-message-composer.xml.h:25
+msgid "Save the message in a specified folder"
+msgstr "Сохранить сообщение в указанной папке"
+
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send"
+msgstr "Отправить"
+
+#: ui/evolution-message-composer.xml.h:27
+msgid "Send _Later"
+msgstr "Отправить позже"
+
+#: ui/evolution-message-composer.xml.h:28
+msgid "Send _later"
+msgstr "Отправить позже"
+
+#: ui/evolution-message-composer.xml.h:29
+msgid "Send the mail in HTML format"
+msgstr "Отправить почту в формате HTML"
+
+#: ui/evolution-message-composer.xml.h:30
+msgid "Send the message later"
+msgstr "Отправить сообщение позже"
+
+#: ui/evolution-message-composer.xml.h:31
+msgid "Send the message now"
+msgstr "Отправить сообщение сейчас"
+
+#: ui/evolution-message-composer.xml.h:32
+msgid "Send this message now"
+msgstr "Отправить это сообщение сейчас"
+
+#: ui/evolution-message-composer.xml.h:33
+msgid "Sets something as bold"
+msgstr "Установить что-то в полужирное"
+
+#: ui/evolution-message-composer.xml.h:34
+msgid "Show / hide attachments"
+msgstr "Показать/Скрыть вложения"
+
+#: ui/evolution-message-composer.xml.h:35
+msgid "Show _attachments"
+msgstr "Показать вложения"
+
+#: ui/evolution-message-composer.xml.h:36
+msgid "Show attachments"
+msgstr "Показать вложения"
+
+#: ui/evolution-message-composer.xml.h:43
+msgid "_Insert text file... (FIXME)"
+msgstr "Вставить текстовый файл... (FIXME)"
+
+#: ui/evolution-message-composer.xml.h:44
+msgid "_Open..."
+msgstr "Открыть..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * Add this file to your project's POTFILES.in
+#. * DO NOT compile it as part of your application.
+#.
 #: ui/evolution-subscribe.xml.h:7
 msgid "Add folder to your list of subscribed folders"
 msgstr "Добавить папку к вашему списку папок подписок"
@@ -6741,69 +6444,69 @@ msgid "Show the _Shortcut Bar"
 msgstr "Показать строку закладок"
 
 #: ui/evolution.xml.h:16
+msgid "Submit _Bug Report"
+msgstr "Отправить сообщение об ошибке"
+
+#: ui/evolution.xml.h:17
 msgid "Submit bug report using Bug Buddy"
 msgstr "Отправить сообщение об ошибке используя Bug Buddy"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Toggle whether to show the folder bar"
 msgstr "Переключить отображение строки папок"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Переключить отображение строки закладок"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Using the C_ontact Manager"
 msgstr "Использование диспетчера контактов"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Using the _Calendar"
 msgstr "Использование календаря"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Using the _Mailer"
 msgstr "Использование почты"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "_About Evolution..."
 msgstr "О программе..."
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "_Appointment (FIXME)"
 msgstr "Встреча (FIXME)"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "_Contact (FIXME)"
 msgstr "Контакт (FIXME)"
 
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:26
 msgid "_Create New Folder..."
 msgstr "Создать новую папку..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:29
 msgid "_Folder"
 msgstr "Папка"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:30
 msgid "_Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:32
 msgid "_Index"
 msgstr "Индекс"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
 msgid "_Mail message (FIXME)"
 msgstr "Почтовое сообщение (FIXME)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
 msgid "_Settings"
 msgstr "Установки"
 
-#: ui/evolution.xml.h:35
-msgid "_Submit Bug Report"
-msgstr "Отправить сообщение об ошибке"
-
 #: ui/evolution.xml.h:36
 msgid "_Task (FIXME)"
 msgstr "Задание (FIXME)"
author	Valek Frob <frob@src.gnome.org>	2000-11-14 19:07:22 +0800
committer	Valek Frob <frob@src.gnome.org>	2000-11-14 19:07:22 +0800
commit	a8a3c49fccc401f78d68142d0664c37a9ec951ac (patch)
tree	b82609a456d2a5820c7a212bcc90fdb0e144898e
parent	6f4d56f965f60497cfee2bcde5fee02cd1888f65 (diff)
download	gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.gz gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.bz2 gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.lz gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.xz gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.tar.zst gsoc2013-evolution-a8a3c49fccc401f78d68142d0664c37a9ec951ac.zip