Sync for 1.1.1.

svn path=/trunk/; revision=18024
author: Ettore Perazzoli <ettore@src.gnome.org> 2002-09-10 04:06:54 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2002-09-10 04:06:54 +0800
commit: ea4eeed27313b0ad0564422424c5dcb58bbbe842 (patch)
tree: 381990209d2b0c7b4609aca247c1d18575772a12 /po/ru.po
parent: 6db8b43826423d1f99f7647bafeb773fec3f1826 (diff)
download: gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.gz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.bz2
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.lz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.xz
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.zst
gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.zip
1 files changed, 1264 insertions, 1165 deletions
diff --git a/po/ru.po b/po/ru.po
index e90de44658..33aa002714 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2002-08-13 08:06-0400\n"
+"POT-Creation-Date: 2002-09-09 14:39-0400\n"
 "PO-Revision-Date: 2002-01-30 02:21+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -31,22 +31,22 @@ msgid "Imports VCard files into Evolution."
 msgstr "Импортирует файлы VCard в Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:335
+#: addressbook/gui/widgets/e-addressbook-view.c:356
 msgid "File As"
 msgstr "Подшить как"
 
-#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:74
+#: addressbook/backend/ebook/e-card-simple.c:61 mail/mail-config.glade.h:75
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Имя"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/gui/widgets/e-addressbook-view.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:358
 msgid "Email"
 msgstr "Эл.адрес"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/e-contact-editor.c:1751
 msgid "Primary"
 msgstr "Основной"
 
@@ -56,16 +56,16 @@ msgstr "Осн."
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1729
-#: addressbook/gui/widgets/e-addressbook-view.c:369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1736
+#: addressbook/gui/widgets/e-addressbook-view.c:390
 msgid "Assistant"
 msgstr "Помощник"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1730
-#: addressbook/gui/contact-editor/e-contact-editor.c:1797
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
 msgid "Business"
 msgstr "Рабочий"
 
@@ -75,12 +75,12 @@ msgid "Bus"
 msgstr "Раб."
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1733
+#: addressbook/gui/contact-editor/e-contact-editor.c:1740
 msgid "Callback"
 msgstr "Обратный звонок"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1735
+#: addressbook/gui/contact-editor/e-contact-editor.c:1742
 msgid "Company"
 msgstr "Компания"
 
@@ -91,13 +91,13 @@ msgstr "Комп."
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1736
-#: addressbook/gui/contact-editor/e-contact-editor.c:1798
+#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1805
 msgid "Home"
 msgstr "Домашний"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.c:344
+#: addressbook/gui/widgets/e-addressbook-view.c:365
 msgid "Organization"
 msgstr "Организация"
 
@@ -107,19 +107,19 @@ msgstr "Орг."
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: addressbook/gui/contact-editor/e-contact-editor.c:1747
 msgid "Mobile"
 msgstr "Мобильный"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1734
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Car"
 msgstr "Автомобиль"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1732
-#: addressbook/gui/widgets/e-addressbook-view.c:349
+#: addressbook/gui/contact-editor/e-contact-editor.c:1739
+#: addressbook/gui/widgets/e-addressbook-view.c:370
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
@@ -128,13 +128,13 @@ msgid "Bus Fax"
 msgstr "Раб. факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
-#: addressbook/gui/widgets/e-addressbook-view.c:350
+#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/widgets/e-addressbook-view.c:371
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1731
+#: addressbook/gui/contact-editor/e-contact-editor.c:1738
 msgid "Business 2"
 msgstr "Рабочий 2"
 
@@ -143,68 +143,68 @@ msgid "Bus 2"
 msgstr "Раб. 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1744
 msgid "Home 2"
 msgstr "Домашний 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-#: addressbook/gui/widgets/e-addressbook-view.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/widgets/e-addressbook-view.c:374
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-#: addressbook/gui/contact-editor/e-contact-editor.c:1799
+#: addressbook/gui/contact-editor/e-contact-editor.c:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1806
 msgid "Other"
 msgstr "Другие"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/widgets/e-addressbook-view.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/widgets/e-addressbook-view.c:376
 msgid "Other Fax"
 msgstr "Другой факс"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-#: addressbook/gui/widgets/e-addressbook-view.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/widgets/e-addressbook-view.c:377
 msgid "Pager"
 msgstr "Пэйджер"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-#: addressbook/gui/widgets/e-addressbook-view.c:357
+#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/widgets/e-addressbook-view.c:378
 msgid "Radio"
 msgstr "Радио"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.c:358
+#: addressbook/gui/contact-editor/e-contact-editor.c:1753
+#: addressbook/gui/widgets/e-addressbook-view.c:379
 msgid "Telex"
 msgstr "Телекс"
 
 #: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.c:359
+#: addressbook/gui/widgets/e-addressbook-view.c:380
 msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1772
-#: addressbook/gui/widgets/e-addressbook-view.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:1779
+#: addressbook/gui/widgets/e-addressbook-view.c:382
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
 #: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1773
-#: addressbook/gui/widgets/e-addressbook-view.c:362
+#: addressbook/gui/contact-editor/e-contact-editor.c:1780
+#: addressbook/gui/widgets/e-addressbook-view.c:383
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
 #: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:384
 msgid "Web Site"
 msgstr "Сайт в Интернете"
 
@@ -213,7 +213,7 @@ msgid "Url"
 msgstr "URL"
 
 #: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:364
+#: addressbook/gui/widgets/e-addressbook-view.c:385
 msgid "Department"
 msgstr "Отдел"
 
@@ -222,7 +222,7 @@ msgid "Dep"
 msgstr "Отд."
 
 #: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:386
 msgid "Office"
 msgstr "Офис"
 
@@ -231,12 +231,12 @@ msgid "Off"
 msgstr "Офис"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:366
+#: addressbook/gui/widgets/e-addressbook-view.c:387
 msgid "Title"
 msgstr "Заголовок"
 
 #: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.c:367
+#: addressbook/gui/widgets/e-addressbook-view.c:388
 msgid "Profession"
 msgstr "Профессия"
 
@@ -245,7 +245,7 @@ msgid "Prof"
 msgstr "Проф."
 
 #: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:368
+#: addressbook/gui/widgets/e-addressbook-view.c:389
 msgid "Manager"
 msgstr "Мeнеджер"
 
@@ -258,7 +258,7 @@ msgid "Ass"
 msgstr "Пом."
 
 #: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:370
+#: addressbook/gui/widgets/e-addressbook-view.c:391
 msgid "Nickname"
 msgstr "Псевдоним"
 
@@ -267,12 +267,12 @@ msgid "Nick"
 msgstr "Псевдоним"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.c:371
+#: addressbook/gui/widgets/e-addressbook-view.c:392
 msgid "Spouse"
 msgstr "Супруг(а)"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:372
+#: addressbook/gui/widgets/e-addressbook-view.c:393
 msgid "Note"
 msgstr "Заметка"
 
@@ -285,7 +285,7 @@ msgid "CALUri"
 msgstr "URIКал"
 
 #: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.c:373
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 msgid "Free-busy URL"
 msgstr "URL занятости"
 
@@ -336,7 +336,7 @@ msgstr "VCard для %s"
 #: addressbook/gui/component/addressbook-factory.c:50
 #: calendar/conduits/calendar/calendar-conduit.c:1727
 #: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:173 calendar/gui/main.c:67
+#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:67
 #: tools/evolution-addressbook-abuse.c:132
 #: tools/evolution-addressbook-export.c:60
 #: tools/evolution-addressbook-import.c:86
@@ -344,7 +344,7 @@ msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
 #: addressbook/backend/pas/pas-backend-file.c:356
-#: addressbook/backend/pas/pas-backend-ldap.c:2747
+#: addressbook/backend/pas/pas-backend-ldap.c:2968
 msgid "Searching..."
 msgstr "Поиск..."
 
@@ -352,39 +352,32 @@ msgstr "Поиск..."
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:381
-msgid "Error in search expression."
-msgstr "Ошибка в выражении."
+#: addressbook/backend/pas/pas-backend-ldap.c:677
+#, fuzzy
+msgid "Reconnecting to LDAP server..."
+msgstr "Подключение к серверу LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1138
+#: addressbook/backend/pas/pas-backend-ldap.c:1220
 msgid "Adding card to LDAP server..."
 msgstr "Создание карточки на сервере LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1241
+#: addressbook/backend/pas/pas-backend-ldap.c:1326
 msgid "Removing card from LDAP server..."
 msgstr "Удаление карточки с сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1477
+#: addressbook/backend/pas/pas-backend-ldap.c:1562
+#: addressbook/backend/pas/pas-backend-ldap.c:1565
 msgid "Modifying card from LDAP server..."
 msgstr "Изменение карточки на сервере LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2601
-msgid "Restarting search."
-msgstr "Перезапуск поиска."
-
-#: addressbook/backend/pas/pas-backend-ldap.c:2693
+#: addressbook/backend/pas/pas-backend-ldap.c:2879
 msgid "Receiving LDAP search results..."
 msgstr "Получение результатов поиска с сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2774
+#: addressbook/backend/pas/pas-backend-ldap.c:2988
 msgid "Error performing search"
 msgstr "Ошибка при выполнении поиска"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2798
-msgid "Could not parse query string"
-msgstr "Не удалось разобрать строку запроса"
-
 #: addressbook/conduit/address-conduit.c:293
 #, fuzzy
 msgid "Default Sync Address:"
@@ -432,49 +425,49 @@ msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr ""
 "Управляющий элемент, который отображает миникарточку адресной книги "
 "Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
 msgid "Directory Servers"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Компонент Evolution для просмотра миникарточек адресной книги"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
 msgid "Evolution component for handling contacts."
 msgstr "Компонент Evolution для обработки контактов."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 msgid "Factory for the Addressbook Minicard control"
 msgstr "Фабрика для управляющего элемента миникаторчки адресной книги."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
 msgid "Factory for the Addressbook's address displayer"
 msgstr "Фабрика для отображателя адреса из адресной книги"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
 msgid "Factory for the Addressbook's address popup"
 msgstr "Фабрика для всплывающего окна адреса из адресной книги"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
 msgid "Factory for the configuration controls for the Evolution Addressbook."
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
 msgid "Factory for the sample Addressbook control"
 msgstr "Фабрика для примера управляющего элемента адресной книги"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "This page can be used to configure access to LDAP directory servers"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:608
+#: addressbook/gui/component/addressbook-component.c:618
 #: calendar/gui/dialogs/comp-editor-util.c:310
 #: calendar/gui/dialogs/comp-editor-util.c:366
 #: importers/netscape-importer.c:1873 shell/e-local-storage.c:177
@@ -494,28 +487,28 @@ msgstr "Сервер LDAP"
 msgid "LDAP server containing contact information"
 msgstr "Сервер LDAP, содержащий контактную информацию"
 
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
 msgid "New Contact"
 msgstr "Создать контакт"
 
-#: addressbook/gui/component/addressbook-component.c:564
+#: addressbook/gui/component/addressbook-component.c:574
 msgid "_Contact"
 msgstr "Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:565
+#: addressbook/gui/component/addressbook-component.c:575
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Создать новый контакт"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "New Contact List"
 msgstr "Создать список контактов"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:578
 msgid "Contact _List"
 msgstr "Список контактов"
 
-#: addressbook/gui/component/addressbook-component.c:569
+#: addressbook/gui/component/addressbook-component.c:579
 #, fuzzy
 msgid "Create a new contact list"
 msgstr "Создать список контактов"
@@ -540,30 +533,30 @@ msgstr ""
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1150
+#: addressbook/gui/component/addressbook-config.c:1154
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Ответ сервера IMAP не содержит информации о %s"
 
-#: addressbook/gui/component/addressbook-config.c:1172
+#: addressbook/gui/component/addressbook-config.c:1176
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1180
+#: addressbook/gui/component/addressbook-config.c:1184
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "Ответ сервера IMAP не содержит информации о %s"
 
-#: addressbook/gui/component/addressbook-config.c:1636
+#: addressbook/gui/component/addressbook-config.c:1640
 #, fuzzy
 msgid "LDAP was not enabled in this build of Evolution"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
 #: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:176 calendar/gui/main.c:142
+#: calendar/gui/alarm-notify/notify-main.c:179 calendar/gui/main.c:142
 msgid "Could not initialize gnome-vfs"
 msgstr "Не удалось инициализировать gnome-vfs"
 
@@ -572,21 +565,30 @@ msgstr "Не удалось инициализировать gnome-vfs"
 msgid "Other Contacts"
 msgstr "Контакты"
 
-#: addressbook/gui/component/addressbook.c:468
+#: addressbook/gui/component/addressbook.c:471
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
 #: addressbook/gui/component/addressbook.c:477
 msgid ""
+"We were unable to open this addressbook.  Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
+"и что у вас имеются необходимые права доступа."
+
+#: addressbook/gui/component/addressbook.c:487
+#, fuzzy
+msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
-"is down"
+"is unreachable."
 msgstr ""
 "Не удалось открыть эту адресную книгу. Это значит,\n"
 "что либо вы ввели неверный URI, либо сервер LDAP\n"
 "не отвечает"
 
-#: addressbook/gui/component/addressbook.c:482
+#: addressbook/gui/component/addressbook.c:492
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -599,50 +601,82 @@ msgstr ""
 "установки OpenLDAP, который можно найти по приведенной\n"
 "ниже ссылке.\n"
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:501
+#, fuzzy
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or the server\n"
+"is unreachable."
 msgstr ""
-"Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
-"и что у вас имеются необходимые права доступа."
+"Не удалось открыть эту адресную книгу. Это значит,\n"
+"что либо вы ввели неверный URI, либо сервер LDAP\n"
+"не отвечает"
 
-#: addressbook/gui/component/addressbook.c:600
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:613
+#: addressbook/gui/component/addressbook.c:616
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Введите пароль для %s (пользователь %s)"
 
-#: addressbook/gui/component/addressbook.c:728
+#: addressbook/gui/component/addressbook.c:741
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: addressbook/gui/component/addressbook.c:729
-msgid "Email is"
-msgstr "Эл.адрес"
+#: addressbook/gui/component/addressbook.c:742
+#, fuzzy
+msgid "Email begins with"
+msgstr "Имя начинается с"
 
-#: addressbook/gui/component/addressbook.c:730
+#: addressbook/gui/component/addressbook.c:743
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:731
+#: addressbook/gui/component/addressbook.c:744
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:745
 msgid "Advanced..."
 msgstr "Расширенные..."
 
+#: addressbook/gui/component/addressbook.c:915
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:921
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:927
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:930
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:934
+msgid "This query did not complete successfully."
+msgstr ""
+
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:960
+#: addressbook/gui/component/addressbook.c:1009
 #: calendar/gui/cal-search-bar.c:382
 msgid "Any Category"
 msgstr "Любая категория"
 
-#: addressbook/gui/component/addressbook.c:1042
+#: addressbook/gui/component/addressbook.c:1091
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет использовать программа просмотра папок"
 
@@ -657,7 +691,7 @@ msgstr "(нет)"
 
 #: addressbook/gui/component/e-address-popup.c:474
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1771
+#: addressbook/gui/contact-editor/e-contact-editor.c:1778
 msgid "Primary Email"
 msgstr "Основной эл.адрес"
 
@@ -709,51 +743,52 @@ msgid "  S_how Supported Bases "
 msgstr " Проверка поддерживаемых типов "
 
 #: addressbook/gui/component/ldap-config.glade.h:2
+#, fuzzy
+msgid "&lt;&lt; Fewer Options"
+msgstr "Параметры"
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+#, fuzzy
+msgid "&lt;- _Remove"
+msgstr "<- Удалить"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "2:30"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "380"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "5:00"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "666"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
-msgid "<- _Remove"
-msgstr "<- Удалить"
-
-#: addressbook/gui/component/ldap-config.glade.h:12
-#, fuzzy
-msgid "<< Fewer Options"
-msgstr "Параметры"
-
 #: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add (or Edit) Attribute Mappings"
 msgstr ""
@@ -855,7 +890,7 @@ msgid "Mappings"
 msgstr "Поля"
 
 #: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Никогда"
 
@@ -908,8 +943,8 @@ msgstr "Диапазон поиска: "
 
 #. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:50
-#: calendar/gui/calendar-model.c:1980 calendar/gui/e-day-view.c:1709
-#: calendar/gui/e-week-view.c:1214
+#: calendar/gui/calendar-model.c:1988 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1215
 msgid "Searching"
 msgstr "Поиск"
 
@@ -1098,7 +1133,7 @@ msgid "Using email address"
 msgstr "Эл.адрес:"
 
 #: addressbook/gui/component/ldap-config.glade.h:103
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:134
+#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:135
 msgid "Whenever Possible"
 msgstr ""
 
@@ -1106,12 +1141,13 @@ msgstr ""
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:137 shell/glade/e-folder-list.glade.h:1
+#: mail/mail-config.glade.h:138 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "Добавить"
 
 #: addressbook/gui/component/ldap-config.glade.h:105
-msgid "_Add ->"
+#, fuzzy
+msgid "_Add -&gt;"
 msgstr "Добавить ->"
 
 #: addressbook/gui/component/ldap-config.glade.h:106
@@ -1151,7 +1187,7 @@ msgid "_Download limit:"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:114 filter/filter.glade.h:16
-#: mail/mail-config.glade.h:152 ui/evolution-addressbook.xml.h:33
+#: mail/mail-config.glade.h:153 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
@@ -1188,7 +1224,7 @@ msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:121
 #, fuzzy
-msgid "_More Options >>"
+msgid "_More Options &gt;&gt;"
 msgstr "Параметры"
 
 #: addressbook/gui/component/ldap-config.glade.h:122
@@ -1270,7 +1306,7 @@ msgstr "Фабрика для интерфейса выбора имени в адресной книге."
 
 #. Fixme: Ditto
 #: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:677
+#: addressbook/gui/component/select-names/e-select-names.c:698
 #: composer/e-msg-composer-attachment-bar.c:522 filter/filter-filter.c:462
 #: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:560
 #: shell/e-shortcuts-view.c:178
@@ -1302,11 +1338,11 @@ msgstr "(%d не показано)"
 msgid "Unnamed Contact"
 msgstr "Безымянный контакт"
 
-#: addressbook/gui/component/select-names/e-select-names.c:511
+#: addressbook/gui/component/select-names/e-select-names.c:520
 msgid "Select Contacts from Addressbook"
 msgstr "Выбрать контакты из адресной книги"
 
-#: addressbook/gui/component/select-names/e-select-names.c:544
+#: addressbook/gui/component/select-names/e-select-names.c:560
 #, fuzzy
 msgid "Find contact in"
 msgstr "\"Отправитель\" содержит"
@@ -1371,7 +1407,7 @@ msgstr "Сотрудничество"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1367
+#: addressbook/gui/contact-editor/e-contact-editor.c:1369
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -1441,9 +1477,9 @@ msgstr "Согласен получать почту в формате HTML"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3649
-#: calendar/gui/e-week-view.c:3522 filter/filter.glade.h:15
-#: mail/folder-browser.c:1705 mail/mail-config.glade.h:150
+#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3763
+#: calendar/gui/e-week-view.c:3570 filter/filter.glade.h:15
+#: mail/folder-browser.c:1744 mail/mail-config.glade.h:151
 #: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
 #: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
 #: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
@@ -2506,23 +2542,23 @@ msgstr "Вы уверены что хотите удалить эту учётную запись?"
 msgid "Delete Contact?"
 msgstr "Удалить контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:825
+#: addressbook/gui/contact-editor/e-contact-editor.c:826
 msgid "Category editor not available."
 msgstr "Редактор категорий недоступен."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:832
+#: addressbook/gui/contact-editor/e-contact-editor.c:833
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1046
+#: addressbook/gui/contact-editor/e-contact-editor.c:1047
 msgid "Save Contact as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1754
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2428
+#: addressbook/gui/contact-editor/e-contact-editor.c:2435
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не удалось удалить найти элемент управления для поля: \"%s\""
@@ -2536,7 +2572,7 @@ msgid "Edit Full"
 msgstr "Правка полного имени"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:326
-#: addressbook/gui/widgets/e-addressbook-view.c:336
+#: addressbook/gui/widgets/e-addressbook-view.c:357
 msgid "Full Name"
 msgstr "Полное имя:"
 
@@ -2688,11 +2724,11 @@ msgid "contact-list-editor"
 msgstr "Редактор списка контактов"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:236
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
 msgid "Contact List Editor"
 msgstr "Редактор списка контактов"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:430
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:437
 msgid "Save List as VCard"
 msgstr "Сохранить список как VCard"
 
@@ -2751,20 +2787,20 @@ msgstr "Расширенный поиск"
 msgid "Search"
 msgstr "Найти"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:137
+#: addressbook/gui/widgets/e-addressbook-model.c:140
 msgid "No cards"
 msgstr "Нет карточек"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:140
+#: addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "1 card"
 msgstr "1 карточка"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:143
+#: addressbook/gui/widgets/e-addressbook-model.c:146
 #, c-format
 msgid "%d cards"
 msgstr "%d карточек"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:370
+#: addressbook/gui/widgets/e-addressbook-model.c:402
 #, fuzzy
 msgid "Error getting book view"
 msgstr "Ошибка при загрузке %s"
@@ -2776,15 +2812,15 @@ msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1090
+#: shell/evolution-shell-component.c:1141
 msgid "Success"
 msgstr "Успешно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:36
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-command.c:393
-#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2130
-#: shell/e-storage.c:516 shell/evolution-shell-component.c:1129
+#: camel/providers/imap/camel-imap-command.c:308
+#: camel/providers/imap/camel-imap-command.c:396
+#: camel/providers/pop3/camel-pop3-store.c:511 shell/e-shell.c:2137
+#: shell/e-storage.c:516 shell/evolution-shell-component.c:1180
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -2793,7 +2829,7 @@ msgid "Repository offline"
 msgstr "Репозиторий вне сети"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:504
-#: shell/evolution-shell-component.c:1120
+#: shell/evolution-shell-component.c:1171
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -2810,7 +2846,7 @@ msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1189
+#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
 #: camel/camel-service.c:738 camel/camel-service.c:778
@@ -2865,7 +2901,7 @@ msgstr "Ошибка при удалении списка"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:101
 #: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1624
+#: addressbook/gui/widgets/e-addressbook-view.c:1670
 msgid "Error removing card"
 msgstr "Ошибка при удалении карточки"
 
@@ -2901,152 +2937,152 @@ msgstr "Переместить карточки в"
 msgid "Copy cards to"
 msgstr "Копировать карточки в"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:334
+#: addressbook/gui/widgets/e-addressbook-view.c:355
 msgid "* Click here to add a contact *"
 msgstr "* Щёлкните здесь чтобы добавить контакт *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:359
 msgid "Primary Phone"
 msgstr "Основной телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:339
+#: addressbook/gui/widgets/e-addressbook-view.c:360
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:340
+#: addressbook/gui/widgets/e-addressbook-view.c:361
 msgid "Business Phone"
 msgstr "Рабочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:341
+#: addressbook/gui/widgets/e-addressbook-view.c:362
 msgid "Callback Phone"
 msgstr "Телефон для обратного звонка"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:342
+#: addressbook/gui/widgets/e-addressbook-view.c:363
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:343
+#: addressbook/gui/widgets/e-addressbook-view.c:364
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:345
+#: addressbook/gui/widgets/e-addressbook-view.c:366
 msgid "Business Address"
 msgstr "Рабочий адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:346
+#: addressbook/gui/widgets/e-addressbook-view.c:367
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:347
+#: addressbook/gui/widgets/e-addressbook-view.c:368
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:348
+#: addressbook/gui/widgets/e-addressbook-view.c:369
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:351
+#: addressbook/gui/widgets/e-addressbook-view.c:372
 msgid "Business Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:352
+#: addressbook/gui/widgets/e-addressbook-view.c:373
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:354
+#: addressbook/gui/widgets/e-addressbook-view.c:375
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:360
+#: addressbook/gui/widgets/e-addressbook-view.c:381
 msgid "Other Address"
 msgstr "Другие адреса"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:440
+#: addressbook/gui/widgets/e-addressbook-view.c:461
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 msgid "Addressbook"
 msgstr "Адресная книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/e-addressbook-view.c:890
-#: addressbook/gui/widgets/e-addressbook-view.c:1826
+#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-view.c:911
+#: addressbook/gui/widgets/e-addressbook-view.c:1872
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 msgid "New Contact..."
 msgstr "Новый контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 msgid "New Contact List..."
 msgstr "Создать список контактов..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:902
 msgid "Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/gui/widgets/e-addressbook-view.c:903
 msgid "Import..."
 msgstr "Импортировать..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Search for Contacts..."
 msgstr "Найти контакты..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:906
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "Настроить адресные книги..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 msgid "Pilot Settings..."
 msgstr "Настроить Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:912
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/gui/widgets/e-addressbook-view.c:913
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:914
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Напечатать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:916
 msgid "Print Envelope"
 msgstr "Напечатать конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/gui/widgets/e-addressbook-view.c:920
 msgid "Copy to folder..."
 msgstr "Скопировать в папку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:921
 msgid "Move to folder..."
 msgstr "Переместить в папку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/gui/widgets/e-addressbook-view.c:924
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вырезать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:925
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопировать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/gui/widgets/e-addressbook-view.c:926
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:906 filter/libfilter-i18n.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:927 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
 #: ui/evolution-contact-editor.xml.h:2
@@ -3054,8 +3090,8 @@ msgstr "Вставить"
 msgid "Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-#: calendar/gui/e-day-view.c:3607 calendar/gui/e-week-view.c:3486
+#: addressbook/gui/widgets/e-addressbook-view.c:930
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3534
 #, fuzzy
 msgid "Current View"
 msgstr "Показывать"
@@ -3064,7 +3100,7 @@ msgstr "Показывать"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:942
+#: addressbook/gui/widgets/e-addressbook-view.c:963
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",123,А Б,В Г,Д Е,Ж З,И К,Л М,Н О,П Р,С Т,У Ф,Х Ц,Ч Ш,Щ Э,Ю Я,abc,def,ghi,jkl,"
@@ -3074,12 +3110,20 @@ msgstr ""
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:947
+#: addressbook/gui/widgets/e-addressbook-view.c:968
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ""
 ",0,аб,вг,де,жз,ик,лм,но,пр,ст,уф,хц,чш,щэ,юя,abc,def,ghi,jkl,mno,pqr,stu,vwx,"
 "yz"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:1372
+#, c-format
+msgid ""
+"The addressbook backend for\n"
+"%s\n"
+"has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-control.c:185
 #, c-format
 msgid "and %d other cards."
@@ -3204,7 +3248,7 @@ msgid "Include:"
 msgstr "Включить:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:628
+#: calendar/gui/tasks-control.c:625
 msgid "Landscape"
 msgstr "Альбом"
 
@@ -3224,12 +3268,12 @@ msgstr "Поля"
 msgid "Number of columns:"
 msgstr "Число столбцов:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:80
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
 msgid "Options"
 msgstr "Параметры"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:615
+#: calendar/gui/tasks-control.c:612
 msgid "Orientation"
 msgstr "Ориентация"
 
@@ -3252,7 +3296,7 @@ msgstr "Источник бумаги:"
 
 #. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:621
+#: calendar/gui/tasks-control.c:618
 msgid "Portrait"
 msgstr "Портрет"
 
@@ -3308,26 +3352,26 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
-#: calendar/cal-util/cal-component.c:1221
+#: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Неозаглавленная встреча"
 
 #: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:745
+#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:749
 msgid "High"
 msgstr "Высокий"
 
 #: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1707
+#: calendar/gui/calendar-model.c:1715
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:744
+#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:748
 msgid "Normal"
 msgstr "Нормальный"
 
 #: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:743
+#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:747
 msgid "Low"
 msgstr "Низкий"
 
@@ -3377,37 +3421,37 @@ msgid "Configuration control for the Evolution Calendar."
 msgstr "Фабрика для редактора почты программы Evolution."
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Компонент для просмотра календаря iTip/iMip календаря Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Компонент Evolution для обработки календаря."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the Evolution Tasks control"
 msgstr "Фабрика для управляющего элемента Evolution Задачи"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the calendar iTip view control"
 msgstr "Фабрика для управляющего элемента просмотра iTip календаря"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 msgid "Factory for the sample Calendar control"
 msgstr "Фабрика для примера управляющего элемента календаря"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Фабрика для централизации диалогов компонента редактора календаря"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
 msgid "Factory to create a component editor factory"
 msgstr "Фабрика для создания фабрики редактора компонентов"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "This page can be used to configure Calendar and Task preferences"
-msgstr ""
-
 #: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
 msgid "Alarm notification service"
 msgstr "Сервис уведомления о сигнале"
@@ -3474,7 +3518,7 @@ msgstr ""
 "напоминания."
 
 #: calendar/gui/alarm-notify/alarm-queue.c:754
-#: calendar/gui/tasks-control.c:448 mail/mail-callbacks.c:2869
+#: calendar/gui/tasks-control.c:445 mail/mail-callbacks.c:2870
 #: widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Предупреждение"
@@ -3500,15 +3544,11 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не спрашивать в следующий раз."
 
-#: calendar/gui/alarm-notify/notify-main.c:168 calendar/gui/main.c:62
+#: calendar/gui/alarm-notify/notify-main.c:171 calendar/gui/main.c:62
 msgid "Could not initialize GNOME"
 msgstr "Не удалось инициализировать GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:183
-msgid "Could not create the alarm notify service"
-msgstr "Не удалось создать сервис уведомления о сигнале"
-
-#: calendar/gui/alarm-notify/notify-main.c:188
+#: calendar/gui/alarm-notify/notify-main.c:186
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удалось создать фабрику сервиса уведомления о сигнале"
 
@@ -3524,7 +3564,7 @@ msgstr "Описание содержит"
 msgid "Comment contains"
 msgstr "Комментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1105
+#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
 msgid "Unmatched"
 msgstr "Прочее"
 
@@ -3535,7 +3575,7 @@ msgstr "%A, %d %B %Y"
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1435 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:333
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
@@ -3594,37 +3634,37 @@ msgstr "В"
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1139
+#: calendar/gui/calendar-model.c:603 calendar/gui/calendar-model.c:1147
 #: calendar/gui/e-calendar-table.c:470
 msgid "Free"
 msgstr "Свободен"
 
 #: calendar/gui/calendar-model.c:605 calendar/gui/e-calendar-table.c:471
 #: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1114
+#: shell/evolution-shell-component.c:1165
 msgid "Busy"
 msgstr "Занят"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1191
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
 msgid "Not Started"
 msgstr "Не начато"
 
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1193
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
 msgid "In Progress"
 msgstr "В процессе"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1187
+#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
 #: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
 msgid "Completed"
 msgstr "Выполнено"
 
-#: calendar/gui/calendar-model.c:1041
+#: calendar/gui/calendar-model.c:1049
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3635,33 +3675,33 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1181 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:2002
-#: mail/folder-browser.c:1667 mail/mail-account-gui.c:1229
-#: mail/mail-account-gui.c:1647 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
+#: calendar/gui/calendar-model.c:1189 calendar/gui/dialogs/meeting-page.c:309
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1961
+#: mail/folder-browser.c:1706 mail/mail-account-gui.c:1229
+#: mail/mail-account-gui.c:1649 mail/mail-accounts.c:453
+#: mail/mail-accounts.c:462 mail/mail-config.glade.h:78
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:204
 #: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1488 widgets/misc/e-dateedit.c:1603
+#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/calendar-model.c:1717
 msgid "Recurring"
 msgstr "Повторение"
 
-#: calendar/gui/calendar-model.c:1711
+#: calendar/gui/calendar-model.c:1719
 msgid "Assigned"
 msgstr "Назначено"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:560
-#: calendar/gui/e-meeting-model.c:850
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:302
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:566
+#: calendar/gui/e-meeting-model.c:859
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/calendar-model.c:1717 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:851
+#: calendar/gui/calendar-model.c:1725 calendar/gui/e-meeting-model.c:314
+#: calendar/gui/e-meeting-model.c:860
 msgid "No"
 msgstr "Нет"
 
@@ -3681,7 +3721,7 @@ msgstr "Как неделю"
 msgid "Month View"
 msgstr "как месяц"
 
-#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1363
+#: calendar/gui/component-factory.c:69 calendar/gui/gnome-cal.c:1365
 #: importers/netscape-importer.c:1872 my-evolution/my-evolution.glade.h:3
 #: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
 msgid "Calendar"
@@ -3692,10 +3732,10 @@ msgid "Folder containing appointments and events"
 msgstr "Папка, содержащая встречи и события"
 
 #: calendar/gui/component-factory.c:74 calendar/gui/e-tasks.c:704
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:502
+#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:499
 #: calendar/importers/icalendar-importer.c:703
-#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:299
-#: my-evolution/e-summary-tasks.c:316 shell/e-local-storage.c:182
+#: importers/netscape-importer.c:1874 my-evolution/e-summary-tasks.c:311
+#: my-evolution/e-summary-tasks.c:330 shell/e-local-storage.c:182
 #: shell/e-shortcuts.c:1063
 msgid "Tasks"
 msgstr "Задачи"
@@ -3704,55 +3744,55 @@ msgstr "Задачи"
 msgid "Folder containing to-do items"
 msgstr "Папка содержащая элементы \"Выполнить\""
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:709
 #, fuzzy
 msgid "New appointment"
 msgstr "Создать встречу"
 
-#: calendar/gui/component-factory.c:708
+#: calendar/gui/component-factory.c:709
 msgid "_Appointment"
 msgstr "Встреча"
 
-#: calendar/gui/component-factory.c:709
+#: calendar/gui/component-factory.c:710
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/component-factory.c:713
+#: calendar/gui/component-factory.c:714
 msgid "New meeting"
 msgstr "Новое совещание"
 
-#: calendar/gui/component-factory.c:713
+#: calendar/gui/component-factory.c:714
 msgid "_Meeting"
 msgstr "Совещание"
 
-#: calendar/gui/component-factory.c:714
+#: calendar/gui/component-factory.c:715
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/component-factory.c:718
+#: calendar/gui/component-factory.c:719
 msgid "New task"
 msgstr "Создать задачу"
 
-#: calendar/gui/component-factory.c:718
+#: calendar/gui/component-factory.c:719
 msgid "_Task"
 msgstr "Задача"
 
-#: calendar/gui/component-factory.c:719
+#: calendar/gui/component-factory.c:720
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/component-factory.c:723
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "New All Day Appointment"
 msgstr "Создать встречу"
 
-#: calendar/gui/component-factory.c:723
+#: calendar/gui/component-factory.c:724
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Новую встречу"
 
-#: calendar/gui/component-factory.c:724
+#: calendar/gui/component-factory.c:725
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Создать новую встречу"
@@ -3966,7 +4006,7 @@ msgstr "Напоминания"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:7
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:892 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:774 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Коротко:"
 
@@ -3995,7 +4035,7 @@ msgstr "завершение встречи"
 msgid "hour(s)"
 msgstr "час(-а,-ов)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:184
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:185
 msgid "minute(s)"
 msgstr "минута(-ы)"
 
@@ -4170,7 +4210,7 @@ msgid "_Fri"
 msgstr "Пят"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:158
 msgid "_General"
 msgstr "Общие"
 
@@ -4306,61 +4346,61 @@ msgstr " (к "
 msgid "Due "
 msgstr "Условленная дата"
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:342
 #, fuzzy
 msgid "Could not update invalid object"
 msgstr "Не удалось обновить объект!"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:345
 msgid "Object not found, not updated"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:348
 msgid "You don't have permissions to update this object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:351
 #, fuzzy
 msgid "Could not update object"
 msgstr "Не удалось обновить объект!"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:797
 msgid "Edit Appointment"
 msgstr "Править встречу"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:805
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:808
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запись в журнале - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:822
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: calendar/gui/dialogs/comp-editor.c:1213
-#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3862
-#: calendar/gui/e-week-view.c:3754 composer/e-msg-composer.c:1148
+#: calendar/gui/dialogs/comp-editor.c:1220
+#: calendar/gui/e-calendar-table.c:1070 calendar/gui/e-day-view.c:3976
+#: calendar/gui/e-week-view.c:3802 composer/e-msg-composer.c:1146
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/dialogs/comp-editor.c:1314
-#: calendar/gui/dialogs/comp-editor.c:1338
-#: calendar/gui/dialogs/comp-editor.c:1362
+#: calendar/gui/dialogs/comp-editor.c:1321
+#: calendar/gui/dialogs/comp-editor.c:1345
+#: calendar/gui/dialogs/comp-editor.c:1369
 msgid ""
 "Changes made to this item may be discarded if an update arrives via email"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1389
+#: calendar/gui/dialogs/comp-editor.c:1396
 msgid "Unable to obtain current version!"
 msgstr "Не удалось применить текущую версию!"
 
@@ -4432,13 +4472,13 @@ msgstr "Повторение"
 
 #: calendar/gui/dialogs/event-editor.c:211
 #: calendar/gui/dialogs/event-editor.c:277
-#: calendar/gui/dialogs/event-editor.c:401
+#: calendar/gui/dialogs/event-editor.c:407
 msgid "Scheduling"
 msgstr "Планировка"
 
 #: calendar/gui/dialogs/event-editor.c:216
 #: calendar/gui/dialogs/event-editor.c:280
-#: calendar/gui/dialogs/event-editor.c:404 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:410 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Совещание"
 
@@ -4564,7 +4604,7 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1010
+#: calendar/gui/e-itip-control.c:898
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
@@ -4779,7 +4819,7 @@ msgstr "Дата выполнения:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:863
+#: calendar/gui/e-meeting-model.c:572 calendar/gui/e-meeting-model.c:872
 msgid "Needs Action"
 msgstr "Необходимое действие"
 
@@ -4806,11 +4846,11 @@ msgstr "Основные"
 
 #: calendar/gui/dialogs/task-editor.c:194
 #: calendar/gui/dialogs/task-editor.c:238
-#: calendar/gui/dialogs/task-editor.c:353
+#: calendar/gui/dialogs/task-editor.c:359
 msgid "Assignment"
 msgstr "Назначение"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:941
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:828
 #: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:43
 msgid "Description:"
@@ -4879,13 +4919,13 @@ msgstr ""
 msgid "100%"
 msgstr "1:00"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2763
-#: calendar/gui/e-week-view.c:1854
+#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1892
 msgid "Deleting selected objects"
 msgstr "Удаление выбранных объектов"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3631
-#: calendar/gui/e-week-view.c:3504 mail/folder-browser.c:1678
+#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3552 mail/folder-browser.c:1717
 #: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "Открыть"
@@ -4894,30 +4934,30 @@ msgstr "Открыть"
 msgid "_Save as..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3633
-#: calendar/gui/e-week-view.c:3478 calendar/gui/e-week-view.c:3506
+#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3747
+#: calendar/gui/e-week-view.c:3526 calendar/gui/e-week-view.c:3554
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "Напечатать..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3638
-#: calendar/gui/e-week-view.c:3511 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3752
+#: calendar/gui/e-week-view.c:3559 ui/evolution-addressbook.xml.h:1
 #: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вырезать"
 
-#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3639
-#: calendar/gui/e-week-view.c:3512 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:994 calendar/gui/e-day-view.c:3753
+#: calendar/gui/e-week-view.c:3560 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3602
-#: calendar/gui/e-day-view.c:3640 calendar/gui/e-week-view.c:3482
-#: calendar/gui/e-week-view.c:3513 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3716
+#: calendar/gui/e-day-view.c:3754 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-week-view.c:3561 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
@@ -4943,8 +4983,8 @@ msgstr "Пометить выбранные задачи как выполненные"
 msgid "_Delete Selected Tasks"
 msgstr "Удалить выбранные задачи"
 
-#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7502
-#: calendar/gui/e-week-view.c:4255
+#: calendar/gui/e-calendar-table.c:1274 calendar/gui/e-day-view.c:7631
+#: calendar/gui/e-week-view.c:4303
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
@@ -5003,14 +5043,14 @@ msgid "URL"
 msgstr "URL"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:357
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:366
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -5032,517 +5072,494 @@ msgstr "Деления через %02i минут"
 
 #. 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:284 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1424
 #: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
 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:292 calendar/gui/e-day-view.c:1448
+#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1451
 #: calendar/gui/e-week-view-main-item.c:347
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:635 calendar/gui/e-week-view.c:376
+#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:377
 #: calendar/gui/print.c:791
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:379
+#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:380
 #: calendar/gui/print.c:793
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3586
+#: calendar/gui/e-day-view.c:3700
 msgid "New _Appointment"
 msgstr "Новую встречу"
 
-#: calendar/gui/e-day-view.c:3588 calendar/gui/e-week-view.c:3472
+#: calendar/gui/e-day-view.c:3702 calendar/gui/e-week-view.c:3520
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-day-view.c:3590 calendar/gui/e-week-view.c:3473
+#: calendar/gui/e-day-view.c:3704 calendar/gui/e-week-view.c:3521
 msgid "New Meeting"
 msgstr "Новое совещание"
 
-#: calendar/gui/e-day-view.c:3592 calendar/gui/e-week-view.c:3474
+#: calendar/gui/e-day-view.c:3706 calendar/gui/e-week-view.c:3522
 msgid "New Task"
 msgstr "Создать задачу"
 
-#: calendar/gui/e-day-view.c:3597 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3711 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Напечатать..."
 
-#: calendar/gui/e-day-view.c:3609 calendar/gui/e-week-view.c:3488
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3536
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Перейти к сегодняшнему дню"
 
-#: calendar/gui/e-day-view.c:3611 calendar/gui/e-week-view.c:3489
+#: calendar/gui/e-day-view.c:3725 calendar/gui/e-week-view.c:3537
 msgid "_Go to Date..."
 msgstr "Перейти к дате..."
 
-#: calendar/gui/e-day-view.c:3616 calendar/gui/e-week-view.c:3493
+#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3541
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-day-view.c:3621 calendar/gui/e-week-view.c:3497
+#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3545
 msgid "_Configure..."
 msgstr "Настроить..."
 
-#: calendar/gui/e-day-view.c:3623 calendar/gui/e-week-view.c:3498
+#: calendar/gui/e-day-view.c:3737 calendar/gui/e-week-view.c:3546
 msgid "_Configure Pilot..."
 msgstr "Настроить Pilot..."
 
-#: calendar/gui/e-day-view.c:3632 calendar/gui/e-week-view.c:3505
-#: mail/folder-browser.c:1680 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3553
+#: mail/folder-browser.c:1719 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/e-day-view.c:3644 calendar/gui/e-week-view.c:3517
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3565
 msgid "_Schedule Meeting..."
 msgstr "Вставить совещание в расписание"
 
-#: calendar/gui/e-day-view.c:3645 calendar/gui/e-week-view.c:3518
+#: calendar/gui/e-day-view.c:3759 calendar/gui/e-week-view.c:3566
 msgid "_Forward as iCalendar..."
 msgstr "Переслать как i_Calendar"
 
-#: calendar/gui/e-day-view.c:3650 calendar/gui/e-week-view.c:3523
+#: calendar/gui/e-day-view.c:3764 calendar/gui/e-week-view.c:3571
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать эту вхождение перемещаемым"
 
-#: calendar/gui/e-day-view.c:3651 calendar/gui/e-week-view.c:3524
+#: calendar/gui/e-day-view.c:3765 calendar/gui/e-week-view.c:3572
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-day-view.c:3652 calendar/gui/e-week-view.c:3525
+#: calendar/gui/e-day-view.c:3766 calendar/gui/e-week-view.c:3573
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-day-view.c:4014 calendar/gui/e-week-view.c:3882
+#: calendar/gui/e-day-view.c:4128 calendar/gui/e-week-view.c:3930
 #: shell/e-shell-view-menu.c:639
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
 
-#: calendar/gui/e-day-view.c:4020 calendar/gui/e-week-view.c:3888
+#: calendar/gui/e-day-view.c:4134 calendar/gui/e-week-view.c:3936
 #: shell/e-shell-view-menu.c:647
 #, c-format
 msgid "Error executing %s."
 msgstr "Ошибка выполнения %s."
 
-#: calendar/gui/e-itip-control.c:678
-msgid "Meeting begins: <b>"
+#: calendar/gui/e-itip-control.c:583
+msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:683
-msgid "Task begins: <b>"
+#: calendar/gui/e-itip-control.c:593
+msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:606
 #, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Информация о занятости (с %s до %s)"
-
-#: calendar/gui/e-itip-control.c:692
-msgid "Begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:704
-#, fuzzy
-msgid "Meeting ends: <b>"
-msgstr "Время завершения собрания:"
-
-#: calendar/gui/e-itip-control.c:707
-#, fuzzy
-msgid "Free/Busy info ends: <b>"
-msgstr "Информация о занятости (с %s до %s)"
-
-#: calendar/gui/e-itip-control.c:711
-msgid "Ends: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:725
-#, fuzzy
-msgid "Task Completed: <b>"
-msgstr " (Выполнено "
+msgid "<b>Completed:</b> "
+msgstr "Выполнено "
 
-#: calendar/gui/e-itip-control.c:735
-msgid "Task Due: <b>"
+#: calendar/gui/e-itip-control.c:616
+msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:772 calendar/gui/e-itip-control.c:822
+#: calendar/gui/e-itip-control.c:653 calendar/gui/e-itip-control.c:703
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "информация календаря"
 
 #. Title
-#: calendar/gui/e-itip-control.c:787
+#: calendar/gui/e-itip-control.c:668
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Календарь"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
+#: calendar/gui/e-itip-control.c:734 calendar/gui/e-itip-control.c:750
 #, fuzzy
 msgid "An unknown person"
 msgstr "Неизвестная причина"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:876
+#: calendar/gui/e-itip-control.c:757
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:892
+#: calendar/gui/e-itip-control.c:772
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:898
+#: calendar/gui/e-itip-control.c:782
 #, fuzzy
 msgid "Location:"
 msgstr "Геогр.расположение: "
 
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:796
 #, fuzzy
 msgid "Status:"
 msgstr "Состояние:"
 
-#: calendar/gui/e-itip-control.c:915 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:864
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:801 calendar/gui/e-meeting-model.c:322
+#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:873
+#: calendar/gui/itip-utils.c:463
 msgid "Accepted"
 msgstr "Принято"
 
-#: calendar/gui/e-itip-control.c:919 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:805 calendar/gui/itip-utils.c:466
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr "Экспериментальный"
 
-#: calendar/gui/e-itip-control.c:923 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:865
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:809 calendar/gui/e-meeting-model.c:324
+#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:874
+#: calendar/gui/itip-utils.c:469 calendar/gui/itip-utils.c:495
 msgid "Declined"
 msgstr "Отклонено"
 
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.c:1131
+#: calendar/gui/e-itip-control.c:813 calendar/gui/e-itip-control.c:1019
 #: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:822
-#: calendar/gui/e-meeting-model.c:838 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:847 camel/camel-tcp-stream-openssl.c:629
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:326
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
 #: mail/mail-display.c:888 widgets/misc/e-charset-picker.c:58
 #: widgets/misc/e-charset-picker.c:444
 msgid "Unknown"
 msgstr "Неизвестное"
 
-#: calendar/gui/e-itip-control.c:978 calendar/gui/e-itip-control.c:1006
-#: calendar/gui/e-itip-control.c:1032 calendar/gui/e-itip-control.c:1045
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:866 calendar/gui/e-itip-control.c:894
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.c:933
+#: calendar/gui/e-itip-control.c:946 calendar/gui/e-itip-control.c:959
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Выбрать действие"
 
-#: calendar/gui/e-itip-control.c:979
+#: calendar/gui/e-itip-control.c:867
 #, fuzzy
 msgid "Update"
 msgstr "Обновить сейчас"
 
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:1011
-#: calendar/gui/e-itip-control.c:1034 calendar/gui/e-itip-control.c:1047
-#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-itip-control.c:1073
-#: shell/e-shell.c:2120 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:868 calendar/gui/e-itip-control.c:899
+#: calendar/gui/e-itip-control.c:922 calendar/gui/e-itip-control.c:935
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-itip-control.c:961
+#: shell/e-shell.c:2127 widgets/misc/e-cell-date-edit.c:258
 msgid "OK"
 msgstr "Ок"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:895
 #, fuzzy
 msgid "Accept"
 msgstr "Принято"
 
-#: calendar/gui/e-itip-control.c:1008
+#: calendar/gui/e-itip-control.c:896
 #, fuzzy
 msgid "Tentatively accept"
 msgstr "Экспериментальный"
 
-#: calendar/gui/e-itip-control.c:1009
+#: calendar/gui/e-itip-control.c:897
 #, fuzzy
 msgid "Decline"
 msgstr "Отклонено"
 
-#: calendar/gui/e-itip-control.c:1033
+#: calendar/gui/e-itip-control.c:921
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:934
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1059
+#: calendar/gui/e-itip-control.c:947
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "информация календаря"
 
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1092 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:960 calendar/gui/itip-utils.c:483
+#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
 
-#: calendar/gui/e-itip-control.c:1150
+#: calendar/gui/e-itip-control.c:1038
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Получить последнюю информацию по совещанию"
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1039
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Дополнительная информация"
 
-#: calendar/gui/e-itip-control.c:1155
+#: calendar/gui/e-itip-control.c:1043
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1156
+#: calendar/gui/e-itip-control.c:1044
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Получение эл.почты"
 
-#: calendar/gui/e-itip-control.c:1160
+#: calendar/gui/e-itip-control.c:1048
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1161
+#: calendar/gui/e-itip-control.c:1049
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Время завершения собрания:"
 
-#: calendar/gui/e-itip-control.c:1165
+#: calendar/gui/e-itip-control.c:1053
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Получить последнюю информацию по совещанию"
 
-#: calendar/gui/e-itip-control.c:1166
+#: calendar/gui/e-itip-control.c:1054
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1173
+#: calendar/gui/e-itip-control.c:1061
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1062
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Пометить как требующее ответа"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1069
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1182
+#: calendar/gui/e-itip-control.c:1070
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Выбрать действие"
 
-#: calendar/gui/e-itip-control.c:1189 calendar/gui/e-itip-control.c:1250
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-itip-control.c:1138
+#: calendar/gui/e-itip-control.c:1173
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1190
+#: calendar/gui/e-itip-control.c:1078
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Поиск в сообщении"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1099
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Получить последнюю информацию по задаче"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1100
 #, fuzzy
 msgid "Task Information"
 msgstr "Информация"
 
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1104
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1105
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1109
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1222
+#: calendar/gui/e-itip-control.c:1110
 #, fuzzy
 msgid "Task Update"
 msgstr "Список задач"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1114
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Получить последнюю информацию по задаче"
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1115
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234
+#: calendar/gui/e-itip-control.c:1122
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1123
 #, fuzzy
 msgid "Task Reply"
 msgstr "Требуется ответ"
 
-#: calendar/gui/e-itip-control.c:1242
+#: calendar/gui/e-itip-control.c:1130
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1243
+#: calendar/gui/e-itip-control.c:1131
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Отменить операцию"
 
-#: calendar/gui/e-itip-control.c:1251
+#: calendar/gui/e-itip-control.c:1139
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:1270
+#: calendar/gui/e-itip-control.c:1158
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1159
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1163
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1276
+#: calendar/gui/e-itip-control.c:1164
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL \"свободен/занят\":"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1168
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1169
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL \"свободен/занят\":"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1174
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Предыдущему сообщению"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1229
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: calendar/gui/e-itip-control.c:1384
+#: calendar/gui/e-itip-control.c:1248
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только получателей скрытой копии."
 
-#: calendar/gui/e-itip-control.c:1412 calendar/gui/e-itip-control.c:1418
+#: calendar/gui/e-itip-control.c:1276 calendar/gui/e-itip-control.c:1282
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1443
+#: calendar/gui/e-itip-control.c:1307
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1578 calendar/gui/e-itip-control.c:1670
+#: calendar/gui/e-itip-control.c:1458 calendar/gui/e-itip-control.c:1550
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1581 calendar/gui/e-itip-control.c:1673
+#: calendar/gui/e-itip-control.c:1461 calendar/gui/e-itip-control.c:1553
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1584 calendar/gui/e-itip-control.c:1676
+#: calendar/gui/e-itip-control.c:1464 calendar/gui/e-itip-control.c:1556
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Элемент не может быть послан!\n"
 
-#: calendar/gui/e-itip-control.c:1587 calendar/gui/e-itip-control.c:1679
+#: calendar/gui/e-itip-control.c:1467 calendar/gui/e-itip-control.c:1559
 msgid "You don't have permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1590
+#: calendar/gui/e-itip-control.c:1470
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1593
+#: calendar/gui/e-itip-control.c:1473
 msgid "Calendar file could not be updated!\n"
 msgstr "Файл календаря не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1622 calendar/gui/e-itip-control.c:1688
+#: calendar/gui/e-itip-control.c:1502 calendar/gui/e-itip-control.c:1568
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: calendar/gui/e-itip-control.c:1643
+#: calendar/gui/e-itip-control.c:1523
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1655
+#: calendar/gui/e-itip-control.c:1535
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1682
+#: calendar/gui/e-itip-control.c:1562
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1685
+#: calendar/gui/e-itip-control.c:1565
 msgid "Attendee status could not be updated!\n"
 msgstr "Статус участника не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1720
+#: calendar/gui/e-itip-control.c:1600
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:1750 calendar/gui/e-itip-control.c:1800
+#: calendar/gui/e-itip-control.c:1630 calendar/gui/e-itip-control.c:1680
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:1752 calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:1632 calendar/gui/e-itip-control.c:1684
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
-#: calendar/gui/e-itip-control.c:1907
+#: calendar/gui/e-itip-control.c:1757
 msgid "Select Calendar Folder"
 msgstr "Выбрать папку календаря"
 
-#: calendar/gui/e-itip-control.c:1914
+#: calendar/gui/e-itip-control.c:1764
 msgid "Select Tasks Folder"
 msgstr "Выбрать папку заданий"
 
@@ -5587,7 +5604,7 @@ msgstr "дата-начала"
 msgid "Chair Persons"
 msgstr "Председатели"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1750
+#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1759
 msgid "Required Participants"
 msgstr "Необходимые участники"
 
@@ -5596,56 +5613,57 @@ msgid "Optional Participants"
 msgstr "Дополнительные участники"
 
 #: calendar/gui/e-meeting-model.c:87
-msgid "Non-Participants"
-msgstr "Не участвуют"
+#, fuzzy
+msgid "Resources"
+msgstr "Источник"
 
 #: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:556 calendar/gui/e-meeting-model.c:818
+#: calendar/gui/e-meeting-model.c:562 calendar/gui/e-meeting-model.c:827
 msgid "Individual"
 msgstr "Индивидуально"
 
 #: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:819
+#: calendar/gui/e-meeting-model.c:828
 msgid "Group"
 msgstr "Группа"
 
 #: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:820
+#: calendar/gui/e-meeting-model.c:829
 msgid "Resource"
 msgstr "Источник"
 
 #: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:821
+#: calendar/gui/e-meeting-model.c:830
 msgid "Room"
 msgstr "Комната"
 
 #: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:834
+#: calendar/gui/e-meeting-model.c:843
 msgid "Chair"
 msgstr "Председатель"
 
 #: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:558 calendar/gui/e-meeting-model.c:835
+#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:844
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
 #: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:836
+#: calendar/gui/e-meeting-model.c:845
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
 #: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:837
+#: calendar/gui/e-meeting-model.c:846
 msgid "Non-Participant"
 msgstr "Не участвует"
 
 #: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:866 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:875 calendar/gui/e-meeting-time-sel.c:437
 msgid "Tentative"
 msgstr "Экспериментальный"
 
 #: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:867
+#: calendar/gui/e-meeting-model.c:876
 msgid "Delegated"
 msgstr "Передано"
 
@@ -5656,22 +5674,22 @@ msgstr "В процессе"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2107
+#: calendar/gui/e-meeting-time-sel.c:2114
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2137 e-util/e-time-utils.c:186
-#: e-util/e-time-utils.c:276 e-util/e-time-utils.c:348
+#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:221
-#: e-util/e-time-utils.c:279 widgets/misc/e-dateedit.c:1612
+#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -5735,8 +5753,8 @@ msgstr "Время начала собрания:"
 msgid "Meeting _end time:"
 msgstr "Время завершения собрания:"
 
-#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1941
-#: calendar/gui/gnome-cal.c:1952
+#: calendar/gui/e-tasks.c:352 calendar/gui/gnome-cal.c:1976
+#: calendar/gui/gnome-cal.c:1987
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
@@ -5751,7 +5769,7 @@ msgstr "Не удалось загрузить задачи в \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод, необходимый для загрузки \"%s\", не поддерживается"
 
-#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1544
+#: calendar/gui/e-tasks.c:401 calendar/gui/gnome-cal.c:1546
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Не удалось открыть папку \"%s\""
@@ -5769,26 +5787,42 @@ msgstr "Удаление выбранных объектов..."
 msgid "Expunging"
 msgstr "Очищение"
 
-#: calendar/gui/e-week-view.c:3471
+#: calendar/gui/e-week-view.c:3519
 msgid "New _Appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/gnome-cal.c:1522
+#: calendar/gui/gnome-cal.c:1524
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Не удалось открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1533
+#: calendar/gui/gnome-cal.c:1535
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод, необходимый для открытия \"%s\", не поддерживается"
 
-#: calendar/gui/gnome-cal.c:1924
+#: calendar/gui/gnome-cal.c:1734
+#, c-format
+msgid ""
+"The calendar backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1739
+#, c-format
+msgid ""
+"The task backend for\n"
+"%s\n"
+" has crashed. You will have to restart Evolution in order to use it again"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1959
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Открытие календаря %s"
 
-#: calendar/gui/gnome-cal.c:1963
+#: calendar/gui/gnome-cal.c:1998
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "Открытие папки \"%s\""
@@ -5849,54 +5883,54 @@ msgstr "Октябрь"
 msgid "September"
 msgstr "Сентябрь"
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:356
 msgid "At least one attendee is necessary"
 msgstr "Необходим как минимум один участник"
 
-#: calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:392
 msgid "An organizer must be set."
 msgstr "Организатор должен быть назначен."
 
-#: calendar/gui/itip-utils.c:462
+#: calendar/gui/itip-utils.c:435
 #, fuzzy
 msgid "Event information"
 msgstr "информация календаря"
 
-#: calendar/gui/itip-utils.c:464
+#: calendar/gui/itip-utils.c:437
 #, fuzzy
 msgid "Task information"
 msgstr "Информация"
 
-#: calendar/gui/itip-utils.c:466
+#: calendar/gui/itip-utils.c:439
 #, fuzzy
 msgid "Journal information"
 msgstr "Дополнительная информация"
 
-#: calendar/gui/itip-utils.c:468
+#: calendar/gui/itip-utils.c:441
 #, fuzzy
 msgid "Free/Busy information"
 msgstr "Информация о занятости (с %s до %s)"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:443
 #, fuzzy
 msgid "Calendar information"
 msgstr "информация календаря"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:479
 #, fuzzy
 msgid "Updated"
 msgstr "Обновить сейчас"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:487
 #, fuzzy
 msgid "Refresh"
 msgstr "Обновить список"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:491
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:697
+#: calendar/gui/itip-utils.c:678
 msgid "You must be an attendee of the event."
 msgstr "Вы должны быть участником события."
 
@@ -6136,7 +6170,7 @@ msgid "Print Calendar"
 msgstr "Напечатать календарь"
 
 #: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:583 mail/mail-callbacks.c:3157
+#: calendar/gui/tasks-control.c:580 mail/mail-callbacks.c:3162
 #: my-evolution/e-summary.c:619
 msgid "Print Preview"
 msgstr "Посмотреть вид на печати"
@@ -6159,7 +6193,7 @@ msgstr ""
 msgid "The URI of the tasks folder to display"
 msgstr "URI, который будет показан в папке задач "
 
-#: calendar/gui/tasks-control.c:456
+#: calendar/gui/tasks-control.c:453
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6171,12 +6205,12 @@ msgstr ""
 "\n"
 "Уничтожить эти задания?"
 
-#: calendar/gui/tasks-control.c:463 mail/mail-callbacks.c:2641
-#: mail/mail-callbacks.c:2883
+#: calendar/gui/tasks-control.c:460 mail/mail-callbacks.c:2642
+#: mail/mail-callbacks.c:2884
 msgid "Do not ask me again."
 msgstr "Не спрашивать снова."
 
-#: calendar/gui/tasks-control.c:612
+#: calendar/gui/tasks-control.c:609
 msgid "Print Tasks"
 msgstr "Напечатать задания"
 
@@ -8098,7 +8132,7 @@ msgstr "Перемещение сообщений"
 msgid "Copying messages"
 msgstr "Копирование сообщений в %s"
 
-#: camel/camel-gpg-context.c:705
+#: camel/camel-gpg-context.c:713
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8106,47 +8140,47 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:719
+#: camel/camel-gpg-context.c:727
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:750
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:761 camel/camel-gpg-context.c:1220
-#: camel/camel-gpg-context.c:1326 camel/camel-gpg-context.c:1401
-#: camel/camel-gpg-context.c:1457 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:769 camel/camel-gpg-context.c:1228
+#: camel/camel-gpg-context.c:1336 camel/camel-gpg-context.c:1411
+#: camel/camel-gpg-context.c:1469 mail/mail-send-recv.c:540
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: camel/camel-gpg-context.c:779
+#: camel/camel-gpg-context.c:787
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:785
+#: camel/camel-gpg-context.c:793
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от сервера POP: %s"
 
-#: camel/camel-gpg-context.c:795
+#: camel/camel-gpg-context.c:803
 #, fuzzy
 msgid "No data provided"
 msgstr "Не указано имя файла."
 
-#: camel/camel-gpg-context.c:840
+#: camel/camel-gpg-context.c:848
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Невозможно зашифровать это сообщение: не определены получатели"
 
-#: camel/camel-gpg-context.c:1095
+#: camel/camel-gpg-context.c:1103
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s message: %s\n"
@@ -8154,18 +8188,24 @@ msgid ""
 "%.*s"
 msgstr "Сбой при кэшировании сообщения %s: %s"
 
-#: camel/camel-gpg-context.c:1101
+#: camel/camel-gpg-context.c:1109
 #, fuzzy, c-format
 msgid "Failed to GPG %s message: %s\n"
 msgstr "Сбой при кэшировании сообщения %s: %s"
 
-#: camel/camel-gpg-context.c:1211 camel/camel-gpg-context.c:1318
-#: camel/camel-gpg-context.c:1392 camel/camel-gpg-context.c:1448
+#: camel/camel-gpg-context.c:1219
+#, fuzzy, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Не удалось декодировать сообщение."
+
+#: camel/camel-gpg-context.c:1249 camel/camel-gpg-context.c:1328
+#: camel/camel-gpg-context.c:1402 camel/camel-gpg-context.c:1432
+#: camel/camel-gpg-context.c:1460 camel/camel-gpg-context.c:1490
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Не удалось декодировать сообщение."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1313
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8412,7 +8452,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1002
+#: camel/providers/imap/camel-imap-store.c:1051
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при аутентификации."
 
@@ -8534,7 +8574,7 @@ msgstr "Для чтения почты по запросу к другому набору папок"
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:536
+#: camel/camel-session.c:545
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8580,11 +8620,11 @@ msgstr "Не удалось декодировать сообщение."
 msgid "Failed to verify certificates."
 msgstr "Не удалось проверить сертификаты."
 
-#: camel/camel-store.c:241
+#: camel/camel-store.c:244
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не удалось получить папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:303
+#: camel/camel-store.c:306
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удалось создать папку: недопустимая операция в этом хранилище"
 
@@ -8805,77 +8845,105 @@ msgstr "Не удалось переименовать папку: %s: недопустимая операция"
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удалось переименовать папку: %s: нет такой папки"
 
-#: camel/providers/imap/camel-imap-command.c:220
-#: camel/providers/imap/camel-imap-command.c:259
-#: camel/providers/imap/camel-imap-command.c:438
-#: camel/providers/imap/camel-imap-store.c:2404
+#: camel/providers/imap/camel-imap-command.c:223
+#: camel/providers/imap/camel-imap-command.c:262
+#: camel/providers/imap/camel-imap-command.c:441
+#: camel/providers/imap/camel-imap-store.c:2578
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
-#: camel/providers/imap/camel-imap-command.c:304
-#: camel/providers/imap/camel-imap-store.c:2407
+#: camel/providers/imap/camel-imap-command.c:307
+#: camel/providers/imap/camel-imap-store.c:2581
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
 
-#: camel/providers/imap/camel-imap-command.c:382
+#: camel/providers/imap/camel-imap-command.c:385
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:395
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-command.c:450
 msgid "Server response ended too soon."
 msgstr "Не полный ответ сервера."
 
-#: camel/providers/imap/camel-imap-command.c:636
+#: camel/providers/imap/camel-imap-command.c:642
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ответ сервера IMAP не содержит информации о %s"
 
-#: camel/providers/imap/camel-imap-command.c:672
+#: camel/providers/imap/camel-imap-command.c:678
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неожиданный ответ \"OK\" от сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:220
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не удалось создать каталог %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:239
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не удалось загрузить краткую информацию о %s"
 
-#: camel/providers/imap/camel-imap-folder.c:304
+#: camel/providers/imap/camel-imap-folder.c:305
 msgid "Folder was destroyed and recreated on server."
 msgstr "Папка была уничтожена и заново создана на сервере."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:535
+#: camel/providers/imap/camel-imap-folder.c:547
 msgid "Scanning for changed messages"
 msgstr "Поиск изменённых сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1909
-#: camel/providers/imap/camel-imap-folder.c:2406
+#: camel/providers/imap/camel-imap-folder.c:1868
+#, fuzzy, c-format
+msgid "Unable to retrieve message: %s"
+msgstr "Не удалось получить сообщение"
+
+#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:224
+#: camel/providers/local/camel-maildir-folder.c:233
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:210
+#: camel/providers/local/camel-mh-folder.c:218
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Невозможно получить сообщение: %s\n"
+"  %s"
+
+#: camel/providers/imap/camel-imap-folder.c:1904
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mh-folder.c:201
+msgid "No such message"
+msgstr "Нет такого сообщения"
+
+#: camel/providers/imap/camel-imap-folder.c:1927
+#: camel/providers/imap/camel-imap-folder.c:2424
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
-#: camel/providers/imap/camel-imap-folder.c:2066
-#: camel/providers/imap/camel-imap-folder.c:2143
+#: camel/providers/imap/camel-imap-folder.c:2084
+#: camel/providers/imap/camel-imap-folder.c:2161
 msgid "Fetching summary information for new messages"
 msgstr "Получение краткой информации по новым сообщениям "
 
-#: camel/providers/imap/camel-imap-folder.c:2072
+#: camel/providers/imap/camel-imap-folder.c:2090
 msgid "Scanning for new messages"
 msgstr "Поиск новых сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:2443
+#: camel/providers/imap/camel-imap-folder.c:2461
 msgid "Could not find message body in FETCH response."
 msgstr "Не удалось найти тело сообщения в ответе на команду FETCH."
 
@@ -8900,7 +8968,7 @@ msgstr "Проверка новой почты"
 msgid "Check for new messages in all folders"
 msgstr "Проверять новую почту во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1043
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1044
 msgid "Folders"
 msgstr "Папки"
 
@@ -8931,7 +8999,7 @@ msgstr "Для чтения и хранения почты на серверах IMAP."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
 msgid "Password"
 msgstr "Пароль"
 
@@ -8941,74 +9009,74 @@ msgstr ""
 "Подключение к серверу IMAP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/imap/camel-imap-store.c:433
+#: camel/providers/imap/camel-imap-store.c:456
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/imap/camel-imap-store.c:435
+#: camel/providers/imap/camel-imap-store.c:458
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s сервис для %s на %s"
 
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:583
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:180
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
-#: camel/providers/imap/camel-imap-store.c:557
+#: camel/providers/imap/camel-imap-store.c:586
 #: camel/providers/nntp/camel-nntp-store.c:133
 #: camel/providers/smtp/camel-smtp-transport.c:276
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:616
-#: camel/providers/imap/camel-imap-store.c:647
+#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:676
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Не удалось подключиться к серверу SMTP %s в защищенном режиме: %s"
 
-#: camel/providers/imap/camel-imap-store.c:617
+#: camel/providers/imap/camel-imap-store.c:646
 #: camel/providers/pop3/camel-pop3-store.c:213
 msgid "SSL/TLS extension not supported."
 msgstr "Расширение SSL/TLS не поддерживается."
 
-#: camel/providers/imap/camel-imap-store.c:648
+#: camel/providers/imap/camel-imap-store.c:677
 #: camel/providers/pop3/camel-pop3-store.c:254
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Сбой аутентификации."
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:940
 #, fuzzy, c-format
 msgid "The folder %s no longer exists"
 msgstr "Папка не пуста"
 
-#: camel/providers/imap/camel-imap-store.c:1025
+#: camel/providers/imap/camel-imap-store.c:1074
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:1035
-#: camel/providers/smtp/camel-smtp-transport.c:476
+#: camel/providers/imap/camel-imap-store.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:479
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Аутентификация %s не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:1059
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1074
-#: camel/providers/smtp/camel-smtp-transport.c:517
+#: camel/providers/imap/camel-imap-store.c:1123
+#: camel/providers/smtp/camel-smtp-transport.c:520
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1103
+#: camel/providers/imap/camel-imap-store.c:1152
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9019,19 +9087,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1426
-#: camel/providers/imap/camel-imap-store.c:1563
+#: camel/providers/imap/camel-imap-store.c:1450
+#: camel/providers/imap/camel-imap-store.c:1592
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1750
+#: camel/providers/imap/camel-imap-store.c:1793
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Название папки не может содержать символ возврата каретки."
 
-#: camel/providers/imap/camel-imap-store.c:1788
+#: camel/providers/imap/camel-imap-store.c:1805
+#, fuzzy, c-format
+msgid "Unknown parent folder: %s"
+msgstr "Неизвестная ошибка: %s"
+
+#: camel/providers/imap/camel-imap-store.c:1841
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Эта папка не может содержать подпапки"
 
@@ -9173,27 +9246,6 @@ msgstr "Добавление сообщения к папке почтового каталога отменено"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Невозможно получить сообщение: %s\n"
-"  %s"
-
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:348
-#: camel/providers/local/camel-mh-folder.c:201
-msgid "No such message"
-msgstr "Нет такого сообщения"
-
 #: camel/providers/local/camel-maildir-folder.c:234
 #: camel/providers/local/camel-mh-folder.c:219
 msgid "Invalid message contents"
@@ -9282,18 +9334,18 @@ msgstr "Невозможно заблокировать папку %s: %s"
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Невозможно открыть почтовый ящик: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:275
+#: camel/providers/local/camel-mbox-folder.c:274
 msgid "Mail append cancelled"
 msgstr "Добавление почты отменено"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:277
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Невозможно добавить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:366
-#: camel/providers/local/camel-mbox-folder.c:397
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:396
+#: camel/providers/local/camel-mbox-folder.c:404
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9302,11 +9354,11 @@ msgstr ""
 "Невозможно получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:398
+#: camel/providers/local/camel-mbox-folder.c:397
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:406
+#: camel/providers/local/camel-mbox-folder.c:405
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой при создании сообщения: почтовый ящик поврежден?"
 
@@ -9411,12 +9463,13 @@ msgstr "Неизвестная ошибка: %s"
 msgid "Could not store folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:974
+#: camel/providers/local/camel-mbox-summary.c:976
+#: camel/providers/local/camel-mbox-summary.c:1001
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:991
+#: camel/providers/local/camel-mbox-summary.c:993
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
@@ -9624,7 +9677,7 @@ msgstr "Сохранять сообщения на сервере"
 msgid "Delete after %s day(s)"
 msgstr "Удалять через %s дней"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:83
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
 msgid "POP"
 msgstr "POP"
 
@@ -9714,7 +9767,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9766,7 +9819,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:100
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -9883,37 +9936,37 @@ msgstr "Требуется аутентификация"
 msgid "Welcome response error"
 msgstr "Ошибка при ответе на 'QUIT'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
-#: camel/providers/smtp/camel-smtp-transport.c:382
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:385
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Не удалось подключиться к серверу SMTP %s в защищенном режиме: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:341
+#: camel/providers/smtp/camel-smtp-transport.c:344
 msgid "server does not appear to support SSL"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:355
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:370
+#: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "Ошибка при ответе на 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:466
+#: camel/providers/smtp/camel-smtp-transport.c:469
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP сервер %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:504
+#: camel/providers/smtp/camel-smtp-transport.c:507
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль SMTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:525
+#: camel/providers/smtp/camel-smtp-transport.c:528
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -9924,89 +9977,89 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:658
+#: camel/providers/smtp/camel-smtp-transport.c:661
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:660
+#: camel/providers/smtp/camel-smtp-transport.c:663
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Доставка SMTP почты через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:678
+#: camel/providers/smtp/camel-smtp-transport.c:681
 msgid "Cannot send message: sender address not valid."
 msgstr "Невозможно отправить сообщение: неверный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:683 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:686 mail/mail-ops.c:622
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: camel/providers/smtp/camel-smtp-transport.c:697
+#: camel/providers/smtp/camel-smtp-transport.c:700
 msgid "Cannot send message: no recipients defined."
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:707
+#: camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Невозможно отправить сообщение: один или более неправильных получателей"
 
-#: camel/providers/smtp/camel-smtp-transport.c:861
+#: camel/providers/smtp/camel-smtp-transport.c:866
 msgid "SMTP Greeting"
 msgstr "Приветствие SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:892
+#: camel/providers/smtp/camel-smtp-transport.c:912
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "Превышено время ожидания ответа на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:913
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy
 msgid "HELO response error"
 msgstr "Ошибка при ответе на 'RSET'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:979
+#: camel/providers/smtp/camel-smtp-transport.c:1000
 msgid "SMTP Authentication"
 msgstr "Аутентификация SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:985
+#: camel/providers/smtp/camel-smtp-transport.c:1006
 msgid "Error creating SASL authentication object."
 msgstr "Ошибка при создании объекта аутентификации SASL."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1002
-#: camel/providers/smtp/camel-smtp-transport.c:1014
+#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1035
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1023
+#: camel/providers/smtp/camel-smtp-transport.c:1044
 msgid "AUTH request failed."
 msgstr "Ошибка запроса AUTH."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1084
+#: camel/providers/smtp/camel-smtp-transport.c:1105
 msgid "Bad authentication response from server.\n"
 msgstr "Неверный ответ от сервера при аутентификации.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1130
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1129
+#: camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "MAIL FROM response error"
 msgstr "Ошибка при ответе на 'MAIL FROM'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1174
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1175
+#: camel/providers/smtp/camel-smtp-transport.c:1196
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "Сбой 'RCPT TO <%s>'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1217
+#: camel/providers/smtp/camel-smtp-transport.c:1238
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на 'DATA': %s: почта не отправлена"
@@ -10014,36 +10067,36 @@ msgstr "Превышено время ожидания ответа на 'DATA': %s: почта не отправлена"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1237
+#: camel/providers/smtp/camel-smtp-transport.c:1258
 msgid "DATA response error"
 msgstr "Ошибка при ответе на 'DATA'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1277
-#: camel/providers/smtp/camel-smtp-transport.c:1300
+#: camel/providers/smtp/camel-smtp-transport.c:1298
+#: camel/providers/smtp/camel-smtp-transport.c:1321
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1320
+#: camel/providers/smtp/camel-smtp-transport.c:1341
 msgid "DATA termination response error"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1343
+#: camel/providers/smtp/camel-smtp-transport.c:1364
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Превышено время ожидания ответа на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1363
+#: camel/providers/smtp/camel-smtp-transport.c:1384
 msgid "RSET response error"
 msgstr "Ошибка при ответе на 'RSET'"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1386
+#: camel/providers/smtp/camel-smtp-transport.c:1407
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1406
+#: camel/providers/smtp/camel-smtp-transport.c:1427
 msgid "QUIT response error"
 msgstr "Ошибка при ответе на 'QUIT'"
 
@@ -10116,7 +10169,7 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предполагать автоматическое отображение присоединённого файла"
 
-#: composer/e-msg-composer-hdrs.c:344
+#: composer/e-msg-composer-hdrs.c:347
 msgid "Click here for the address book"
 msgstr "Щёлкните здесь чтобы создать адресную книгу"
 
@@ -10127,45 +10180,45 @@ msgstr "Щёлкните здесь чтобы создать адресную книгу"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:378
+#: composer/e-msg-composer-hdrs.c:382
 msgid "Reply-To:"
 msgstr "Ответить:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:393
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:395
+#: composer/e-msg-composer-hdrs.c:399
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:409
+#: composer/e-msg-composer-hdrs.c:413
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:410
+#: composer/e-msg-composer-hdrs.c:414
 msgid "Enter the recipients of the message"
 msgstr "Перечислите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:413
+#: composer/e-msg-composer-hdrs.c:417
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:414
+#: composer/e-msg-composer-hdrs.c:418
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адресатов, которые получат копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:421
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:418
+#: composer/e-msg-composer-hdrs.c:422
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10176,11 +10229,16 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:425
+#: composer/e-msg-composer-hdrs.c:429
 #, fuzzy
 msgid "Post To:"
 msgstr "Перейти к"
 
+#: composer/e-msg-composer-hdrs.c:431
+#, fuzzy
+msgid "Posting destination"
+msgstr "Нет описания"
+
 #: composer/e-msg-composer-select-file.c:274
 #: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
@@ -10200,34 +10258,34 @@ msgstr ""
 "Ошибка при чтении файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1157
+#: composer/e-msg-composer.c:1155
 msgid "Warning!"
 msgstr "Предупреждение!"
 
-#: composer/e-msg-composer.c:1161
+#: composer/e-msg-composer.c:1159
 msgid "File exists, overwrite?"
 msgstr "Файл существует, перезаписать?"
 
-#: composer/e-msg-composer.c:1183
+#: composer/e-msg-composer.c:1181
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:1203
+#: composer/e-msg-composer.c:1201
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:1236
+#: composer/e-msg-composer.c:1234
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Ошибка доступа к файлу: %s"
 
-#: composer/e-msg-composer.c:1244
+#: composer/e-msg-composer.c:1242
 msgid "Unable to retrieve message from editor"
 msgstr "Не удалось получить сообщение от редактора"
 
-#: composer/e-msg-composer.c:1251
+#: composer/e-msg-composer.c:1249
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10236,7 +10294,7 @@ msgstr ""
 "Не удалось переместиться по файлу: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1258
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10245,7 +10303,7 @@ msgstr ""
 "Не удалось усечь файл: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1267
+#: composer/e-msg-composer.c:1265
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10254,7 +10312,7 @@ msgstr ""
 "Ошибка при автосохранении сообщения: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1367
+#: composer/e-msg-composer.c:1365
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10262,49 +10320,28 @@ msgstr ""
 "Обнаружены несохранённые файлы предыдущей сессии.\n"
 "Произвести попытку восстановления?"
 
-#: composer/e-msg-composer.c:1516
-msgid ""
-"This message has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Это сообщение не было отправлено.\n"
-"\n"
-"Сохранить изменения?"
-
-#: composer/e-msg-composer.c:1523
+#: composer/e-msg-composer.c:1530
 msgid "Warning: Modified Message"
 msgstr "Внимание: Изменённое сообщение"
 
-#: composer/e-msg-composer.c:1553
+#: composer/e-msg-composer.c:1563
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:1925
-msgid ""
-"Can't set default signature for this account. Maybe accounts were modified "
-"meanwhile?"
-msgstr ""
-
-#: composer/e-msg-composer.c:1962
+#: composer/e-msg-composer.c:1921
 #, fuzzy
 msgid "Signature:"
 msgstr "Подпись"
 
-#: composer/e-msg-composer.c:2003 mail/mail-account-gui.c:1230
+#: composer/e-msg-composer.c:1962 mail/mail-account-gui.c:1230
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2015
-#, fuzzy
-msgid "Set as default"
-msgstr " (основная)"
-
-#: composer/e-msg-composer.c:2192 composer/e-msg-composer.c:2797
+#: composer/e-msg-composer.c:2149 composer/e-msg-composer.c:2773
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:2814
+#: composer/e-msg-composer.c:2790
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10312,7 +10349,7 @@ msgstr ""
 "Не удалось создать окно редактора:\n"
 "Невозможно активировать управляющий элемент выбора адреса."
 
-#: composer/e-msg-composer.c:2840 composer/e-msg-composer.c:2895
+#: composer/e-msg-composer.c:2816 composer/e-msg-composer.c:2871
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10320,7 +10357,7 @@ msgstr ""
 "Не удалось создать окно редактора:\n"
 "Невозможно активировать компонент редактора HTML."
 
-#: composer/e-msg-composer.c:3846
+#: composer/e-msg-composer.c:3838
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10384,7 +10421,7 @@ msgstr "Тема содержит"
 msgid "Subject does not contain"
 msgstr "Тема не содержит"
 
-#: e-util/e-dialog-utils.c:228 mail/mail-callbacks.c:2508
+#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2509
 #: mail/mail-display.c:190
 msgid ""
 "A file by that name already exists.\n"
@@ -10411,92 +10448,92 @@ msgstr "Синхронизировать категории:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:353
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:178
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %d.%m.%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:183
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %d.%m.%Y %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:194
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d.%m.%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:198
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d.%m.%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d.%m.%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:208
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d.%m.%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:213
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%d.%m.%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:218
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:303 e-util/e-time-utils.c:402
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:307 e-util/e-time-utils.c:394
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:312 e-util/e-time-utils.c:399
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1647
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:316 e-util/e-time-utils.c:391
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1644
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:320
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:70 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:185
+#: mail/mail-config.glade.h:186
 msgid "seconds"
 msgstr "секунды"
 
@@ -10610,32 +10647,32 @@ msgstr ""
 "Ошибка в регулярном выражении \"%s\":\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:75
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:76
+#: mail/mail-config.glade.h:63
 msgid "Important"
 msgstr "Важное"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:76
-#: mail/mail-config.glade.h:135
+#: filter/filter-label.c:137 mail/mail-config.c:77
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Work"
 msgstr "Обработка"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:77 mail/mail-config.glade.h:85
+#: filter/filter-label.c:138 mail/mail-config.c:78 mail/mail-config.glade.h:86
 msgid "Personal"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:78
-#: mail/mail-config.glade.h:126
+#: filter/filter-label.c:139 mail/mail-config.c:79
+#: mail/mail-config.glade.h:127
 #, fuzzy
 msgid "To Do"
 msgstr "Того"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:79 mail/mail-config.glade.h:66
+#: filter/filter-label.c:140 mail/mail-config.c:80 mail/mail-config.glade.h:67
 #, fuzzy
 msgid "Later"
 msgstr "после"
@@ -10902,7 +10939,7 @@ msgstr "не является"
 msgid "is not Flagged"
 msgstr "не является"
 
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1715
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1754
 msgid "Label"
 msgstr "метка"
 
@@ -10966,7 +11003,7 @@ msgstr "меньше чем"
 msgid "Score"
 msgstr "Вес"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1799
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1805
 msgid "Sender"
 msgstr "Отправитель"
 
@@ -11003,7 +11040,7 @@ msgstr "начинается с"
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:908
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:928
 #: mail/message-list.etspec.h:13
 msgid "Subject"
 msgstr "Тема"
@@ -11070,7 +11107,7 @@ msgstr "Сканирование %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2127
 #: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:327
+#: mail/folder-browser-ui.c:339
 msgid "Mail"
 msgstr "Почта"
 
@@ -11136,7 +11173,7 @@ msgid "Evolution is importing your old Netscape data"
 msgstr "Импортирование информации из Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1871 mail/mail-ops.c:1091
+#: importers/netscape-importer.c:1871 mail/mail-ops.c:1101
 #: shell/e-local-storage.c:183
 msgid "Trash"
 msgstr "Мусор"
@@ -11210,65 +11247,68 @@ msgid "Configuration control for the Evolution Message Composer."
 msgstr "Фабрика для редактора почты программы Evolution."
 
 #: mail/GNOME_Evolution_Mail.oaf.in.h:6
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#, fuzzy
+msgid "Configure the fonts used by Evolution here"
+msgstr "Фабрика для редактора почты программы Evolution."
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Создать или исправить учётную запись почты и другие настройки"
+
+#: mail/GNOME_Evolution_Mail.oaf.in.h:10
 msgid "Evolution component for handling mail."
 msgstr "Компонент Evolution для обработки почты."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.oaf.in.h:11
 msgid "Evolution mail composer."
 msgstr "Компонент редактора писем Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.oaf.in.h:12
 msgid "Evolution mail executive summary component."
 msgstr "Компонент Executive Summary программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:13
 msgid "Evolution mail folder display component."
 msgstr "Компонент отображения почтовой папки программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.oaf.in.h:14
 msgid "Evolution mail folder factory component."
 msgstr "Компонент фабрики почтовой папки программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.oaf.in.h:15
 msgid "Factory for the Evolution composer."
 msgstr "Фабрика для редактора почты программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.oaf.in.h:16
 msgid "Factory for the Mail Summary component."
 msgstr "Фабрика для компонента Mail Summary программы Evolution."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.oaf.in.h:17
 msgid "Font Preferences"
 msgstr "Настройки шрифтов"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
+#: mail/GNOME_Evolution_Mail.oaf.in.h:18
 msgid "Mail Accounts"
 msgstr "Учётные записи"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:70
 msgid "Mail Preferences"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
+#: mail/GNOME_Evolution_Mail.oaf.in.h:20
 msgid "Mail configuration interface"
 msgstr "Интерфейс настройки почты"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
-msgid "This Page can be used to configure the Fonts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
-msgid "This page can be used to configure E-Mail Accounts"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19
-msgid "This page can be used to configure Mailer preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
-msgid "This page can be used to configure the Composer"
-msgstr ""
-
 #: mail/component-factory.c:102
 msgid "Folder containing mail"
 msgstr "Папка, содержащая почту"
@@ -11293,7 +11333,7 @@ msgstr "Свойства..."
 msgid "Change this folder's properties"
 msgstr "Изменить свойства этой папки"
 
-#: mail/component-factory.c:763
+#: mail/component-factory.c:785
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11301,246 +11341,246 @@ msgstr ""
 "Некоторые Ваши почтовые настройки выглядят испорченными, пожалуйста, "
 "проверьте, что всё в порядке."
 
-#: mail/component-factory.c:928
+#: mail/component-factory.c:950
 msgid "You have not set a mail transport method"
 msgstr "Вы не установили метод транспортировки почты"
 
-#: mail/component-factory.c:950
+#: mail/component-factory.c:972
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:956
+#: mail/component-factory.c:978
 #, fuzzy
 msgid "Warning: Unsent Messages"
 msgstr "Внимание: Изменённое сообщение"
 
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1020
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/component-factory.c:997
+#: mail/component-factory.c:1020
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/component-factory.c:998
+#: mail/component-factory.c:1021
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Создать сообщение"
 
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1029
 #, fuzzy
 msgid "New Message Post"
 msgstr "Создать сообщение"
 
-#: mail/component-factory.c:1006
+#: mail/component-factory.c:1029
 #, fuzzy
 msgid "_Post Message"
 msgstr "Предыдущему сообщению"
 
-#: mail/component-factory.c:1007
+#: mail/component-factory.c:1030
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/component-factory.c:1035
+#: mail/component-factory.c:1058
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент Evolution."
 
-#: mail/component-factory.c:1044
+#: mail/component-factory.c:1067
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Невозможно инициализировать компонент настройки почты Evolution."
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1073
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Невозможно инициализировать компонент информации о папке Evolution."
 
-#: mail/component-factory.c:1275 mail/component-factory.c:1305
+#: mail/component-factory.c:1286 mail/component-factory.c:1316
 msgid "Connecting..."
 msgstr "Подключение..."
 
-#: mail/component-factory.c:1316
+#: mail/component-factory.c:1327
 msgid "Cannot register storage with shell"
 msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
 
-#: mail/folder-browser-ui.c:440
+#: mail/folder-browser-ui.c:457
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Свойства для \"%s\""
 
-#: mail/folder-browser-ui.c:442
+#: mail/folder-browser-ui.c:459
 msgid "Properties"
 msgstr "Свойства"
 
-#: mail/folder-browser.c:308 mail/mail-display.c:374 mail/mail-display.c:880
+#: mail/folder-browser.c:309 mail/mail-display.c:374 mail/mail-display.c:880
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:764
 #, c-format
 msgid "%d new"
 msgstr "Новых %d"
 
-#: mail/folder-browser.c:766 mail/folder-browser.c:774
-#: mail/folder-browser.c:777
+#: mail/folder-browser.c:767 mail/folder-browser.c:775
+#: mail/folder-browser.c:778
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:768
+#: mail/folder-browser.c:769
 #, c-format
 msgid "%d hidden"
 msgstr "Скрытых %d"
 
-#: mail/folder-browser.c:770
+#: mail/folder-browser.c:771
 #, c-format
 msgid "%d visible"
 msgstr ""
 
-#: mail/folder-browser.c:775
+#: mail/folder-browser.c:776
 #, c-format
 msgid "%d selected"
 msgstr "Выбраных %d"
 
-#: mail/folder-browser.c:780
+#: mail/folder-browser.c:781
 #, c-format
 msgid "%d unsent"
 msgstr "Неотправленных %d"
 
-#: mail/folder-browser.c:782
+#: mail/folder-browser.c:783
 #, c-format
 msgid "%d sent"
 msgstr "Отправленных %d"
 
-#: mail/folder-browser.c:784
+#: mail/folder-browser.c:785
 #, c-format
 msgid "%d total"
 msgstr "Всего %d"
 
-#: mail/folder-browser.c:1091
+#: mail/folder-browser.c:1107
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Создать виртуальную папку из сообщения"
 
-#: mail/folder-browser.c:1651
+#: mail/folder-browser.c:1690
 msgid "VFolder on _Subject"
 msgstr "Виртуальная папка по теме"
 
-#: mail/folder-browser.c:1652
+#: mail/folder-browser.c:1691
 msgid "VFolder on Se_nder"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/folder-browser.c:1653
+#: mail/folder-browser.c:1692
 msgid "VFolder on _Recipients"
 msgstr "Виртуальная папка по получателю"
 
-#: mail/folder-browser.c:1654
+#: mail/folder-browser.c:1693
 msgid "VFolder on Mailing _List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/folder-browser.c:1658
+#: mail/folder-browser.c:1697
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/folder-browser.c:1659
+#: mail/folder-browser.c:1698
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/folder-browser.c:1660
+#: mail/folder-browser.c:1699
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/folder-browser.c:1661 mail/folder-browser.c:1984
+#: mail/folder-browser.c:1700 mail/folder-browser.c:2023
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:1679
+#: mail/folder-browser.c:1718
 msgid "_Edit as New Message..."
 msgstr "Править как новое сообщение..."
 
-#: mail/folder-browser.c:1681
+#: mail/folder-browser.c:1720
 msgid "_Print"
 msgstr "Напечатать"
 
-#: mail/folder-browser.c:1685 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1724 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:1686 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1725 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Ответить в список"
 
-#: mail/folder-browser.c:1687 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1726 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:1688
+#: mail/folder-browser.c:1727
 msgid "_Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:1692
+#: mail/folder-browser.c:1731
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/folder-browser.c:1693
+#: mail/folder-browser.c:1732
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Выполнено"
 
-#: mail/folder-browser.c:1694
+#: mail/folder-browser.c:1733
 msgid "Cl_ear Flag"
 msgstr "Очистить флаг"
 
 #. separator here?
-#: mail/folder-browser.c:1698 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Пометить как прочитанное"
 
-#: mail/folder-browser.c:1699
+#: mail/folder-browser.c:1738
 msgid "Mark as _Unread"
 msgstr "Пометить как непрочитанное"
 
-#: mail/folder-browser.c:1700
+#: mail/folder-browser.c:1739
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/folder-browser.c:1701
+#: mail/folder-browser.c:1740
 msgid "_Mark as Unimportant"
 msgstr "Пометить как неважное"
 
-#: mail/folder-browser.c:1706
+#: mail/folder-browser.c:1745
 msgid "U_ndelete"
 msgstr "Восстановить"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1749
 msgid "Mo_ve to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/folder-browser.c:1711 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1750 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: mail/folder-browser.c:1719
+#: mail/folder-browser.c:1758
 msgid "Add Sender to Address_book"
 msgstr "Добавить отправителя в адресную книгу"
 
-#: mail/folder-browser.c:1723
+#: mail/folder-browser.c:1762
 msgid "Appl_y Filters"
 msgstr "Применить фильтры"
 
-#: mail/folder-browser.c:1727
+#: mail/folder-browser.c:1766
 msgid "Crea_te Rule From Message"
 msgstr "Создать правило из сообщения"
 
-#: mail/folder-browser.c:1985
+#: mail/folder-browser.c:2024
 msgid "VFolder on M_ailing List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/folder-browser.c:1987
+#: mail/folder-browser.c:2026
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:1988
+#: mail/folder-browser.c:2027
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "Виртуальная папка по списку рассылки (%s)"
@@ -11614,19 +11654,19 @@ msgstr "Вы не ввели всю необходимую информацию."
 msgid "Evolution Account Editor"
 msgstr "Редактор учётных записей Evolution"
 
-#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:159
+#: mail/mail-account-gui.c:742 mail/mail-config.glade.h:160
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:129
+#: mail/mail-account-gui.c:746 mail/mail-config.glade.h:130
 msgid "User_name:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:750 mail/mail-config.glade.h:168
 msgid "_Path:"
 msgstr "Путь:"
 
-#: mail/mail-account-gui.c:1843
+#: mail/mail-account-gui.c:1846
 msgid "You may not create two accounts with the same name."
 msgstr "Вы не можете создать две учётные записи с одинаковым именем."
 
@@ -11655,7 +11695,7 @@ msgid "Enable"
 msgstr "Включить"
 
 #: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:54
 msgid "Enabled"
 msgstr "Включено"
 
@@ -11707,7 +11747,7 @@ msgstr ""
 "    '%s'\n"
 "и была обновлена."
 
-#: mail/mail-callbacks.c:101
+#: mail/mail-callbacks.c:154
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11719,7 +11759,7 @@ msgstr ""
 "отправлять, принимать или редактировать почту.\n"
 "Вы хотите настроить это сейчас?"
 
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:203
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11727,7 +11767,7 @@ msgstr ""
 "Вы должны настроить пользователя\n"
 "до того, как сможете отправлять почту."
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:217
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11736,7 +11776,7 @@ msgstr ""
 "до того, как сможете отправлять почту."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:202
+#: mail/mail-callbacks.c:255
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
@@ -11744,11 +11784,11 @@ msgstr ""
 "Вы посылаете сообщение в HTML формате, но следующие получатели не хотят "
 "получать почту в HTML формате:\n"
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:270
 msgid "Send anyway?"
 msgstr "Всё же отправить?"
 
-#: mail/mail-callbacks.c:259
+#: mail/mail-callbacks.c:312
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11756,7 +11796,7 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Отправить его?"
 
-#: mail/mail-callbacks.c:303
+#: mail/mail-callbacks.c:356
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11764,11 +11804,11 @@ msgstr ""
 "Так как список получателей сконфигурирован на сокрытие адресов из списка, "
 "это сообщение будет содержать только получателей скрытой копии."
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:360
 msgid "This message contains only Bcc recipients."
 msgstr "Это сообщение содержит только получателей скрытой копии."
 
-#: mail/mail-callbacks.c:311
+#: mail/mail-callbacks.c:364
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11778,11 +11818,11 @@ msgstr ""
 "добавления Apparently-To заголовка.\n"
 "Всё равно отправить?"
 
-#: mail/mail-callbacks.c:475
+#: mail/mail-callbacks.c:513
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/mail-callbacks.c:739
+#: mail/mail-callbacks.c:776
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11790,28 +11830,28 @@ msgstr ""
 "Не удалось открыть папку черновиков для этой учетной записи.\n"
 "Хотите использовать папку черновиков по умолчанию?"
 
-#: mail/mail-callbacks.c:1154
+#: mail/mail-callbacks.c:1181
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
-#: mail/mail-callbacks.c:1158
+#: mail/mail-callbacks.c:1185
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr "В %a, %d.%m.%Y, в %H:%M, %%s написал:"
 
-#: mail/mail-callbacks.c:1680 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1686 mail/message-browser.c:132
 msgid "Move message(s) to"
 msgstr "Переместить сообщение(я) в"
 
-#: mail/mail-callbacks.c:1682 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1688 mail/message-browser.c:134
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщение(я) в"
 
-#: mail/mail-callbacks.c:2352
+#: mail/mail-callbacks.c:2353
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Вы уверены, что хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:2377
+#: mail/mail-callbacks.c:2378
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11819,7 +11859,7 @@ msgstr ""
 "Вы можете править только сообщения,\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:2416
+#: mail/mail-callbacks.c:2417
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11827,38 +11867,38 @@ msgstr ""
 "Вы можете переотправить сообщения\n"
 "только из папки \"Отправленные\"."
 
-#: mail/mail-callbacks.c:2430
+#: mail/mail-callbacks.c:2431
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Вы уверены, что хотите переотправить все %d сообщений?"
 
-#: mail/mail-callbacks.c:2456
+#: mail/mail-callbacks.c:2457
 msgid "No Message Selected"
 msgstr "Нет выбранных сообщений"
 
-#: mail/mail-callbacks.c:2501 mail/mail-display.c:186
+#: mail/mail-callbacks.c:2502 mail/mail-display.c:186
 msgid "Overwrite file?"
 msgstr "Перезаписать файл?"
 
-#: mail/mail-callbacks.c:2555
+#: mail/mail-callbacks.c:2556
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:2557
+#: mail/mail-callbacks.c:2558
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:2626
+#: mail/mail-callbacks.c:2627
 msgid "Go to next folder with unread messages?"
 msgstr "Перейти в следующую папку с непрочитанными сообщениями?"
 
-#: mail/mail-callbacks.c:2633
+#: mail/mail-callbacks.c:2634
 msgid ""
 "There are no more new messages in this folder.\n"
 "Would you like to go to the next folder?"
 msgstr ""
 
-#: mail/mail-callbacks.c:2876
+#: mail/mail-callbacks.c:2877
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -11870,7 +11910,7 @@ msgstr ""
 "\n"
 "Уничтожить эти сообщения?"
 
-#: mail/mail-callbacks.c:2989
+#: mail/mail-callbacks.c:2990
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11879,28 +11919,28 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3001
+#: mail/mail-callbacks.c:3002
 msgid "Filters"
 msgstr "Настройки фильтров"
 
-#: mail/mail-callbacks.c:3045
+#: mail/mail-callbacks.c:3046
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: mail/mail-callbacks.c:3098
+#: mail/mail-callbacks.c:3101
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/mail-callbacks.c:3125
+#: mail/mail-callbacks.c:3128
 msgid "US-Letter"
 msgstr "US-Letter"
 
-#: mail/mail-callbacks.c:3164
+#: mail/mail-callbacks.c:3169
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-callbacks.c:3335
+#: mail/mail-callbacks.c:3338
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Вы уверены что хотите открыть все %d сообщений в отдельных окнах?"
@@ -11921,7 +11961,7 @@ msgstr "Нет описания"
 msgid "Please specify a valid script name"
 msgstr ""
 
-#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2909
+#: mail/mail-composer-prefs.c:317 mail/mail-config.c:2933
 #, fuzzy
 msgid "Unnamed"
 msgstr "Безымянный контакт"
@@ -11992,20 +12032,20 @@ msgstr ""
 "название будет использовано только для отображения."
 
 #. set window title
-#: mail/mail-config-druid.c:632
+#: mail/mail-config-druid.c:633
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учётным записям Evolution"
 
-#: mail/mail-config.c:632
+#: mail/mail-config.c:635
 #, fuzzy, c-format
 msgid "Account %d"
 msgstr "Редактор учётных записей"
 
-#: mail/mail-config.c:2629
+#: mail/mail-config.c:2653
 msgid "Checking Service"
 msgstr "Проверка сервиса"
 
-#: mail/mail-config.c:2707 mail/mail-config.c:2711
+#: mail/mail-config.c:2731 mail/mail-config.c:2735
 msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
@@ -12172,299 +12212,303 @@ msgstr "Цифровые ID..."
 msgid "Do not quote original message"
 msgstr "Невозможно открыть сообщение"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:46
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgstr ""
+
+#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Сделано"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:48
 msgid "Drafts _folder:"
 msgstr "Папка черновиков:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:49
 msgid "E_nable"
 msgstr "Включить"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:50
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:51
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Эл.адрес содержит"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:52
 msgid "Email _address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:53
 msgid "Empty _trash folders on exit"
 msgstr "Очищать мусорную корзину при выходе"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Fi_xed -width:"
 msgstr "заканчивается на"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:57
 msgid "Font Properties"
 msgstr "Свойства шрифтов"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:59
 msgid "Get Digital ID..."
 msgstr "Получить цифровой идентификатор..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:60
 msgid "Highlight _quotations with"
 msgstr "Выделять цитаты с помощью"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:61
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:62 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Подлинность"
 
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:64
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:65
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:66
 msgid "Labels and Colors"
 msgstr "Метки и цвета"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:68
 msgid "Loading Images"
 msgstr "Загрузить изображения"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:69
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:71
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Message Composer"
 msgstr "Заголовок сообщения"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:73
 #, fuzzy
 msgid "Message Display"
 msgstr "Отображение сообщения"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:74
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Извещение о новой почте"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 msgid "On Screen fonts"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:80
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:82
 msgid "Or_ganization:"
 msgstr "Организация:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "ID ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:87
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Предупреждать при отправке сообщений, в которых определены только получатели "
 "скрытой копии."
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:90
 #, fuzzy
 msgid "Printed Fonts"
 msgstr "Напечатать выбранные контакты"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 #, fuzzy
 msgid "Quote original message"
 msgstr "Невозможно открыть сообщение"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Re_member this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_ply-To:"
 msgstr "Ответить:"
 
-#: mail/mail-config.glade.h:95 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:96
+#: mail/mail-config.glade.h:97
 msgid "Receiving _Options"
 msgstr "Параметры получения"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Remember this _password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 #, fuzzy
 msgid "Restore Defaults"
 msgstr "Сделать основной"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "S_ecurity"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "Secure MIME (S/MIME)"
 msgstr "Безопасный MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "Select PGP program"
 msgstr "Выбрать программу PGP"
 
-#: mail/mail-config.glade.h:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Сервер требует идентификации"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Shortcuts _type:"
 msgstr "Ярлыки"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Signature #1"
 msgstr "Подпись"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
 #, fuzzy
 msgid "Signature #2"
 msgstr "Подпись"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
 msgid "Specify _filename:"
 msgstr "Указать имя файла:"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Spell Checking Language"
 msgstr "Проверка орфографии"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Spell _Checking"
 msgstr "Проверка орфографии"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:122
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:126
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:128
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:131
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Переменная"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:132
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12474,186 +12518,186 @@ msgstr ""
 "\n"
 "Нажмите \"След.\" для начала."
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:137
 msgid "XEmacs"
 msgstr "XEmacs"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Подписи"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:140
 msgid "_Always load images off the net"
 msgstr "Всегда загружать изображения"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:141
 msgid "_Always sign outgoing messages when using this account"
 msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:142
 msgid "_Authentication Type: "
 msgstr "Тип аутентификации: "
 
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:143
 msgid "_Authentication type: "
 msgstr "Тип аутентификации: "
 
-#: mail/mail-config.glade.h:143
+#: mail/mail-config.glade.h:144
 msgid "_Automatically check for new mail"
 msgstr "Автоматически проверять новую почту"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:145
 #, fuzzy
 msgid "_Automatically insert smiley images"
 msgstr "Автоматически проверять новую почту"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:146
 msgid "_Beep when new mail arrives"
 msgstr "Гудок по прибытии новой почты"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:147
 msgid "_Certificate ID:"
 msgstr "Идентификатор сертификата:"
 
-#: mail/mail-config.glade.h:147
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "_Confirm when expunging a folder"
 msgstr "Подтверждать уничтожении сообщений, помеченных как удалённые, в папке"
 
-#: mail/mail-config.glade.h:148
+#: mail/mail-config.glade.h:149
 #, fuzzy
 msgid "_Default signature:"
 msgstr "Файл подписи в текстовом формате "
 
-#: mail/mail-config.glade.h:149
+#: mail/mail-config.glade.h:150
 #, fuzzy
 msgid "_Defaults"
 msgstr "Сделать основной"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:152
 msgid "_Do not notify me when new mail arrives"
 msgstr "Не предупреждать при приходе новой почты"
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:154
 #, fuzzy
 msgid "_Enable"
 msgstr "Включить"
 
-#: mail/mail-config.glade.h:154
+#: mail/mail-config.glade.h:155
 msgid "_Fixed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:155
+#: mail/mail-config.glade.h:156
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Переслать как"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:157
 msgid "_Full name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:159
 msgid "_HTML Mail"
 msgstr "Почта в формате HTML"
 
-#: mail/mail-config.glade.h:160
+#: mail/mail-config.glade.h:161
 msgid "_Identity"
 msgstr "Подлинность"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:162
 msgid "_Load images if sender is in addressbook"
 msgstr "Загружать изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:163
 msgid "_Make this my default account"
 msgstr "Сделать моей основной учётной записью"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:164
 msgid "_Mark messages as read after"
 msgstr "Помечать сообщения как \"Прочитанные\" после:"
 
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:165
 msgid "_Name:"
 msgstr "Имя:"
 
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:166
 msgid "_Never load images off the net"
 msgstr "Никогда не загружать изображения"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:167
 msgid "_PGP binary path:"
 msgstr "Путь к программе PGP:"
 
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Play sound file when new mail arrives"
 msgstr "Воспроизвести звуковой файл по прибытии новой почты"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:171
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Предупреждать при отправке сообщений с пустой темой"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Receiving Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Ответить всем"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Restore defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Script:"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:175 ui/evolution-message-composer.xml.h:48
+#: mail/mail-config.glade.h:176 ui/evolution-message-composer.xml.h:48
 msgid "_Security"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Sending Mail"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Показать анимированные изображения"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Signatures"
 msgstr "Подписи"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use secure connection (SSL):"
 msgstr "Использовать защищенное соединение (SSL)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "_Variable-width:"
 msgstr "Переменная"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "_every"
 msgstr "каждые"
 
-#: mail/mail-config.glade.h:182
+#: mail/mail-config.glade.h:183
 msgid "color"
 msgstr "цвет"
 
-#: mail/mail-config.glade.h:183
+#: mail/mail-config.glade.h:184
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-config.glade.h:186
+#: mail/mail-config.glade.h:187
 msgid "xxxxxxxxxxxxxxxxxxxx"
 msgstr ""
 
@@ -12722,121 +12766,126 @@ msgstr "Загрузить изображения"
 msgid "Loading message content"
 msgstr "Загрузка содержимого сообщения"
 
-#: mail/mail-display.c:1741
+#: mail/mail-display.c:1756
 #, fuzzy
 msgid "Overdue:"
 msgstr "Просроченные задачи:"
 
-#: mail/mail-display.c:1745
+#: mail/mail-display.c:1760
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "%b %d %l:%M %p"
 
-#: mail/mail-display.c:1747
+#: mail/mail-display.c:1762
 msgid "at your earliest convenience"
 msgstr ""
 
-#: mail/mail-display.c:2069
+#: mail/mail-display.c:2084
 msgid "Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/mail-display.c:2070
+#: mail/mail-display.c:2085
 msgid "Copy Link Location"
 msgstr "Скопировать ссылку"
 
-#: mail/mail-display.c:2072
+#: mail/mail-display.c:2087
 msgid "Save Link as (FIXME)"
 msgstr "Сохранить ссылку как"
 
-#: mail/mail-display.c:2074
+#: mail/mail-display.c:2089
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: mail/mail-format.c:626
+#: mail/mail-folder-cache.c:743
+#, fuzzy, c-format
+msgid "Pinging %s"
+msgstr "Сканирование %s"
+
+#: mail/mail-format.c:646
 #, c-format
 msgid "%s attachment"
 msgstr "%s присоединённый файл"
 
-#: mail/mail-format.c:672
+#: mail/mail-format.c:692
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
 
-#: mail/mail-format.c:756 mail/message-list.etspec.h:2
+#: mail/mail-format.c:776 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:843
+#: mail/mail-format.c:863
 msgid "Bad Address"
 msgstr "Неверный эл.адрес"
 
-#: mail/mail-format.c:886 mail/message-list.etspec.h:7
+#: mail/mail-format.c:906 mail/message-list.etspec.h:7
 msgid "From"
 msgstr "От"
 
-#: mail/mail-format.c:890
+#: mail/mail-format.c:910
 msgid "Reply-To"
 msgstr "Ответить"
 
-#: mail/mail-format.c:895 mail/message-list.etspec.h:14
+#: mail/mail-format.c:915 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Кому"
 
-#: mail/mail-format.c:900
+#: mail/mail-format.c:920
 msgid "Cc"
 msgstr "Копия"
 
-#: mail/mail-format.c:905
+#: mail/mail-format.c:925
 msgid "Bcc"
 msgstr "Скр.копия:"
 
-#: mail/mail-format.c:936
+#: mail/mail-format.c:956
 msgid "Mailer"
 msgstr "Почтовый клиент: "
 
-#: mail/mail-format.c:1808
+#: mail/mail-format.c:1840
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 
-#: mail/mail-format.c:1835
+#: mail/mail-format.c:1867
 #, fuzzy
 msgid "Could not create a PGP verfication context"
 msgstr "Не удалось создать контекст проверки PGP"
 
-#: mail/mail-format.c:1844
+#: mail/mail-format.c:1876
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:1852
+#: mail/mail-format.c:1884
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr ""
 
-#: mail/mail-format.c:2102
+#: mail/mail-format.c:2134
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/mail-format.c:2116
+#: mail/mail-format.c:2148
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
 
-#: mail/mail-format.c:2121
+#: mail/mail-format.c:2153
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: mail/mail-format.c:2150
+#: mail/mail-format.c:2182
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на удалённые данные (%s)"
 
-#: mail/mail-format.c:2158
+#: mail/mail-format.c:2190
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: mail/mail-format.c:2163
+#: mail/mail-format.c:2195
 msgid "Malformed external-body part."
 msgstr "Часть external-body неверно сформирована"
 
@@ -12963,59 +13012,59 @@ msgstr "Перемещение сообщений в %s"
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1051
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: mail/mail-ops.c:1224
+#: mail/mail-ops.c:1234
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1267
+#: mail/mail-ops.c:1277
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1339
+#: mail/mail-ops.c:1349
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1412
+#: mail/mail-ops.c:1422
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1557
+#: mail/mail-ops.c:1567
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1603
 msgid "Expunging folder"
 msgstr "Очищение папки"
 
-#: mail/mail-ops.c:1642
+#: mail/mail-ops.c:1652
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1714
+#: mail/mail-ops.c:1724
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получение %d сообщений"
 
-#: mail/mail-ops.c:1800
+#: mail/mail-ops.c:1810
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1912
+#: mail/mail-ops.c:1922
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13024,7 +13073,7 @@ msgstr ""
 "Невозможно создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1940
+#: mail/mail-ops.c:1950
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13033,11 +13082,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2014
+#: mail/mail-ops.c:2024
 msgid "Saving attachment"
 msgstr "Сохранение присоединённого файла"
 
-#: mail/mail-ops.c:2031
+#: mail/mail-ops.c:2041
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13046,22 +13095,22 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2071
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удалось записать данные: %s"
 
-#: mail/mail-ops.c:2209
+#: mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2209
+#: mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:513
+#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:514
 msgid "_Search"
 msgstr "Поиск"
 
@@ -13132,25 +13181,25 @@ msgstr "Обновление..."
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-session.c:223
+#: mail/mail-session.c:221
 msgid "User canceled operation."
 msgstr "Операция отменена пользователем."
 
-#: mail/mail-session.c:276
+#: mail/mail-session.c:274
 msgid "_Remember this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-session.c:277
+#: mail/mail-session.c:275
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Запомнить этот пароль до окончания этой сессии"
 
-#: mail/mail-session.c:334
+#: mail/mail-session.c:332
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введите пароль для %s"
 
-#: mail/mail-session.c:337
+#: mail/mail-session.c:335
 msgid "Enter Password"
 msgstr "Ввод пароля"
 
@@ -13173,41 +13222,24 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: mail/mail-signature-editor.c:378
+#: mail/mail-signature-editor.c:371
 msgid "Type the name by which you would like to refer to this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:381 my-evolution/e-summary-preferences.c:875
+#: mail/mail-signature-editor.c:374 my-evolution/e-summary-preferences.c:875
 msgid "Name:"
 msgstr "Название:"
 
-#: mail/mail-signature-editor.c:397
-#, fuzzy
-msgid "Signature hint"
-msgstr "Подпись"
-
-#: mail/mail-signature-editor.c:407
-msgid ""
-"If you would like to use an old signature, you may import it by opening the "
-"\"Insert\" menu, and select either the \"Text file\" or the \"HTML file\" "
-"item."
-msgstr ""
-
-#: mail/mail-signature-editor.c:416
-#, fuzzy
-msgid "Hide signature hint"
-msgstr "Файл подписи в формате HTML:"
-
-#: mail/mail-tools.c:257
+#: mail/mail-tools.c:262
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:261
+#: mail/mail-tools.c:266
 msgid "Forwarded message"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-tools.c:403
+#: mail/mail-tools.c:408
 msgid "Forwarded Message"
 msgstr "Пересланное сообщение"
 
@@ -13264,67 +13296,67 @@ msgstr "(Без темы)"
 msgid "%s - Message"
 msgstr "%s - Сообщение"
 
-#: mail/message-list.c:733
+#: mail/message-list.c:737
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: mail/message-list.c:734
+#: mail/message-list.c:738
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:735
+#: mail/message-list.c:739
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:741
+#: mail/message-list.c:745
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:746
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:746
+#: mail/message-list.c:750
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:747
+#: mail/message-list.c:751
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:1063
+#: mail/message-list.c:1067
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1070
+#: mail/message-list.c:1074
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1083
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1091
+#: mail/message-list.c:1095
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1099
+#: mail/message-list.c:1103
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1101
+#: mail/message-list.c:1105
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2555
+#: mail/message-list.c:2559
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -13402,68 +13434,94 @@ msgstr "Предварительный Просмотр"
 msgid "Flag to Follow Up"
 msgstr ""
 
-#: mail/subscribe-dialog.c:219
+#: mail/subscribe-dialog.c:228
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Сканирование папок в \"%s\" на \"%s\""
 
-#: mail/subscribe-dialog.c:221
+#: mail/subscribe-dialog.c:230
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Сканирование корневых папок на \"%s\""
 
-#: mail/subscribe-dialog.c:318
+#: mail/subscribe-dialog.c:333
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписка на папку \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:335
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:1278 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1304 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Папка"
 
-#: mail/subscribe-dialog.c:1515
+#: mail/subscribe-dialog.c:1483
+#, fuzzy
+msgid "Scanning folders..."
+msgstr "Сохранить в папке..."
+
+#: mail/subscribe-dialog.c:1590
 msgid "No server has been selected"
 msgstr "Не был выбран сервер"
 
-#: mail/subscribe-dialog.c:1576
+#: mail/subscribe-dialog.c:1654
 msgid "Please select a server."
 msgstr "Пожалуйста, выберите сервер."
 
 #: mail/subscribe-dialog.glade.h:1
-msgid " _Refresh List "
-msgstr "Обновить список"
-
-#: mail/subscribe-dialog.glade.h:2
 msgid "All folders"
 msgstr "Все папки"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "Display options"
-msgstr "Показать параметры"
+#: mail/subscribe-dialog.glade.h:2
+#, fuzzy
+msgid "Apri file"
+msgstr "Апрель"
+
+#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
+#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
+#: ui/evolution.xml.h:5
+msgid "Close"
+msgstr "Закрыть"
 
 #: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Display Options"
+msgstr "Показать параметры"
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "Folders whose names begin with:"
 msgstr "Папки, названия которых начинаются с:"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "Manage Subscriptions"
 msgstr "Управление подписками"
 
-#: mail/subscribe-dialog.glade.h:6
-msgid "Show _folders from server: "
-msgstr "Показать папки с сервера: "
+#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Обновить список"
+
+#: mail/subscribe-dialog.glade.h:8
+#, fuzzy
+msgid "S_elect server: "
+msgstr "Выбрать сервис"
+
+#: mail/subscribe-dialog.glade.h:9
+#, fuzzy
+msgid "Salve file"
+msgstr "Выбрать файл"
 
-#: mail/subscribe-dialog.glade.h:7
+#: mail/subscribe-dialog.glade.h:10
 msgid "_Subscribe"
 msgstr "Подписаться"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:11
 msgid "_Unsubscribe"
 msgstr "Отказаться от подписки"
 
@@ -13474,27 +13532,28 @@ msgstr "Папка, содержащая Evolution Summary"
 
 #: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
 #, fuzzy
+msgid "Configure the appearance of the Evolution Summary here"
+msgstr "Папка, содержащая Evolution Summary"
+
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#, fuzzy
 msgid "Evolution Summary component."
 msgstr "Компонент редактора писем Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
 #, fuzzy
 msgid "Factory for Evolution Summary's configuration control."
 msgstr "Фабрика для управляющего элемента Evolution Задачи"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
 #, fuzzy
 msgid "Factory for the Evolution Summary component."
 msgstr "Фабрика для компонента Mail Summary программы Evolution."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
+#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
 msgid "Summary Preferences"
 msgstr "Настройки Сводки"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
-msgid "This page can be used to customize the appearance of the Summary page."
-msgstr ""
-
 #: my-evolution/Locations.h:1
 msgid "Aarhus"
 msgstr ""
@@ -23289,23 +23348,23 @@ msgstr "Цюрих"
 msgid "Folder containing the Evolution Summary"
 msgstr "Папка, содержащая Evolution Summary"
 
-#: my-evolution/e-summary-calendar.c:365 my-evolution/e-summary-calendar.c:383
+#: my-evolution/e-summary-calendar.c:367 my-evolution/e-summary-calendar.c:387
 msgid "Appointments"
 msgstr "Встречи"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:368
 msgid "No appointments"
 msgstr "Нет встреч"
 
-#: my-evolution/e-summary-calendar.c:400
+#: my-evolution/e-summary-calendar.c:404
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:402
+#: my-evolution/e-summary-calendar.c:406
 msgid "%l:%M %d %B"
 msgstr "%l:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
+#: my-evolution/e-summary-calendar.c:424
 msgid "No description"
 msgstr "Нет описания"
 
@@ -23367,11 +23426,11 @@ msgstr "Добавить"
 msgid "Shown"
 msgstr "Ливни"
 
-#: my-evolution/e-summary-tasks.c:300
+#: my-evolution/e-summary-tasks.c:312
 msgid "No tasks"
 msgstr "Нет задач"
 
-#: my-evolution/e-summary-tasks.c:343
+#: my-evolution/e-summary-tasks.c:357
 msgid "(No Description)"
 msgstr "(Нет описания)"
 
@@ -23403,7 +23462,7 @@ msgstr "Напечатать Сводку"
 msgid "Printing of Summary failed"
 msgstr "Сбой печати Сводки"
 
-#: my-evolution/main.c:139
+#: my-evolution/main.c:64
 msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "Компонент Executive summary: не удалось инициализировать Bonobo.\n"
 
@@ -24682,18 +24741,18 @@ msgid "Configuration control for Evolution folder settings."
 msgstr "Фабрика для редактора почты программы Evolution."
 
 #: shell/GNOME_Evolution_Shell.oaf.in.h:2
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
+
+#: shell/GNOME_Evolution_Shell.oaf.in.h:3
 #, fuzzy
 msgid "Folder Settings"
 msgstr "Настройки почты"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.oaf.in.h:4
 msgid "The Evolution shell."
 msgstr "Оболочка Evolution."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
-msgid "This page can be used to configure various folder settings"
-msgstr ""
-
 #: shell/e-activity-handler.c:162
 msgid "Show Details"
 msgstr "Показывать подробности"
@@ -24720,7 +24779,7 @@ msgstr "Выбрать папку"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:397
+#: shell/e-local-storage.c:179 shell/e-shell-view.c:398
 #: shell/e-shortcuts.c:1055
 msgid "Inbox"
 msgstr "Входящие"
@@ -25156,27 +25215,27 @@ msgstr ""
 msgid "Evolution Settings"
 msgstr "Evolution "
 
-#: shell/e-shell-shared-folder-picker-dialog.c:352
+#: shell/e-shell-shared-folder-picker-dialog.c:349
 #, fuzzy
 msgid "Opening Folder"
 msgstr "Открытие папки \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:359
+#: shell/e-shell-shared-folder-picker-dialog.c:356
 #, fuzzy, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Открытие папки \"%s\""
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:361
 #, fuzzy, c-format
 msgid "in \"%s\" ..."
 msgstr "Открыть в %s..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:470
+#: shell/e-shell-shared-folder-picker-dialog.c:467
 #, fuzzy, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Не удалось переименовать папку: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:542
+#: shell/e-shell-shared-folder-picker-dialog.c:539
 #, fuzzy
 msgid "Cannot find the specified shared folder."
 msgstr ""
@@ -25259,31 +25318,31 @@ msgstr "Перейти в автономный режим"
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: shell/e-shell-view.c:225
+#: shell/e-shell-view.c:226
 msgid "(No folder displayed)"
 msgstr "(Папки не показаны)"
 
-#: shell/e-shell-view.c:1841
+#: shell/e-shell-view.c:1838
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1843
+#: shell/e-shell-view.c:1840
 msgid "(None)"
 msgstr "(нет)"
 
-#: shell/e-shell-view.c:1890
+#: shell/e-shell-view.c:1887
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
 "перехода в режим работы вне сети."
 
-#: shell/e-shell-view.c:1897
+#: shell/e-shell-view.c:1894
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
-#: shell/e-shell-view.c:1903
+#: shell/e-shell-view.c:1900
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -25307,7 +25366,7 @@ msgstr ""
 msgid "Cannot set up local storage -- %s"
 msgstr "Невозможно установить локальное хранилище -- %s"
 
-#: shell/e-shell.c:1821
+#: shell/e-shell.c:1828
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25318,19 +25377,19 @@ msgstr ""
 "неожиданно завершился. Вам необходимо перезагрузить Evolution для того,\n"
 "чтобы снова иметь доступ к Вашим данным."
 
-#: shell/e-shell.c:2122
+#: shell/e-shell.c:2129
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: shell/e-shell.c:2124
+#: shell/e-shell.c:2131
 msgid "Cannot register on OAF"
 msgstr "Не удалось зарегистрировать в OAF"
 
-#: shell/e-shell.c:2126
+#: shell/e-shell.c:2133
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
-#: shell/e-shell.c:2128 shell/e-storage.c:488
+#: shell/e-shell.c:2135 shell/e-storage.c:488
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
@@ -25531,7 +25590,7 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
-#: shell/evolution-folder-selector-button.c:86
+#: shell/evolution-folder-selector-button.c:94
 msgid "<click here to select a folder>"
 msgstr "<щёлкните здесь чтобы выбрать папку>"
 
@@ -25572,63 +25631,63 @@ msgstr ""
 "Ошибка системы активации:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1094
+#: shell/evolution-shell-component.c:1145
 msgid "CORBA error"
 msgstr "Ошибка CORBA"
 
-#: shell/evolution-shell-component.c:1096
+#: shell/evolution-shell-component.c:1147
 msgid "Interrupted"
 msgstr "Прервано"
 
-#: shell/evolution-shell-component.c:1098
+#: shell/evolution-shell-component.c:1149
 msgid "Invalid argument"
 msgstr "Недопустимый аргумент"
 
-#: shell/evolution-shell-component.c:1100
+#: shell/evolution-shell-component.c:1151
 msgid "Already has an owner"
 msgstr "Уже имеет владельца"
 
-#: shell/evolution-shell-component.c:1102
+#: shell/evolution-shell-component.c:1153
 msgid "No owner"
 msgstr "Нет владельца"
 
-#: shell/evolution-shell-component.c:1104
+#: shell/evolution-shell-component.c:1155
 msgid "Not found"
 msgstr "Не найдено"
 
-#: shell/evolution-shell-component.c:1106
+#: shell/evolution-shell-component.c:1157
 msgid "Unsupported type"
 msgstr "Неподдерживаемый тип"
 
-#: shell/evolution-shell-component.c:1108
+#: shell/evolution-shell-component.c:1159
 msgid "Unsupported schema"
 msgstr "Неподдерживаемая схема"
 
-#: shell/evolution-shell-component.c:1110
+#: shell/evolution-shell-component.c:1161
 msgid "Unsupported operation"
 msgstr "Неподдерживаемая операция"
 
-#: shell/evolution-shell-component.c:1112
+#: shell/evolution-shell-component.c:1163
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: shell/evolution-shell-component.c:1116
+#: shell/evolution-shell-component.c:1167
 msgid "Exists"
 msgstr "Существует"
 
-#: shell/evolution-shell-component.c:1118
+#: shell/evolution-shell-component.c:1169
 msgid "Invalid URI"
 msgstr "Недопустимый URI"
 
-#: shell/evolution-shell-component.c:1122
+#: shell/evolution-shell-component.c:1173
 msgid "Has subfolders"
 msgstr "Имеет вложенные папки"
 
-#: shell/evolution-shell-component.c:1124
+#: shell/evolution-shell-component.c:1175
 msgid "No space left"
 msgstr "Нет места"
 
-#: shell/evolution-shell-component.c:1126
+#: shell/evolution-shell-component.c:1177
 msgid "Old owner has died"
 msgstr "Старый владелец завершил работу"
 
@@ -25685,29 +25744,21 @@ msgid "Specify where to create the folder:"
 msgstr "Указать где создать папку:"
 
 #: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Blah blah."
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "Insert some explanatory text here."
-msgstr ""
-
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
 #, fuzzy
 msgid "Open Other User's Folder"
 msgstr "Создать новую папку..."
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
 #, fuzzy
-msgid "_Folder Name:"
-msgstr "Название папки:"
+msgid "_Account:"
+msgstr "Редактор учётных записей"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:5
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
 #, fuzzy
-msgid "_Server:"
-msgstr "Название сервера:"
+msgid "_Folder Name:"
+msgstr "Название папки:"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:6
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
 #, fuzzy
 msgid "_User:"
 msgstr "Имя пользователя:"
@@ -25810,15 +25861,15 @@ msgstr "Не спрашивать снова"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution может импортировать данные из следующих файлов:"
 
-#: shell/main.c:92
+#: shell/main.c:96
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:98
+#: shell/main.c:102
 msgid "Evolution is now exiting ..."
 msgstr "Выход из Evolution..."
 
-#: shell/main.c:223
+#: shell/main.c:227
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -25828,7 +25879,7 @@ msgid ""
 "but some features are either unfinished or don't work properly.\n"
 "\n"
 "If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.5 recommended).\n"
+"this version, and install a 1.0.x version instead (1.0.8)\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25838,53 +25889,57 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:246
+#: shell/main.c:250
 #, fuzzy
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 msgstr "Ximian Evolution"
 
-#: shell/main.c:255
+#: shell/main.c:259
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Не спрашивать снова"
 
-#: shell/main.c:348
+#: shell/main.c:394
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Нет доступа к оболочке Ximian Evolution."
 
-#: shell/main.c:357
+#: shell/main.c:403
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Невозможно инициализировать оболочку Evolution: %s"
 
-#: shell/main.c:438
+#: shell/main.c:485
 msgid "Disable splash screen"
 msgstr "Отключить заставку"
 
-#: shell/main.c:439
+#: shell/main.c:487
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Начало импортирования"
 
-#: shell/main.c:440
+#: shell/main.c:489
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Запуск интеллектуального импортёра"
 
-#: shell/main.c:441
+#: shell/main.c:491
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:459
+#: shell/main.c:493
+msgid "Force upgrading of configuration files from Evolution 1.0.x"
+msgstr ""
+
+#: shell/main.c:511
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: shell/main.c:490
+#: shell/main.c:542
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Невозможно инициализировать компонентную систему Bonobo."
 
@@ -26093,14 +26148,6 @@ msgstr "Показать рабочую неделю"
 msgid "Week"
 msgstr "Неделя"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Закрыть"
-
 #: ui/evolution-comp-editor.xml.h:3
 msgid "Close this item"
 msgstr "Закрыть этот элемент"
@@ -27020,10 +27067,6 @@ msgstr "Добавить папку к вашему списку подписанных папок"
 msgid "F_older"
 msgstr "Папка"
 
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Обновить список"
-
 #: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "Обновить список папок"
@@ -27581,19 +27624,19 @@ msgstr "Сообщение"
 msgid "Don't show this message again."
 msgstr "Не показывать это сообщение снова."
 
-#: widgets/misc/e-search-bar.c:519
+#: widgets/misc/e-search-bar.c:520
 msgid "_Find Now"
 msgstr "Найти"
 
-#: widgets/misc/e-search-bar.c:520
+#: widgets/misc/e-search-bar.c:521
 msgid "_Clear"
 msgstr "Очистить"
 
-#: widgets/misc/e-search-bar.c:893
+#: widgets/misc/e-search-bar.c:894
 msgid "Clear"
 msgstr "Очистить"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:896
 msgid "Find Now"
 msgstr "Найти"
 
@@ -27619,6 +27662,71 @@ msgstr "init_corba(): Не удалось инициализировать GNOME"
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 
+#~ msgid "Error in search expression."
+#~ msgstr "Ошибка в выражении."
+
+#~ msgid "Restarting search."
+#~ msgstr "Перезапуск поиска."
+
+#~ msgid "Could not parse query string"
+#~ msgstr "Не удалось разобрать строку запроса"
+
+#~ msgid "Email is"
+#~ msgstr "Эл.адрес"
+
+#~ msgid "Could not create the alarm notify service"
+#~ msgstr "Не удалось создать сервис уведомления о сигнале"
+
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Информация о занятости (с %s до %s)"
+
+#, fuzzy
+#~ msgid "Meeting ends: <b>"
+#~ msgstr "Время завершения собрания:"
+
+#, fuzzy
+#~ msgid "Free/Busy info ends: <b>"
+#~ msgstr "Информация о занятости (с %s до %s)"
+
+#, fuzzy
+#~ msgid "Task Completed: <b>"
+#~ msgstr " (Выполнено "
+
+#~ msgid "Non-Participants"
+#~ msgstr "Не участвуют"
+
+#~ msgid ""
+#~ "This message has not been sent.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Это сообщение не было отправлено.\n"
+#~ "\n"
+#~ "Сохранить изменения?"
+
+#, fuzzy
+#~ msgid "Set as default"
+#~ msgstr " (основная)"
+
+#, fuzzy
+#~ msgid "Signature hint"
+#~ msgstr "Подпись"
+
+#, fuzzy
+#~ msgid "Hide signature hint"
+#~ msgstr "Файл подписи в формате HTML:"
+
+#~ msgid " _Refresh List "
+#~ msgstr "Обновить список"
+
+#~ msgid "Show _folders from server: "
+#~ msgstr "Показать папки с сервера: "
+
+#, fuzzy
+#~ msgid "_Server:"
+#~ msgstr "Название сервера:"
+
 #~ msgid ""
 #~ "Evolution is unable to get the addressbook local storage.\n"
 #~ "This may have been caused by the evolution-addressbook component "
@@ -28169,9 +28277,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ "\n"
 #~ "Публичный ключ: "
 
-#~ msgid "Connecting to LDAP server..."
-#~ msgstr "Подключение к серверу LDAP..."
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Ожидание подключения к серверу LDAP..."
 
@@ -28362,9 +28467,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Компонент Evolution для Executive Summary."
 
-#~ msgid "Select a service"
-#~ msgstr "Выбрать сервис"
-
 #~ msgid "Send an email to %s"
 #~ msgstr "Отправить почту %s"
 
@@ -28529,9 +28631,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "_Task..."
 #~ msgstr "Задачу..."
 
-#~ msgid "Create or edit mail accounts and other preferences"
-#~ msgstr "Создать или исправить учётную запись почты и другие настройки"
-
 #~ msgid "_Mail Settings..."
 #~ msgstr "Настроить почту..."
author	Ettore Perazzoli <ettore@src.gnome.org>	2002-09-10 04:06:54 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2002-09-10 04:06:54 +0800
commit	ea4eeed27313b0ad0564422424c5dcb58bbbe842 (patch)
tree	381990209d2b0c7b4609aca247c1d18575772a12 /po/ru.po
parent	6db8b43826423d1f99f7647bafeb773fec3f1826 (diff)
download	gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.gz gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.bz2 gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.lz gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.xz gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.tar.zst gsoc2013-evolution-ea4eeed27313b0ad0564422424c5dcb58bbbe842.zip