Updated russian translation.

svn path=/trunk/; revision=14207
author: Valek Frob <frob@src.gnome.org> 2001-10-27 21:03:55 +0800
committer: Valek Frob <frob@src.gnome.org> 2001-10-27 21:03:55 +0800
commit: ee72dd5eb5817ad069517cb74790722ec7be0196 (patch)
tree: 5526e047ed6a66f87f93d535236cd7f0c58d8b0a /po
parent: cf59ac9504656b8b53acad2868a8dc20d59df50e (diff)
download: gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.gz
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.bz2
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.lz
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.xz
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.zst
gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.zip
2 files changed, 2568 insertions, 2586 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index cb0ea1eefe..5e65bd122b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-27  Valek Filippov  <frob@df.ru>
+
+	* ru.po: updated russian translation.
+
 2001-10-27  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* lt.po: Updated Lithuanian translation.
diff --git a/po/ru.po b/po/ru.po
index 062ec5afba..299eee0036 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,14 +4,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-10-10 11:08-0400\n"
-"PO-Revision-Date: 2001-10-02 00:21+0400\n"
+"POT-Creation-Date: 2001-10-27 15:19+0400\n"
+"PO-Revision-Date: 2001-10-27 17:10+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+msgid "Factory to import LDIF files into Evolution."
+msgstr "Фабрика для импорта файлов LDIF в Evolution."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+msgid "Imports LDIF files into Evolution."
+msgstr "Импортирует файлы LDIF в Evolution."
+
 #: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Фабрика для импорта файлов VCard в Evolution."
@@ -20,293 +28,290 @@ msgstr "Фабрика для импорта файлов VCard в Evolution."
 msgid "Imports VCard files into Evolution."
 msgstr "Импортирует файлы VCard в Evolution."
 
-#: addressbook/backend/ebook/e-card-simple.c:58
-#: addressbook/gui/widgets/e-addressbook-view.c:868
+#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/gui/widgets/e-addressbook-view.c:851
 msgid "File As"
 msgstr "Файл как"
 
-#: addressbook/backend/ebook/e-card-simple.c:59
+#: addressbook/backend/ebook/e-card-simple.c:60
 msgid "Name"
 msgstr "Имя"
 
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/gui/widgets/e-addressbook-view.c:870
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:853
 msgid "Email"
 msgstr "Эл.адрес"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
 msgid "Primary"
 msgstr "Первый"
 
-#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card-simple.c:62
 msgid "Prim"
 msgstr "Первый"
 
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/contact-editor/e-contact-editor.c:1594
-#: addressbook/gui/widgets/e-addressbook-view.c:902
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1590
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 msgid "Assistant"
 msgstr "Помощник"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/gui/contact-editor/e-contact-editor.c:1595
-#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1591
+#: addressbook/gui/contact-editor/e-contact-editor.c:1658
 msgid "Business"
 msgstr "Рабочий"
 
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/backend/ebook/e-card-simple.c:68
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Bus"
 msgstr "Занят"
 
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
 msgid "Callback"
 msgstr "Обратный отзвон"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
 msgid "Company"
 msgstr "Компания"
 
-#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/backend/ebook/e-card-simple.c:66
 msgid "Comp"
 msgstr "Компания"
 
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/contact-editor/e-contact-editor.c:1601
-#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/contact-editor/e-contact-editor.c:1659
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/widgets/e-addressbook-view.c:877
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:860
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:68
 msgid "Org"
 msgstr "Орг."
 
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
 msgid "Car"
 msgstr "Машина"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1597
-#: addressbook/gui/widgets/e-addressbook-view.c:882
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1593
+#: addressbook/gui/widgets/e-addressbook-view.c:865
 msgid "Business Fax"
 msgstr "Рабочий факс"
 
-#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/backend/ebook/e-card-simple.c:73
 msgid "Bus Fax"
 msgstr "Раб. факс"
 
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
-#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+#: addressbook/gui/widgets/e-addressbook-view.c:866
 msgid "Home Fax"
 msgstr "Домашний Факс"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1592
 msgid "Business 2"
 msgstr "Рабочий 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/backend/ebook/e-card-simple.c:75
 msgid "Bus 2"
 msgstr "Раб. 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
 msgid "Home 2"
 msgstr "Домашний 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+#: addressbook/gui/widgets/e-addressbook-view.c:869
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1606
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
-#: mail/mail-config.glade.h:52
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+#: addressbook/gui/contact-editor/e-contact-editor.c:1660
+#: mail/mail-config.glade.h:49
 msgid "Other"
 msgstr "Другой"
 
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1607
-#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "Other Fax"
 msgstr "Другой факс"
 
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/gui/contact-editor/e-contact-editor.c:1608
-#: addressbook/gui/widgets/e-addressbook-view.c:889
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "Pager"
 msgstr "Пэйджер"
 
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1610
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/widgets/e-addressbook-view.c:873
 msgid "Radio"
 msgstr "Радио"
 
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1611
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:874
 msgid "Telex"
 msgstr "Телекс"
 
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/widgets/e-addressbook-view.c:892
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "TTY"
 msgstr "TTY"
 
-#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/backend/ebook/e-card-simple.c:85
 #: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1637
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/contact-editor/e-contact-editor.c:1633
+#: addressbook/gui/widgets/e-addressbook-view.c:877
 msgid "Email 2"
 msgstr "Эл.адрес 2"
 
-#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/backend/ebook/e-card-simple.c:86
 #: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1638
-#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/contact-editor/e-contact-editor.c:1634
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Email 3"
 msgstr "Эл.адрес 3"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Web Site"
 msgstr "Сайт в Интернет"
 
-#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/backend/ebook/e-card-simple.c:87
 msgid "Url"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/widgets/e-addressbook-view.c:897
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:880
 msgid "Department"
 msgstr "Отдел"
 
-#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/backend/ebook/e-card-simple.c:88
 msgid "Dep"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.c:898
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/backend/ebook/e-card-simple.c:89
 msgid "Off"
 msgstr "Офис"
 
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.c:899
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 msgid "Title"
 msgstr "Заголовок"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 msgid "Profession"
 msgstr "Профессия"
 
-#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card-simple.c:91
 msgid "Prof"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:884
 msgid "Manager"
 msgstr "Управляющий"
 
-#: addressbook/backend/ebook/e-card-simple.c:91
-#, fuzzy
+#: addressbook/backend/ebook/e-card-simple.c:92
 msgid "Man"
-msgstr "Май"
+msgstr "Упр."
 
-#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Ass"
-msgstr ""
+msgstr "Пом."
 
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.c:903
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card-simple.c:94
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 msgid "Spouse"
 msgstr "Супруг(а)"
 
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.c:905
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:888
 msgid "Note"
 msgstr "Заметка"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "Calendar URI"
 msgstr "URI календаря"
 
-#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card-simple.c:97
 msgid "CALUri"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.c:906
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Free-busy URL"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card-simple.c:98
 msgid "FBUrl"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "Anniversary"
 msgstr "Годовщина:"
 
-#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card-simple.c:99
 msgid "Anniv"
 msgstr ""
 
-#: addressbook/backend/ebook/e-card-simple.c:99
+#: addressbook/backend/ebook/e-card-simple.c:100
 msgid "Birth Date"
 msgstr "Дата рождения"
 
-#: addressbook/backend/ebook/e-card-simple.c:102
-#: calendar/gui/e-calendar-table.etspec.h:4
+#: addressbook/backend/ebook/e-card-simple.c:103
 msgid "Categories"
 msgstr "Категории"
 
-#: addressbook/backend/ebook/e-card-simple.c:103
+#: addressbook/backend/ebook/e-card-simple.c:104
 msgid "Family Name"
 msgstr "Фамилия"
 
-#: addressbook/backend/ebook/e-card.c:3564
+#: addressbook/backend/ebook/e-card.c:3713
 msgid "Card: "
 msgstr "Карточка: "
 
-#: addressbook/backend/ebook/e-card.c:3566
+#: addressbook/backend/ebook/e-card.c:3715
 msgid ""
 "\n"
 "Name: "
@@ -314,7 +319,7 @@ msgstr ""
 "\n"
 "Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3567
+#: addressbook/backend/ebook/e-card.c:3716
 msgid ""
 "\n"
 "  Prefix:     "
@@ -322,7 +327,7 @@ msgstr ""
 "\n"
 "  Префикс:    "
 
-#: addressbook/backend/ebook/e-card.c:3568
+#: addressbook/backend/ebook/e-card.c:3717
 msgid ""
 "\n"
 "  Given:      "
@@ -330,7 +335,7 @@ msgstr ""
 "\n"
 "  Имя: "
 
-#: addressbook/backend/ebook/e-card.c:3569
+#: addressbook/backend/ebook/e-card.c:3718
 msgid ""
 "\n"
 "  Additional: "
@@ -338,7 +343,7 @@ msgstr ""
 "\n"
 "  Добавочный: "
 
-#: addressbook/backend/ebook/e-card.c:3570
+#: addressbook/backend/ebook/e-card.c:3719
 msgid ""
 "\n"
 "  Family:     "
@@ -346,7 +351,7 @@ msgstr ""
 "\n"
 "  Фамилия:    "
 
-#: addressbook/backend/ebook/e-card.c:3571
+#: addressbook/backend/ebook/e-card.c:3720
 msgid ""
 "\n"
 "  Suffix:     "
@@ -354,7 +359,7 @@ msgstr ""
 "\n"
 "  Суффикс:     "
 
-#: addressbook/backend/ebook/e-card.c:3585
+#: addressbook/backend/ebook/e-card.c:3734
 msgid ""
 "\n"
 "Birth Date: "
@@ -362,7 +367,7 @@ msgstr ""
 "\n"
 "Дата рождения: "
 
-#: addressbook/backend/ebook/e-card.c:3596
+#: addressbook/backend/ebook/e-card.c:3745
 msgid ""
 "\n"
 "Address:"
@@ -370,7 +375,7 @@ msgstr ""
 "\n"
 "Адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3747
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -378,7 +383,7 @@ msgstr ""
 "\n"
 "Почтовый ящик:  "
 
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3748
 msgid ""
 "\n"
 "  Ext:         "
@@ -386,7 +391,7 @@ msgstr ""
 "\n"
 "  Расш.:        "
 
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3749
 msgid ""
 "\n"
 "  Street:      "
@@ -394,7 +399,7 @@ msgstr ""
 "\n"
 "  Улица:     "
 
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3750
 msgid ""
 "\n"
 "  City:        "
@@ -402,7 +407,7 @@ msgstr ""
 "\n"
 "  Город:      "
 
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3751
 msgid ""
 "\n"
 "  Region:      "
@@ -410,7 +415,7 @@ msgstr ""
 "\n"
 "  Область:      "
 
-#: addressbook/backend/ebook/e-card.c:3603
+#: addressbook/backend/ebook/e-card.c:3752
 msgid ""
 "\n"
 "  Postal Code: "
@@ -418,7 +423,7 @@ msgstr ""
 "\n"
 "  Почтовый код: "
 
-#: addressbook/backend/ebook/e-card.c:3604
+#: addressbook/backend/ebook/e-card.c:3753
 msgid ""
 "\n"
 "  Country:     "
@@ -426,7 +431,7 @@ msgstr ""
 "\n"
 "  Страна:     "
 
-#: addressbook/backend/ebook/e-card.c:3617
+#: addressbook/backend/ebook/e-card.c:3766
 msgid ""
 "\n"
 "Delivery Label: "
@@ -434,7 +439,7 @@ msgstr ""
 "\n"
 "Метка для доставки:"
 
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3778
 msgid ""
 "\n"
 "Telephones:\n"
@@ -442,7 +447,7 @@ msgstr ""
 "\n"
 "Телефоны:\n"
 
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3781
 msgid ""
 "\n"
 "Telephone:"
@@ -450,7 +455,7 @@ msgstr ""
 "\n"
 "Телефон:"
 
-#: addressbook/backend/ebook/e-card.c:3656
+#: addressbook/backend/ebook/e-card.c:3805
 msgid ""
 "\n"
 "E-mail:\n"
@@ -458,7 +463,7 @@ msgstr ""
 "\n"
 "Эл.адрес:\n"
 
-#: addressbook/backend/ebook/e-card.c:3659
+#: addressbook/backend/ebook/e-card.c:3808
 msgid ""
 "\n"
 "E-mail:"
@@ -466,7 +471,7 @@ msgstr ""
 "\n"
 "Эл.адрес:"
 
-#: addressbook/backend/ebook/e-card.c:3678
+#: addressbook/backend/ebook/e-card.c:3827
 msgid ""
 "\n"
 "Mailer: "
@@ -474,7 +479,7 @@ msgstr ""
 "\n"
 "Почтовый клиент: "
 
-#: addressbook/backend/ebook/e-card.c:3684
+#: addressbook/backend/ebook/e-card.c:3833
 msgid ""
 "\n"
 "Time Zone: "
@@ -482,7 +487,7 @@ msgstr ""
 "\n"
 "Часовой пояс: "
 
-#: addressbook/backend/ebook/e-card.c:3692
+#: addressbook/backend/ebook/e-card.c:3841
 msgid ""
 "\n"
 "Geo Location: "
@@ -490,7 +495,7 @@ msgstr ""
 "\n"
 "Геогр.положение: "
 
-#: addressbook/backend/ebook/e-card.c:3696
+#: addressbook/backend/ebook/e-card.c:3845
 msgid ""
 "\n"
 "Business Role: "
@@ -498,7 +503,7 @@ msgstr ""
 "\n"
 "Должность: "
 
-#: addressbook/backend/ebook/e-card.c:3708
+#: addressbook/backend/ebook/e-card.c:3857
 msgid ""
 "\n"
 "Org: "
@@ -506,7 +511,7 @@ msgstr ""
 "\n"
 "Орг.:"
 
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3858
 msgid ""
 "\n"
 "  Name:  "
@@ -514,7 +519,7 @@ msgstr ""
 "\n"
 "  Имя:  "
 
-#: addressbook/backend/ebook/e-card.c:3710
+#: addressbook/backend/ebook/e-card.c:3859
 msgid ""
 "\n"
 "  Unit:  "
@@ -522,7 +527,7 @@ msgstr ""
 "\n"
 "Единица:  "
 
-#: addressbook/backend/ebook/e-card.c:3711
+#: addressbook/backend/ebook/e-card.c:3860
 msgid ""
 "\n"
 "  Unit2: "
@@ -530,7 +535,7 @@ msgstr ""
 "\n"
 "Единица2: "
 
-#: addressbook/backend/ebook/e-card.c:3712
+#: addressbook/backend/ebook/e-card.c:3861
 msgid ""
 "\n"
 "  Unit3: "
@@ -538,7 +543,7 @@ msgstr ""
 "\n"
 "Единица3: "
 
-#: addressbook/backend/ebook/e-card.c:3713
+#: addressbook/backend/ebook/e-card.c:3862
 msgid ""
 "\n"
 "  Unit4: "
@@ -546,7 +551,7 @@ msgstr ""
 "\n"
 "Единица4: "
 
-#: addressbook/backend/ebook/e-card.c:3717
+#: addressbook/backend/ebook/e-card.c:3866
 msgid ""
 "\n"
 "Categories: "
@@ -554,7 +559,7 @@ msgstr ""
 "\n"
 "Категории: "
 
-#: addressbook/backend/ebook/e-card.c:3718
+#: addressbook/backend/ebook/e-card.c:3867
 msgid ""
 "\n"
 "Comment: "
@@ -572,7 +577,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3731
+#: addressbook/backend/ebook/e-card.c:3880
 msgid ""
 "\n"
 "Unique String: "
@@ -580,7 +585,7 @@ msgstr ""
 "\n"
 "Уникальная строка: "
 
-#: addressbook/backend/ebook/e-card.c:3734
+#: addressbook/backend/ebook/e-card.c:3883
 msgid ""
 "\n"
 "Public Key: "
@@ -588,11 +593,11 @@ msgstr ""
 "\n"
 "Публичный ключ: "
 
-#: addressbook/backend/ebook/e-card.c:4087
+#: addressbook/backend/ebook/e-card.c:4236
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/backend/ebook/e-card.c:4095
+#: addressbook/backend/ebook/e-card.c:4244
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -601,25 +606,27 @@ msgstr "VCard для %s"
 #: addressbook/backend/ebook/load-pine-addressbook.c:22
 #: addressbook/backend/ebook/test-client-list.c:23
 #: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1169
-#: addressbook/gui/component/addressbook-factory.c:48
-#: calendar/conduits/calendar/calendar-conduit.c:1266
-#: calendar/conduits/todo/todo-conduit.c:1034
-#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
+#: addressbook/conduit/address-conduit.c:1518
+#: addressbook/gui/component/addressbook-factory.c:50
+#: calendar/conduits/calendar/calendar-conduit.c:1423
+#: calendar/conduits/todo/todo-conduit.c:1125
+#: calendar/gui/alarm-notify/notify-main.c:172 calendar/gui/main.c:63
+#: tools/evolution-addressbook-export.c:60
+#: tools/evolution-addressbook-import.c:86
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:257
-#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-ldap.c:2059
 msgid "Searching..."
 msgstr "Поиск..."
 
-#: addressbook/backend/pas/pas-backend-file.c:259
+#: addressbook/backend/pas/pas-backend-file.c:261
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #. need a different error message here.
-#: addressbook/backend/pas/pas-backend-file.c:268
+#: addressbook/backend/pas/pas-backend-file.c:270
 msgid "Error in search expression."
 msgstr "Ошибка в выражении поиска."
 
@@ -639,44 +646,44 @@ msgstr "Ожидание подключения к серверу LDAP..."
 msgid "Adding card to LDAP server..."
 msgstr "Добавление карточки к серверу LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:959
+#: addressbook/backend/pas/pas-backend-ldap.c:963
 msgid "Removing card from LDAP server..."
 msgstr "Удаление карточки с сервера LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1064
+#: addressbook/backend/pas/pas-backend-ldap.c:1072
 msgid "Modifying card from LDAP server..."
 msgstr "Изменение карточки на сервере LDAP..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1992
+#: addressbook/backend/pas/pas-backend-ldap.c:2004
 msgid "Receiving LDAP search results..."
 msgstr ""
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1997
+#: addressbook/backend/pas/pas-backend-ldap.c:2009
 msgid "Restarting search."
 msgstr "Перезапуск поиска."
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:285
 msgid "Cursor could not be loaded\n"
 msgstr "Курсор не может быть загружен\n"
 
-#: addressbook/conduit/address-conduit.c:217
+#: addressbook/conduit/address-conduit.c:298
 msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
-#: addressbook/conduit/address-conduit.c:733
-#: calendar/conduits/calendar/calendar-conduit.c:841
-#: calendar/conduits/todo/todo-conduit.c:609
+#: addressbook/conduit/address-conduit.c:1075
+#: calendar/conduits/calendar/calendar-conduit.c:965
+#: calendar/conduits/todo/todo-conduit.c:690
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
-#: addressbook/conduit/address-conduit.c:734
-#: calendar/conduits/calendar/calendar-conduit.c:842
-#: calendar/conduits/todo/todo-conduit.c:610
+#: addressbook/conduit/address-conduit.c:1076
+#: calendar/conduits/calendar/calendar-conduit.c:966
+#: calendar/conduits/todo/todo-conduit.c:691
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
-#: addressbook/conduit/address-conduit.c:764
-#: addressbook/conduit/address-conduit.c:767
+#: addressbook/conduit/address-conduit.c:1106
+#: addressbook/conduit/address-conduit.c:1109
 msgid "Could not read pilot's Address application block"
 msgstr "Невозможно прочесть блок приложения адресов Пилота"
 
@@ -713,51 +720,46 @@ msgid "Factory for the Addressbook's address displayer"
 msgstr "Фабрика для отображателя адреса из адресной книги"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
-#, fuzzy
 msgid "Factory for the Addressbook's address popup"
-msgstr "Фабрика для отображателя адреса из адресной книги"
+msgstr "Фабрика для всплыващего окна адреса из адресной книги"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
 #, fuzzy
 msgid "Factory for the sample Addressbook control"
 msgstr "Щелкните здесь для адресной книги"
 
-#: addressbook/gui/component/addressbook-component.c:66
-#: calendar/gui/dialogs/comp-editor-util.c:289
-#: calendar/gui/dialogs/comp-editor-util.c:345 shell/e-local-storage.c:173
-#: shell/e-shortcuts.c:1062
+#: addressbook/gui/component/addressbook-component.c:72
+#: calendar/gui/dialogs/comp-editor-util.c:301
+#: calendar/gui/dialogs/comp-editor-util.c:357 shell/e-shortcuts.c:1061
 msgid "Contacts"
 msgstr "Контакты"
 
-#: addressbook/gui/component/addressbook-component.c:66
+#: addressbook/gui/component/addressbook-component.c:72
 msgid "Folder containing contact information"
 msgstr "Папка содержащая контактную информацию"
 
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-component.c:68
-#, fuzzy
+#: addressbook/gui/component/addressbook-component.c:74
 msgid "LDAP server containing contact information"
-msgstr ""
-"Ошибка при загрузке информации фильтра:\n"
-"%s"
+msgstr "LDAP сервер содержащий контактную информацию"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:527
 #: ui/evolution-addressbook.xml.h:11
 msgid "New Contact"
 msgstr "Новый контакт"
 
-#: addressbook/gui/component/addressbook-component.c:411
+#: addressbook/gui/component/addressbook-component.c:527
 msgid "New _Contact"
 msgstr "Новый контакт"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:528
 msgid "New Contact List"
 msgstr "Новый список контактов"
 
-#: addressbook/gui/component/addressbook-component.c:412
+#: addressbook/gui/component/addressbook-component.c:528
 msgid "New Contact _List"
 msgstr "Новый список контактов"
 
@@ -790,7 +792,7 @@ msgid "Base"
 msgstr "Основа"
 
 #: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:177
+#: calendar/gui/dialogs/task-editor.c:179
 msgid "Basic"
 msgstr "Основные"
 
@@ -805,38 +807,35 @@ msgstr "Эл.адрес:"
 #: addressbook/gui/component/addressbook-config.glade.h:10
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
-msgstr ""
+msgstr "Evolution будет использовать этот эл.адрес для идентификации вас на сервере"
 
 #: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "One"
 msgstr "Один"
 
 #: addressbook/gui/component/addressbook-config.glade.h:12
-#, fuzzy
 msgid "Search _base:"
-msgstr "Поиск области действия:"
+msgstr "База поиска:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:13
-#, fuzzy
 msgid "Search s_cope: "
-msgstr "Поиск области действия:"
+msgstr "Диапазон поиска:"
 
 #: addressbook/gui/component/addressbook-config.glade.h:14
 msgid "Server Name"
 msgstr "Название сервера"
 
 #: addressbook/gui/component/addressbook-config.glade.h:15
-#, fuzzy
 msgid "Sub"
-msgstr "Вс"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-config.glade.h:16
 msgid "The information below is required in order to add an addressbook.  "
-msgstr ""
+msgstr "Приведённая ниже информация необходима для добавления в адресную книгу."
 
 #: addressbook/gui/component/addressbook-config.glade.h:17
 msgid "This information is not required for most ldap servers. "
-msgstr ""
+msgstr "Эта информация не требуется для большинства LDAP серверов."
 
 #: addressbook/gui/component/addressbook-config.glade.h:18
 msgid ""
@@ -872,12 +871,12 @@ msgstr "Название счёта:"
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:92 my-evolution/my-evolution.glade.h:21
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:21
 msgid "_Add"
 msgstr "Добавить"
 
 #: addressbook/gui/component/addressbook-config.glade.h:25
-#: filter/filter.glade.h:9 mail/mail-config.glade.h:97
+#: filter/filter.glade.h:9 mail/mail-config.glade.h:98
 #: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
 #: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:47
@@ -898,15 +897,32 @@ msgstr "Порт:"
 msgid "_Server name:"
 msgstr "Название сервера:"
 
-#: addressbook/gui/component/addressbook-storage.c:168
-msgid "Other Contacts"
-msgstr "Другие контакты"
+#: addressbook/gui/component/addressbook-config.glade.h:29
+msgid "label18"
+msgstr "метка26"
+
+#: addressbook/gui/component/addressbook-config.glade.h:30
+msgid "label19"
+msgstr "метка26"
+
+#: addressbook/gui/component/addressbook-config.glade.h:31
+msgid "label20"
+msgstr "метка26"
+
+#: addressbook/gui/component/addressbook-config.glade.h:32
+msgid "label47"
+msgstr "метка26"
+
+#: addressbook/gui/component/addressbook-factory.c:70
+#: calendar/gui/alarm-notify/notify-main.c:175 calendar/gui/main.c:106
+msgid "Could not initialize gnome-vfs"
+msgstr "Не удалось инициализировать gnome-vfs"
 
-#: addressbook/gui/component/addressbook.c:400
+#: addressbook/gui/component/addressbook.c:465
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:409
+#: addressbook/gui/component/addressbook.c:474
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -916,7 +932,7 @@ msgstr ""
 "что либо вы ввели неправильный URI, либо LDAP\n"
 "сервер не отвечает"
 
-#: addressbook/gui/component/addressbook.c:414
+#: addressbook/gui/component/addressbook.c:479
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -928,7 +944,7 @@ msgstr ""
 "перекомпилировать программу из исходных текстов в CVS после\n"
 "установки OpenLDAP полученного по приведённой ниже ссылке.\n"
 
-#: addressbook/gui/component/addressbook.c:422
+#: addressbook/gui/component/addressbook.c:487
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -936,43 +952,42 @@ msgstr ""
 "Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
 "и что у вас есть необходимые права доступа."
 
-#: addressbook/gui/component/addressbook.c:550
-#, fuzzy, c-format
+#: addressbook/gui/component/addressbook.c:620
+#, c-format
 msgid "Enter password for %s (user %s)"
-msgstr "Пожалуйста введите вашу парольную фразу для %s"
+msgstr "Пожалуйста введите вашу парольную фразу для %s (пользователь %s)"
 
-#: addressbook/gui/component/addressbook.c:655
+#: addressbook/gui/component/addressbook.c:757
 #: calendar/gui/cal-search-bar.c:55
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:656
+#: addressbook/gui/component/addressbook.c:758
 msgid "Name contains"
 msgstr "Имя содержит"
 
-#: addressbook/gui/component/addressbook.c:657
+#: addressbook/gui/component/addressbook.c:759
 msgid "Email contains"
 msgstr "Эл.адрес содержит"
 
-#: addressbook/gui/component/addressbook.c:658
+#: addressbook/gui/component/addressbook.c:760
 #: calendar/gui/cal-search-bar.c:59
-#, fuzzy
 msgid "Category is"
-msgstr "Категории:"
+msgstr "Категории "
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:659 widgets/misc/e-filter-bar.h:97
-#: widgets/misc/e-filter-bar.h:104
+#: addressbook/gui/component/addressbook.c:761 widgets/misc/e-filter-bar.h:98
+#: widgets/misc/e-filter-bar.h:105
 msgid "Advanced..."
 msgstr "Расширенные..."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:889
+#: addressbook/gui/component/addressbook.c:1002
 #: calendar/gui/cal-search-bar.c:412
 msgid "Any Category"
 msgstr "Любая категория"
 
-#: addressbook/gui/component/addressbook.c:929
+#: addressbook/gui/component/addressbook.c:1042
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
@@ -987,7 +1002,7 @@ msgstr "(нет)"
 
 #: addressbook/gui/component/e-address-popup.c:466
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1636
+#: addressbook/gui/contact-editor/e-contact-editor.c:1632
 msgid "Primary Email"
 msgstr "Первый эл.адрес"
 
@@ -1005,23 +1020,23 @@ msgstr "Создать новый контакт \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Добавить адрес к существующему контакту \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:859
+#: addressbook/gui/component/e-address-popup.c:883
 msgid "Querying Addressbook..."
 msgstr "Запрос к адресной книге..."
 
-#: addressbook/gui/component/e-address-popup.c:934
+#: addressbook/gui/component/e-address-popup.c:959
 #: addressbook/gui/component/e-address-widget.c:388
 #: addressbook/gui/component/select-names/e-select-names-popup.c:307
 msgid "Edit Contact Info"
 msgstr "Правка контактной информации"
 
-#: addressbook/gui/component/e-address-popup.c:963
+#: addressbook/gui/component/e-address-popup.c:989
 #: addressbook/gui/component/e-address-widget.c:424
 #: addressbook/gui/component/select-names/e-select-names-popup.c:486
 msgid "Add to Contacts"
 msgstr "Добавить к контактам"
 
-#: addressbook/gui/component/e-address-popup.c:1006
+#: addressbook/gui/component/e-address-popup.c:1032
 msgid "Merge E-Mail Address"
 msgstr "Объединить эл.адреса"
 
@@ -1042,9 +1057,9 @@ msgid "Factory for the Addressbook's name selection interface"
 msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:164
-#: addressbook/gui/component/select-names/e-select-names.c:763
-#: composer/e-msg-composer-attachment-bar.c:497 filter/filter-filter.c:436
-#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
+#: addressbook/gui/component/select-names/e-select-names.c:766
+#: composer/e-msg-composer-attachment-bar.c:499 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:180
 msgid "Remove"
 msgstr "Удалить"
 
@@ -1067,22 +1082,23 @@ msgstr "Неназванный список контактов"
 #: addressbook/gui/component/select-names/e-select-names-popup.c:441
 #, c-format
 msgid "(%d not shown)"
-msgstr ""
+msgstr "(%d не показано)"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:507
 msgid "Unnamed Contact"
 msgstr "Неназванный контакт"
 
-#: addressbook/gui/component/select-names/e-select-names.c:522
+#: addressbook/gui/component/select-names/e-select-names.c:524
 msgid ""
-"Evolution is unable to get the addressbook local storage. This may have been "
-"caused by the evolution-addressbook component crashing. To help us better "
-"understand and ultimately resolve this problem, please send an e-mail to Jon "
-"Trowbridge <trow@ximian.com> with a detailed description of the "
-"circumstances under which this error occurred.  Thank you."
+"Evolution is unable to get the addressbook local storage.\n"
+"This may have been caused by the evolution-addressbook component crashing.\n"
+"To help us better understand and ultimately resolve this problem,\n"
+"please send an e-mail to Jon Trowbridge <trow@ximian.com> with a\n"
+"detailed description of the circumstances under which this error\n"
+"occurred.  Thank you."
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:599
+#: addressbook/gui/component/select-names/e-select-names.c:602
 msgid "Select Contacts from Addressbook"
 msgstr ""
 
@@ -1138,22 +1154,22 @@ msgstr "Категории..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Collaboration"
-msgstr ""
+msgstr "Сотрудничество"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1241
+#: addressbook/gui/contact-editor/e-contact-editor.c:1239
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:182
+#: calendar/gui/dialogs/task-editor.c:184
 msgid "Details"
 msgstr "Детали"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "F_ree/Busy URL:"
-msgstr ""
+msgstr "URL \"свободен/занят\":"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "File A_s:"
@@ -1169,6 +1185,8 @@ msgid ""
 "Internet, enter the address\n"
 "of that information here."
 msgstr ""
+"Если этот человек публикует информацию о том когда он свободен/занят в Internet, введите здесь\n"
+"адрес этой информации."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "New phone type"
@@ -1214,9 +1232,9 @@ msgstr "Контакты..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:841 filter/filter.glade.h:8
-#: mail/folder-browser.c:1422 mail/mail-config.glade.h:96
-#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
+#: calendar/gui/dialogs/meeting-page.c:702 filter/filter.glade.h:8
+#: mail/folder-browser.c:1465 mail/mail-config.glade.h:96
+#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:94
 #: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
 msgid "_Delete"
 msgstr "Удалить"
@@ -1258,9 +1276,8 @@ msgid "_Profession:"
 msgstr "Профессия:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#, fuzzy
 msgid "_Public Calendar URL:"
-msgstr "URI календаря"
+msgstr "URI публичного календаря:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Spouse:"
@@ -1275,53 +1292,56 @@ msgid "_Web page address:"
 msgstr "Адрес web-страницы:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы уверены, в том что хотите\n"
-"удалить этот контакт?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
 msgid "Delete Contact?"
 msgstr "Удалить контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:759
+#: addressbook/gui/contact-editor/e-contact-editor.c:754
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1612
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2234
+#: addressbook/gui/contact-editor/e-contact-editor.c:2230
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Не удалось удалить найти виджет для поля: \"%s\""
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:284
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:286
 msgid "Edit Full"
 msgstr "Правка полного имени"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
-#: addressbook/gui/widgets/e-addressbook-view.c:869
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:312
+#: addressbook/gui/widgets/e-addressbook-view.c:852
 msgid "Full Name"
 msgstr "Полное имя:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:318
 msgid "E-mail"
 msgstr "Эл.адрес"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:137
+#. This is a filename. Translators take note.
+#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:171
+msgid "list"
+msgstr "список"
+
+#: addressbook/gui/contact-editor/e-contact-save-as.c:202
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
+"%s уже существует\n"
+"Хотите переписать?"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
@@ -1449,7 +1469,7 @@ msgstr "Бразилия"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:32
 msgid "British Indian Ocean Territory"
-msgstr ""
+msgstr "Британская территория Индийского океана"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:33
 msgid "British Virgin Islands"
@@ -1457,7 +1477,7 @@ msgstr "О-ва Британской Вирджинии"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:34
 msgid "Brunei Darussalam"
-msgstr ""
+msgstr "Бруней"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:35
 msgid "Bulgaria"
@@ -1517,7 +1537,7 @@ msgstr "О-в Рождества"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:49
 msgid "Cocos (Keeling) Islands"
-msgstr ""
+msgstr "Кокосовые о-ва"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:50
 msgid "Colombia"
@@ -1617,7 +1637,7 @@ msgstr "Фолклендские о-ва"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:74
 msgid "Faroe Islands"
-msgstr ""
+msgstr "Острова Фарое"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:75
 msgid "Fiji"
@@ -1641,11 +1661,11 @@ msgstr "Французская Полинезия"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:80
 msgid "French Southern Territories"
-msgstr ""
+msgstr "Южные французские территории"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:81
 msgid "Gabon"
-msgstr ""
+msgstr "Габон"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:82
 msgid "Gambia"
@@ -1701,7 +1721,7 @@ msgstr "Гвинея-Биссау"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:95
 msgid "Guyana"
-msgstr ""
+msgstr "Гвиана"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:96
 msgid "Haiti"
@@ -1864,9 +1884,8 @@ msgid "Mauritius"
 msgstr "Мавритиус"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:136
-#, fuzzy
 msgid "Mayotte"
-msgstr "Май"
+msgstr "Майот"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:137
 msgid "Mexico"
@@ -1898,7 +1917,7 @@ msgstr "Мозамбик"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:144
 msgid "Myanmar"
-msgstr ""
+msgstr "Мианмар"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:145
 msgid "Namibia"
@@ -1906,7 +1925,7 @@ msgstr "Намибия"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:146
 msgid "Nauru"
-msgstr ""
+msgstr "Науру"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:147
 msgid "Nepal"
@@ -1918,7 +1937,7 @@ msgstr "Нидерланды"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:149
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Нидерландская Антилья"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:150
 msgid "New Caledonia"
@@ -1934,7 +1953,7 @@ msgstr "Никарагуа"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:153
 msgid "Niger"
-msgstr ""
+msgstr "Нигер"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:154
 msgid "Nigeria"
@@ -1950,7 +1969,7 @@ msgstr "Норфолкские о-ва"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:157
 msgid "Northern Mariana Islands"
-msgstr ""
+msgstr "О-ва северной Марианы"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:158
 msgid "Norway"
@@ -1966,11 +1985,11 @@ msgstr "Пакистан"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:161
 msgid "Palau"
-msgstr ""
+msgstr "Палау"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:162
 msgid "Palestinian Territory"
-msgstr ""
+msgstr "Палестинские территории"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:163
 msgid "Panama"
@@ -2115,7 +2134,7 @@ msgstr "Шри Ланка"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:198
 msgid "St. Helena"
-msgstr ""
+msgstr "Св.Елена"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:199
 msgid "St. Pierre And Miquelon"
@@ -2195,7 +2214,7 @@ msgstr ""
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:218
 msgid "U.S. Virgin Islands"
-msgstr ""
+msgstr "Американские Вирджинские о-ва"
 
 #: addressbook/gui/contact-editor/fulladdr.glade.h:219
 msgid "Uganda"
@@ -2367,7 +2386,7 @@ msgstr "Члены"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Type an email address or drag a contact into the list below:"
-msgstr ""
+msgstr "Введите эл.адрес или перетащите контакт в список приведённый ниже:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_Hide addresses when sending mail to this list"
@@ -2409,6 +2428,8 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
+"Имя или эл.адрес этого контактного лица уже существуют\n"
+"в этой папке. Всё равно хотите добавить?"
 
 #: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
 msgid "Change Anyway"
@@ -2427,90 +2448,93 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
+"Изменённый эл.адрес или имя этого контактного лица уже\n"
+"существуют в этой папке. Всё равно хотите добавить?"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:146
-#: widgets/misc/e-filter-bar.c:243
+#: widgets/misc/e-filter-bar.c:235
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:264
+#: mail/mail-search.c:263
 msgid "Search"
 msgstr "Поиск"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:121
+#: addressbook/gui/widgets/e-addressbook-model.c:127
 msgid "No cards"
 msgstr "Нет карточек"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:124
+#: addressbook/gui/widgets/e-addressbook-model.c:130
 msgid "1 card"
 msgstr "1 карточка"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:127
+#: addressbook/gui/widgets/e-addressbook-model.c:133
 #, c-format
 msgid "%d cards"
 msgstr "%d карточек"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:691
-#: addressbook/gui/widgets/e-addressbook-view.c:753
-#: addressbook/gui/widgets/e-addressbook-view.c:1422
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:139
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:673
+#: addressbook/gui/widgets/e-addressbook-view.c:735
+#: addressbook/gui/widgets/e-addressbook-view.c:1407
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
 #: ui/evolution-message-composer.xml.h:13
 msgid "Open"
 msgstr "Открыть"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:754
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:736
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:737
 msgid "Send Message to Contact"
 msgstr "Послать сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
-#: addressbook/gui/widgets/e-addressbook-view.c:756
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
+#: addressbook/gui/widgets/e-addressbook-view.c:738
 #: 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:63
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:66
 #: ui/my-evolution.xml.h:2
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
-#: addressbook/gui/widgets/e-addressbook-view.c:758
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
+#: addressbook/gui/widgets/e-addressbook-view.c:740
 msgid "Print Envelope"
 msgstr "Печать конверта"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
-#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:275
+#: addressbook/gui/widgets/e-addressbook-view.c:742 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:282 ui/evolution-addressbook.xml.h:8
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:17
 #: ui/evolution-tasks.xml.h:8
 msgid "Delete"
 msgstr "Удалить"
 
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
 #: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:452
+#: addressbook/gui/widgets/e-minicard.c:476
 msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:34
+#: shell/evolution-shell-component.c:971
 msgid "Success"
 msgstr "Успешно"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1712
-#: shell/e-storage.c:525
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1894
+#: shell/e-storage.c:528 shell/evolution-shell-component.c:1008
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -2519,7 +2543,8 @@ msgstr "Неизвестная ошибка"
 msgid "Repository offline"
 msgstr "Работать вне сети"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:515
+#: addressbook/gui/widgets/e-addressbook-util.c:37 shell/e-storage.c:516
+#: shell/evolution-shell-component.c:999
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
@@ -2536,10 +2561,9 @@ msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:726 calendar/gui/calendar-model.c:1247
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:461 camel/camel-service.c:603
-#: camel/camel-service.c:639
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1201
+#: calendar/gui/dialogs/task-details-page.glade.h:3 camel/camel-service.c:608
+#: camel/camel-service.c:644
 msgid "Cancelled"
 msgstr "Отменено"
 
@@ -2564,86 +2588,95 @@ msgid "Error removing list"
 msgstr "Ошибка при удалении списка"
 
 #: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1297
+#: addressbook/gui/widgets/e-addressbook-view.c:1280
 msgid "Error removing card"
 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:399
+#: addressbook/gui/widgets/e-addressbook-view.c:380
 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 ""
+msgstr ",123,А Б,В Г,Д Е,Ж З,И К,Л М,Н О,П Р,С Т,У Ф,Х Ц,Ч Ш,Щ Э,Ю Я"
 
 #. Translators: put here a list of characters that correspond to buttons
 #. 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:404
+#: addressbook/gui/widgets/e-addressbook-view.c:385
 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 ""
+msgstr ",0,аб,вг,де,жз,ик,лм,но,пр,ст,уф,хц,чш,щэ,юя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:850
 msgid "* Click here to add a contact *"
 msgstr "* Щелкните здесь для добавления контакта *"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:871
+#: addressbook/gui/widgets/e-addressbook-view.c:854
 msgid "Primary Phone"
 msgstr "Первый телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:855
 msgid "Assistant Phone"
 msgstr "Телефон помощника"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:873
+#: addressbook/gui/widgets/e-addressbook-view.c:856
 msgid "Business Phone"
 msgstr "Рабочий телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:874
+#: addressbook/gui/widgets/e-addressbook-view.c:857
 msgid "Callback Phone"
 msgstr "Обратный отзвон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:875
+#: addressbook/gui/widgets/e-addressbook-view.c:858
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:876
+#: addressbook/gui/widgets/e-addressbook-view.c:859
 msgid "Home Phone"
 msgstr "Домашний телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:878
+#: addressbook/gui/widgets/e-addressbook-view.c:861
 msgid "Business Address"
 msgstr "Рабочий адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:879
+#: addressbook/gui/widgets/e-addressbook-view.c:862
 msgid "Home Address"
 msgstr "Домашний адрес"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:880
+#: addressbook/gui/widgets/e-addressbook-view.c:863
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:881
+#: addressbook/gui/widgets/e-addressbook-view.c:864
 msgid "Car Phone"
 msgstr "Телефон в машине"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:867
 msgid "Business Phone 2"
 msgstr "Рабочий телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:885
+#: addressbook/gui/widgets/e-addressbook-view.c:868
 msgid "Home Phone 2"
 msgstr "Домашний телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:870
 msgid "Other Phone"
 msgstr "Другие телефоны"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Other Address"
 msgstr "Другие адреса"
 
-#: addressbook/gui/widgets/e-minicard-control.c:283
+#: addressbook/gui/widgets/e-minicard-control.c:183
+#, c-format
+msgid "and %d other cards."
+msgstr "и %d других карточек."
+
+#: addressbook/gui/widgets/e-minicard-control.c:185
+msgid "and one other card."
+msgstr "и одна другая карточка."
+
+#: addressbook/gui/widgets/e-minicard-control.c:307
 msgid "Save in addressbook"
 msgstr "Сохранить в адресной книге"
 
@@ -2833,12 +2866,17 @@ msgstr "Ширина:"
 msgid "_Font..."
 msgstr "Шрифт..."
 
-#: addressbook/printing/e-contact-print.c:1092
+#: addressbook/printing/e-contact-print.glade.h:43
+#: my-evolution/my-evolution.glade.h:32
+msgid "label26"
+msgstr "метка26"
+
+#: addressbook/printing/e-contact-print.c:1112
 msgid "Print cards"
 msgstr "Напечатать карточки"
 
-#: addressbook/printing/e-contact-print.c:1152
-#: addressbook/printing/e-contact-print.c:1174
+#: addressbook/printing/e-contact-print.c:1172
+#: addressbook/printing/e-contact-print.c:1194
 msgid "Print card"
 msgstr "Напечатать карточку"
 
@@ -2847,81 +2885,85 @@ msgstr "Напечатать карточку"
 msgid "Print envelope"
 msgstr "Печать конверта"
 
-#: calendar/cal-util/cal-util.c:418 calendar/cal-util/cal-util.c:440
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:385 mail/message-list.c:651
+#: calendar/cal-util/cal-util.c:425 calendar/cal-util/cal-util.c:447
+#: calendar/gui/dialogs/task-details-page.glade.h:6 mail/message-list.c:651
 msgid "High"
 msgstr "Высокий"
 
-#: calendar/cal-util/cal-util.c:420 calendar/cal-util/cal-util.c:442
-#: calendar/gui/calendar-model.c:1673
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:386 mail/message-list.c:650
+#: calendar/cal-util/cal-util.c:427 calendar/cal-util/cal-util.c:449
+#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/dialogs/task-details-page.glade.h:9 mail/message-list.c:650
 msgid "Normal"
 msgstr "Нормальный"
 
-#: calendar/cal-util/cal-util.c:422 calendar/cal-util/cal-util.c:444
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:387 mail/message-list.c:649
+#: calendar/cal-util/cal-util.c:429 calendar/cal-util/cal-util.c:451
+#: calendar/gui/dialogs/task-details-page.glade.h:8 mail/message-list.c:649
 msgid "Low"
 msgstr "Низкий"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:438
+#: calendar/cal-util/cal-util.c:445
 #: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:388
 msgid "Undefined"
 msgstr "Неопределенное"
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/calendar/calendar-conduit.c:923
+#: calendar/conduits/todo/todo-conduit.c:647
 msgid "Error while communicating with calendar server"
 msgstr "Ошибка при подключении к серверу календаря"
 
-#: calendar/conduits/calendar/calendar-conduit.c:900
-#: calendar/conduits/calendar/calendar-conduit.c:903
+#: calendar/conduits/calendar/calendar-conduit.c:1050
+#: calendar/conduits/calendar/calendar-conduit.c:1053
 msgid "Could not read pilot's Calendar application block"
 msgstr "Невозможно прочесть блок приложения календарь Пилота"
 
-#: calendar/conduits/todo/todo-conduit.c:668
-#: calendar/conduits/todo/todo-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:752
+#: calendar/conduits/todo/todo-conduit.c:755
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
-msgid "A sample Bonobo control which displays an calendar."
+msgid "A Bonobo control which displays a task list."
 msgstr ""
 
 #: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "A sample Bonobo control which displays an calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 msgid "Evolution calendar executive summary component."
 msgstr "Компонент Executive Summary программы Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Просмотрщик iTip/iMip календаря Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
 msgid "Evolution component for handling the calendar."
 msgstr "Компонент Evolution для обработки календаря."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
 msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Factory for the Evolution Tasks control"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
 msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
 msgid "Factory for the sample Calendar control"
 msgstr ""
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Фабрика компонента календаря Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
 #, fuzzy
 msgid "Factory to create a component editor factory"
 msgstr "Фабрика компонента календаря Evolution."
@@ -2935,49 +2977,14 @@ msgstr ""
 msgid "Factory for the alarm notification service"
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:152
-#, fuzzy, c-format
-msgid "Notification about your appointment starting on %s and ending on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:156
-#, fuzzy, c-format
-msgid "Notification about your appointment starting on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:232
+msgid "invalid time"
+msgstr "неправильное время"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:161
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:372
 #, fuzzy, c-format
-msgid "Notification about your appointment ending on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:165
-#, fuzzy
-msgid "Notification about your appointment"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:172
-#, fuzzy, c-format
-msgid "Notification about your task starting on %s and ending on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:176
-#, fuzzy, c-format
-msgid "Notification about your task starting on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:181
-#, fuzzy, c-format
-msgid "Notification about your task ending on %s"
-msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:185
-#, fuzzy
-msgid "Notification about your task"
-msgstr "Показать информацию о программе Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:267
-msgid "Alarm on %A %b %d %Y %H:%M"
-msgstr "Таймер на %A %b %d %Y %H:%M"
+msgid "Alarm on %s"
+msgstr "Отобразить параметры"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ui/evolution-comp-editor.xml.h:1
@@ -2996,11 +3003,11 @@ msgstr "Время дремания (минут)"
 msgid "_Edit appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:658
+#: calendar/gui/alarm-notify/alarm-queue.c:671
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:718
+#: calendar/gui/alarm-notify/alarm-queue.c:731
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3008,7 +3015,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:769
+#: calendar/gui/alarm-notify/alarm-queue.c:782
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger.\n"
@@ -3019,15 +3026,16 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:167 calendar/gui/main.c:58
 msgid "Could not initialize GNOME"
 msgstr "Не удалось инициализировать GNOME"
 
-#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
-msgid "Could not initialize gnome-vfs"
-msgstr "Не удалось инициализировать gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:182
+#, fuzzy
+msgid "Could not create the alarm notify service"
+msgstr "Не удалось создать временный каталог: %s"
 
-#: calendar/gui/alarm-notify/notify-main.c:90
+#: calendar/gui/alarm-notify/notify-main.c:187
 #, fuzzy
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удалось создать временный каталог: %s"
@@ -3039,7 +3047,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:442 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1389 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/e-day-view.c:1401 calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -3068,89 +3076,60 @@ msgstr ""
 "Не удалось создать окно календаря. Пожалуйста проверьте вашу установку ORBit "
 "и OAF."
 
-#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:994
-#: calendar/gui/e-calendar-table.c:364
+#: calendar/gui/calendar-model.c:417 calendar/gui/calendar-model.c:998
 msgid "Private"
 msgstr "Личное"
 
-#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:996
-#: calendar/gui/e-calendar-table.c:365
+#: calendar/gui/calendar-model.c:420 calendar/gui/calendar-model.c:1000
 msgid "Confidential"
 msgstr "Конфиденциальное"
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:363
+#: calendar/gui/calendar-model.c:423
 msgid "Public"
 msgstr "Общее"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:529
 msgid "N"
 msgstr "С"
 
-#: calendar/gui/calendar-model.c:498
+#: calendar/gui/calendar-model.c:529
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:531
 msgid "E"
 msgstr "В"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:531
 msgid "W"
 msgstr "З"
 
-#: calendar/gui/calendar-model.c:566 calendar/gui/calendar-model.c:1193
-#: calendar/gui/e-calendar-table.c:437
+#: calendar/gui/calendar-model.c:596 calendar/gui/calendar-model.c:1151
 msgid "Free"
 msgstr "Свободен"
 
-#: calendar/gui/calendar-model.c:568 calendar/gui/e-calendar-table.c:438
-#: calendar/gui/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:598 calendar/gui/e-meeting-time-sel.c:410
+#: shell/evolution-shell-component.c:993
 msgid "Busy"
 msgstr "Занят"
 
-#: calendar/gui/calendar-model.c:717 calendar/gui/calendar-model.c:1241
+#: calendar/gui/calendar-model.c:747 calendar/gui/calendar-model.c:1195
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:458
 msgid "Not Started"
 msgstr "Не начато"
 
-#: calendar/gui/calendar-model.c:720 calendar/gui/calendar-model.c:1243
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1197
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:459
 msgid "In Progress"
 msgstr "В процессе"
 
-#: calendar/gui/calendar-model.c:723 calendar/gui/calendar-model.c:1245
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1199
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:460 calendar/gui/e-meeting-model.c:298
-#: calendar/gui/e-meeting-model.c:321
+#: calendar/gui/e-meeting-model.c:316 calendar/gui/e-meeting-model.c:339
 msgid "Completed"
 msgstr "Выполнено"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:908 e-util/e-time-utils.c:163
-#: e-util/e-time-utils.c:354
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:911 e-util/e-time-utils.c:158
-#: e-util/e-time-utils.c:363
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: calendar/gui/calendar-model.c:916
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Дата должна быть введена в формате:\n"
-"\n"
-"%s"
-
-#: calendar/gui/calendar-model.c:1080
+#: calendar/gui/calendar-model.c:1056
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3160,40 +3139,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1120
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Значение процента должно быть между 0 и 100, включительно"
-
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1239 calendar/gui/dialogs/meeting-page.c:332
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1446
-#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
-#: mail/mail-config.glade.h:50
+#: calendar/gui/calendar-model.c:1193 calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1460
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:391
+#: mail/mail-config.glade.h:47
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:203
-#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:453
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:453
 #: widgets/misc/e-dateedit.c:1453 widgets/misc/e-dateedit.c:1568
 msgid "None"
 msgstr "Нет"
 
-#: calendar/gui/calendar-model.c:1675
+#: calendar/gui/calendar-model.c:1703
 msgid "Recurring"
 msgstr "Повторение"
 
-#: calendar/gui/calendar-model.c:1677
+#: calendar/gui/calendar-model.c:1705
 msgid "Assigned"
 msgstr "Связанное"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:270
-#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
-#: calendar/gui/e-meeting-model.c:702
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:298 calendar/gui/e-meeting-model.c:524
 msgid "Yes"
 msgstr "Да"
 
-#: calendar/gui/calendar-model.c:1683 calendar/gui/e-meeting-model.c:282
-#: calendar/gui/e-meeting-model.c:703
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:300
 msgid "No"
 msgstr "Нет"
 
+#. No time range is set, so don't start a query
+#: calendar/gui/calendar-model.c:2010 calendar/gui/e-day-view.c:1675
+#: calendar/gui/e-week-view.c:1182
+msgid "Searching"
+msgstr "Поиск"
+
 #: calendar/gui/calendar-view-factory.c:149 views/calendar/galview.xml.h:1
 msgid "Day View"
 msgstr "Просмотр дня"
@@ -3222,45 +3201,43 @@ msgstr "Описание содержит"
 msgid "Comment contains"
 msgstr "Коментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1061
+#: calendar/gui/cal-search-bar.c:416
 msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/component-factory.c:63 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
+#: calendar/gui/component-factory.c:64 my-evolution/my-evolution.glade.h:7
+#: shell/e-shortcuts.c:1055
 msgid "Calendar"
 msgstr "Календарь"
 
-#: calendar/gui/component-factory.c:64
+#: calendar/gui/component-factory.c:65
 msgid "Folder containing appointments and events"
 msgstr ""
 
-#: calendar/gui/component-factory.c:68 calendar/gui/print.c:1723
-#: my-evolution/e-summary-tasks.c:235 my-evolution/e-summary-tasks.c:251
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
+#: calendar/gui/component-factory.c:69 my-evolution/e-summary-tasks.c:246
+#: my-evolution/e-summary-tasks.c:262 shell/e-shortcuts.c:1058
 #: views/tasks/galview.xml.h:1
 msgid "Tasks"
 msgstr "Задания"
 
-#: calendar/gui/component-factory.c:69
-#, fuzzy
+#: calendar/gui/component-factory.c:70
 msgid "Folder containing to-do items"
-msgstr "Вирт.папка по списку рассылки"
+msgstr "Папка содержащая элементы \"Выполнить\""
 
-#: calendar/gui/component-factory.c:581 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:643 ui/evolution-calendar.xml.h:7
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/component-factory.c:582 calendar/gui/e-day-view.c:3423
+#: calendar/gui/component-factory.c:644 calendar/gui/e-day-view.c:3447
 msgid "New _Appointment"
 msgstr "Новая встреча"
 
-#: calendar/gui/component-factory.c:587 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:649 ui/evolution-calendar.xml.h:8
 #: ui/evolution-tasks.xml.h:5
 msgid "Create a new task"
 msgstr "Создать новое задание"
 
-#: calendar/gui/component-factory.c:588
+#: calendar/gui/component-factory.c:650
 msgid "New _Task"
 msgstr "Новое задание"
 
@@ -3294,9 +3271,8 @@ msgid "Alarm Repeat"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:2
-#, fuzzy
 msgid "Message to Display"
-msgstr "Хранилище сообщений"
+msgstr "Отображаемое сообщение"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Play sound:"
@@ -3325,9 +3301,8 @@ msgid "days"
 msgstr "дни"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:9
-#, fuzzy
 msgid "extra times every"
-msgstr "Обновлять каждые "
+msgstr "дополнительное время каждые"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:84
 msgid "hours"
@@ -3337,116 +3312,110 @@ msgstr "часы"
 msgid "minutes"
 msgstr "минуты"
 
-#: calendar/gui/dialogs/alarm-page.c:307
+#: calendar/gui/dialogs/alarm-page.c:310
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
-#: calendar/gui/dialogs/alarm-page.c:310
+#: calendar/gui/dialogs/alarm-page.c:313
 msgid "1 day"
 msgstr "1 день"
 
-#: calendar/gui/dialogs/alarm-page.c:315
+#: calendar/gui/dialogs/alarm-page.c:318
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
-#: calendar/gui/dialogs/alarm-page.c:318
+#: calendar/gui/dialogs/alarm-page.c:321
 msgid "1 week"
 msgstr "1 неделя"
 
-#: calendar/gui/dialogs/alarm-page.c:323
+#: calendar/gui/dialogs/alarm-page.c:326
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
-#: calendar/gui/dialogs/alarm-page.c:326
+#: calendar/gui/dialogs/alarm-page.c:329
 msgid "1 hour"
 msgstr "1 час"
 
-#: calendar/gui/dialogs/alarm-page.c:331
+#: calendar/gui/dialogs/alarm-page.c:334
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:337
 msgid "1 minute"
 msgstr "1 минута"
 
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:342
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:345
 msgid "1 second"
 msgstr "1 секунда"
 
-#: calendar/gui/dialogs/alarm-page.c:373
+#: calendar/gui/dialogs/alarm-page.c:374
 #: calendar/gui/dialogs/alarm-page.glade.h:4
 msgid "Play a sound"
 msgstr "Воспроизвести звук"
 
-#: calendar/gui/dialogs/alarm-page.c:377
+#: calendar/gui/dialogs/alarm-page.c:378
 #: calendar/gui/dialogs/alarm-page.glade.h:3
 msgid "Display a message"
 msgstr "Показать сообщение"
 
-#: calendar/gui/dialogs/alarm-page.c:381
+#: calendar/gui/dialogs/alarm-page.c:382
 msgid "Send an email"
 msgstr "Отправить почту"
 
-#: calendar/gui/dialogs/alarm-page.c:385
+#: calendar/gui/dialogs/alarm-page.c:386
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Run a program"
 msgstr "Запустить программу"
 
-#: calendar/gui/dialogs/alarm-page.c:391
-#, fuzzy
+#: calendar/gui/dialogs/alarm-page.c:392
 msgid "Unknown action to be performed"
-msgstr "Неизвестная ошибка"
+msgstr "Неизвестное действие для выполнения"
 
-#: calendar/gui/dialogs/alarm-page.c:403
+#: calendar/gui/dialogs/alarm-page.c:404
 #, fuzzy, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "до начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:406
+#: calendar/gui/dialogs/alarm-page.c:407
 #, fuzzy, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "до начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:411
+#: calendar/gui/dialogs/alarm-page.c:412
 #, fuzzy, c-format
 msgid "%s at the start of the appointment"
 msgstr "до начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:420
+#: calendar/gui/dialogs/alarm-page.c:421
 #, fuzzy, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "до начала встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:423
+#: calendar/gui/dialogs/alarm-page.c:424
 #, fuzzy, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "после окончания встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:428
+#: calendar/gui/dialogs/alarm-page.c:429
 #, fuzzy, c-format
 msgid "%s at the end of the appointment"
 msgstr "после окончания встречи"
 
-#: calendar/gui/dialogs/alarm-page.c:439
-#, fuzzy, c-format
-msgid "%s at an unknown time"
-msgstr "Неизвестная ошибка"
-
-#: calendar/gui/dialogs/alarm-page.c:445
-#, fuzzy, c-format
+#: calendar/gui/dialogs/alarm-page.c:454
+#, c-format
 msgid "%s at %s"
-msgstr "%s сервер %s"
+msgstr "%s на %s"
 
-#: calendar/gui/dialogs/alarm-page.c:452
+#: calendar/gui/dialogs/alarm-page.c:460
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr ""
@@ -3497,11 +3466,15 @@ msgstr "завершение встречи"
 msgid "hour(s)"
 msgstr "часы"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:117
+#: calendar/gui/dialogs/alarm-page.glade.h:16
+msgid "label55"
+msgstr "метка26"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:120
 msgid "minute(s)"
 msgstr "минуты"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "начало встречи"
 
@@ -3551,7 +3524,7 @@ msgid "First day of wee_k:"
 msgstr "Первый день недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:956
+#: calendar/gui/dialogs/recurrence-page.c:964
 msgid "Friday"
 msgstr "Пятница"
 
@@ -3564,7 +3537,7 @@ msgid "Minutes"
 msgstr "Минуты"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:952
+#: calendar/gui/dialogs/recurrence-page.c:960
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -3573,7 +3546,7 @@ msgid "O_verdue tasks:"
 msgstr "Просроченные задания:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:957
+#: calendar/gui/dialogs/recurrence-page.c:965
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -3596,7 +3569,7 @@ msgid "Su_n"
 msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:958
+#: calendar/gui/dialogs/recurrence-page.c:966
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -3614,7 +3587,7 @@ msgid "Tas_ks due today:"
 msgstr "Задания установленные на сегодня"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:955
+#: calendar/gui/dialogs/recurrence-page.c:963
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -3635,12 +3608,12 @@ msgid "Time format:"
 msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:953
+#: calendar/gui/dialogs/recurrence-page.c:961
 msgid "Tuesday"
 msgstr "Вторник"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:954
+#: calendar/gui/dialogs/recurrence-page.c:962
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -3659,7 +3632,7 @@ msgstr "24-часовой"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "_Ask for confirmation when deleting items"
-msgstr ""
+msgstr "Запрос подтверждения при удалении элементов"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "_Compress weekends in month view"
@@ -3769,57 +3742,62 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:167 calendar/gui/print.c:2132
+#: calendar/gui/dialogs/comp-editor-util.c:179 calendar/gui/print.c:2164
 msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:171 calendar/gui/print.c:2136
+#: calendar/gui/dialogs/comp-editor-util.c:183 calendar/gui/print.c:2168
 msgid " (Completed "
 msgstr " (Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:173 calendar/gui/print.c:2138
+#: calendar/gui/dialogs/comp-editor-util.c:185 calendar/gui/print.c:2170
 msgid "Completed "
 msgstr "Выполнено "
 
-#: calendar/gui/dialogs/comp-editor-util.c:178 calendar/gui/print.c:2143
+#: calendar/gui/dialogs/comp-editor-util.c:190 calendar/gui/print.c:2175
 msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:180 calendar/gui/print.c:2145
+#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2177
 #, fuzzy
 msgid "Due "
 msgstr "Условленная дата"
 
-#: calendar/gui/dialogs/comp-editor.c:521
+#: calendar/gui/dialogs/comp-editor.c:304
+#, fuzzy
+msgid "Could not update object!"
+msgstr "Невозможно обновить файлы корректно"
+
+#: calendar/gui/dialogs/comp-editor.c:672
 msgid "Edit Appointment"
 msgstr "Правка встречи"
 
-#: calendar/gui/dialogs/comp-editor.c:526
+#: calendar/gui/dialogs/comp-editor.c:677
 #, c-format
 msgid "Appointment - %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:529
+#: calendar/gui/dialogs/comp-editor.c:680
 #, c-format
 msgid "Task - %s"
 msgstr "Задание - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:532
+#: calendar/gui/dialogs/comp-editor.c:683
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Журнальная запись - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:546
+#: calendar/gui/dialogs/comp-editor.c:697
 msgid "No summary"
 msgstr "Нет итога"
 
-#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1748
-#: mail/mail-display.c:100
+#: calendar/gui/dialogs/comp-editor.c:1047 mail/mail-callbacks.c:1845
+#: mail/mail-display.c:102
 msgid "Overwrite file?"
 msgstr "Переписать файл?"
 
-#: calendar/gui/dialogs/comp-editor.c:958 mail/mail-callbacks.c:1756
-#: mail/mail-display.c:104
+#: calendar/gui/dialogs/comp-editor.c:1051 mail/mail-callbacks.c:1852
+#: mail/mail-display.c:106
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3827,12 +3805,12 @@ msgstr ""
 "Файл с таким названием уже существует.\n"
 "Переписать его?"
 
-#: calendar/gui/dialogs/comp-editor.c:1021 ui/evolution-comp-editor.xml.h:13
-#: widgets/misc/e-filter-bar.h:101
+#: calendar/gui/dialogs/comp-editor.c:1095 ui/evolution-comp-editor.xml.h:13
+#: widgets/misc/e-filter-bar.h:102
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/dialogs/comp-editor.c:1174
+#: calendar/gui/dialogs/comp-editor.c:1250
 msgid "Unable to obtain current version!"
 msgstr ""
 
@@ -3905,13 +3883,13 @@ msgid "Recurrence"
 msgstr "Повторение"
 
 #: calendar/gui/dialogs/event-editor.c:203
-#: calendar/gui/dialogs/event-editor.c:353
+#: calendar/gui/dialogs/event-editor.c:355
 #, fuzzy
 msgid "Scheduling"
 msgstr "Вставить встречу в расписание"
 
 #: calendar/gui/dialogs/event-editor.c:208
-#: calendar/gui/dialogs/event-editor.c:356
+#: calendar/gui/dialogs/event-editor.c:358
 msgid "Meeting"
 msgstr "Совещание"
 
@@ -3925,16 +3903,16 @@ msgstr "Занят"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Классификация"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Конфиденциальное"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
+#: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Дата и время"
 
@@ -3943,22 +3921,21 @@ msgid "F_ree"
 msgstr "Свободен"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Личное"
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Общее"
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Показать время как"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Итог:"
 
@@ -3970,102 +3947,19 @@ msgstr "Время окончания:"
 msgid "_Start time:"
 msgstr "Время начала:"
 
-#: calendar/gui/dialogs/meeting-page.c:510
+#: calendar/gui/dialogs/meeting-page.c:424
+msgid "An organizer is required."
+msgstr ""
+
+#: calendar/gui/dialogs/meeting-page.c:624
 msgid "That person is already attending the meeting!"
 msgstr "Этот человек уже участвует в совещании!"
 
-#: calendar/gui/dialogs/meeting-page.c:554
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Chair Persons"
-msgstr "Телефон в машине"
-
-#: calendar/gui/dialogs/meeting-page.c:556
-#: calendar/gui/dialogs/meeting-page.c:589
-#: calendar/gui/dialogs/meeting-page.c:710
-msgid "Required Participants"
-msgstr "Требуемые участники"
-
-#: calendar/gui/dialogs/meeting-page.c:558
-#: calendar/gui/dialogs/meeting-page.c:589
-msgid "Optional Participants"
-msgstr "Дополнительные участники"
-
-#: calendar/gui/dialogs/meeting-page.c:560
-#: calendar/gui/dialogs/meeting-page.c:589
-#, fuzzy
-msgid "Non-Participants"
-msgstr "Дополнительные участники"
-
-#: calendar/gui/dialogs/meeting-page.c:836
+#: calendar/gui/dialogs/meeting-page.c:697
 #, fuzzy
 msgid "_Delegate To..."
 msgstr "Удалить..."
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-#, fuzzy
-msgid "Attendee"
-msgstr "Все сопровождение"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:2
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Щелкните здесь для добавления контакта *"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-#, fuzzy
-msgid "Common Name"
-msgstr "Название счёта"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-#, fuzzy
-msgid "Delegated From"
-msgstr "Удаленное"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-#, fuzzy
-msgid "Delegated To"
-msgstr "Удаленное"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Язык"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Член"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роль"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
-#: mail/message-list.etspec.h:8
-msgid "Status"
-msgstr "Состояние"
-
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:87
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Тип"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4083,29 +3977,29 @@ msgstr "Пригласить других"
 msgid "_Other Organizer"
 msgstr "Другой организатор"
 
-#: calendar/gui/dialogs/recurrence-page.c:571
+#: calendar/gui/dialogs/recurrence-page.c:572
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Эта встреча имеет правила повторения, которые не могут быть отредактированы "
 "в Evolution."
 
-#: calendar/gui/dialogs/recurrence-page.c:925
+#: calendar/gui/dialogs/recurrence-page.c:933
 msgid "on"
 msgstr "в"
 
-#: calendar/gui/dialogs/recurrence-page.c:951 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:959 filter/filter-datespec.c:83
 msgid "day"
 msgstr "день"
 
-#: calendar/gui/dialogs/recurrence-page.c:1081
+#: calendar/gui/dialogs/recurrence-page.c:1089
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:1089
+#: calendar/gui/dialogs/recurrence-page.c:1097
 msgid "th"
 msgstr "ый"
 
-#: calendar/gui/dialogs/recurrence-page.c:1262
+#: calendar/gui/dialogs/recurrence-page.c:1270
 msgid "occurrences"
 msgstr "случаи"
 
@@ -4154,18 +4048,22 @@ msgid "forever"
 msgstr "всегда"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid "label21"
+msgstr "метка26"
+
+#: calendar/gui/dialogs/recurrence-page.glade.h:18
 msgid "month(s)"
 msgstr "месяцы"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "until"
 msgstr "до"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:20
 msgid "week(s)"
 msgstr "неделя"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:21
 msgid "year(s)"
 msgstr "год"
 
@@ -4186,7 +4084,6 @@ msgid "The journal entry has changed. Send an updated version?"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% Выполнения:"
@@ -4200,7 +4097,7 @@ msgid "Progress"
 msgstr "Продвижение"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:950
+#: my-evolution/e-summary-preferences.c:951
 msgid "URL:"
 msgstr "URL:"
 
@@ -4212,185 +4109,107 @@ msgstr "Приоритет:"
 msgid "_Status:"
 msgstr "Состояние:"
 
-#: calendar/gui/dialogs/task-editor.c:189
-#: calendar/gui/dialogs/task-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:191
+#: calendar/gui/dialogs/task-editor.c:230
+#: calendar/gui/dialogs/task-editor.c:325
 #, fuzzy
 msgid "Assignment"
 msgstr "Связанное"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
+#: calendar/gui/dialogs/task-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:28
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:26
 msgid "Description:"
 msgstr "Описание:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Sta_rt Date:"
 msgstr "Дата начала:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "_Confidential"
-msgstr "Конфиденциальное"
-
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "_Due Date:"
 msgstr "Условленная дата:"
 
-#: calendar/gui/e-calendar-table.c:407
-#, c-format
-msgid "0%"
-msgstr "0%"
-
-#: calendar/gui/e-calendar-table.c:408
-#, c-format
-msgid "10%"
-msgstr "10%"
-
-#: calendar/gui/e-calendar-table.c:409
-#, c-format
-msgid "20%"
-msgstr "20%"
-
-#: calendar/gui/e-calendar-table.c:410
-#, c-format
-msgid "30%"
-msgstr "30%"
-
-#: calendar/gui/e-calendar-table.c:411
-#, c-format
-msgid "40%"
-msgstr "40%"
-
-#: calendar/gui/e-calendar-table.c:412
-#, c-format
-msgid "50%"
-msgstr "50%"
-
-#: calendar/gui/e-calendar-table.c:413
-#, c-format
-msgid "60%"
-msgstr "60%"
-
-#: calendar/gui/e-calendar-table.c:414
-#, c-format
-msgid "70%"
-msgstr "70%"
-
-#: calendar/gui/e-calendar-table.c:415
-#, c-format
-msgid "80%"
-msgstr "80%"
-
-#: calendar/gui/e-calendar-table.c:416
-#, c-format
-msgid "90%"
-msgstr "90%"
-
-#: calendar/gui/e-calendar-table.c:417
-#, c-format
-msgid "100%"
-msgstr "100%"
+#: calendar/gui/e-calendar-table.c:722 calendar/gui/e-day-view.c:2724
+#: calendar/gui/e-week-view.c:1822
+#, fuzzy
+msgid "Deleting selected objects"
+msgstr "Удалить выбранные контакты"
 
-#: calendar/gui/e-calendar-table.c:914 calendar/gui/e-day-view.c:3444
-#: calendar/gui/e-week-view.c:3296 mail/folder-browser.c:1401
-#: shell/e-shortcuts-view.c:385
+#: calendar/gui/e-calendar-table.c:939 calendar/gui/e-day-view.c:3468
+#: calendar/gui/e-week-view.c:3322 mail/folder-browser.c:1444
+#: shell/e-shortcuts-view.c:384
 msgid "_Open"
 msgstr "Открыть"
 
-#: calendar/gui/e-calendar-table.c:918 calendar/gui/e-day-view.c:3453
-#: calendar/gui/e-week-view.c:3305 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:943 calendar/gui/e-day-view.c:3477
+#: calendar/gui/e-week-view.c:3331 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:920 calendar/gui/e-day-view.c:3455
-#: calendar/gui/e-week-view.c:3307 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:945 calendar/gui/e-day-view.c:3479
+#: calendar/gui/e-week-view.c:3333 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:14
 msgid "_Copy"
 msgstr "Скопировать"
 
-#: calendar/gui/e-calendar-table.c:922 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-day-view.c:3457 calendar/gui/e-week-view.c:3283
-#: calendar/gui/e-week-view.c:3309 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:947 calendar/gui/e-day-view.c:3454
+#: calendar/gui/e-day-view.c:3481 calendar/gui/e-week-view.c:3309
+#: calendar/gui/e-week-view.c:3335 ui/evolution-addressbook.xml.h:36
 #: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:17
 msgid "_Paste"
 msgstr "Вставить"
 
-#: calendar/gui/e-calendar-table.c:927
+#: calendar/gui/e-calendar-table.c:952
 msgid "_Mark as Complete"
 msgstr "Пометить как выполненное"
 
-#: calendar/gui/e-calendar-table.c:929
+#: calendar/gui/e-calendar-table.c:954
 msgid "_Delete this Task"
 msgstr "Удалить это задание"
 
-#: calendar/gui/e-calendar-table.c:932
+#: calendar/gui/e-calendar-table.c:957
 msgid "_Mark Tasks as Complete"
 msgstr "Пометить задания как выполненные"
 
-#: calendar/gui/e-calendar-table.c:934
+#: calendar/gui/e-calendar-table.c:959
 msgid "_Delete Selected Tasks"
 msgstr "Удалить выбранные задания"
 
-#: calendar/gui/e-calendar-table.c:1194
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1141 calendar/gui/e-day-view.c:6955
+#: calendar/gui/e-week-view.c:3816
+msgid "Updating objects"
+msgstr "Обновление объектов"
+
+#: calendar/gui/e-calendar-table.c:1224
 msgid "Click to add a task"
 msgstr "Щелкните для добавления задачи"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:718
-#: camel/camel-filter-driver.c:834
-msgid "Complete"
-msgstr "Выполнено"
-
-#: calendar/gui/e-calendar-table.etspec.h:8
-#, fuzzy
-msgid "Completion Date"
-msgstr "Выполнено"
-
-#: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Due Date"
-msgstr "Условленная дата:"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#, fuzzy
-msgid "End Date"
-msgstr "Дата"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:123 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
+#: calendar/gui/e-cell-date-edit-text.c:128
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
-
-#: calendar/gui/e-calendar-table.etspec.h:12
-msgid "Priority"
-msgstr "Приоритет"
-
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. FIXME: Inbox shortcut should point to something else for
-#. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1050
-#: shell/e-storage-set-view.c:1453 shell/e-summary-storage.c:80
-msgid "Summary"
-msgstr "Итог"
-
-#: calendar/gui/e-calendar-table.etspec.h:17
-#, fuzzy
-msgid "Task sort"
-msgstr "Список заданий"
-
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
+"Дата должна быть введена в формате:\n"
+"\n"
+"%s"
 
 #: calendar/gui/e-day-view-time-item.c:519
 #, c-format
@@ -4399,325 +4218,99 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1375
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1387
 #: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1462
 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:293 calendar/gui/e-day-view.c:1402
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1414
 #: calendar/gui/e-week-view-main-item.c:348
 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:609 calendar/gui/e-week-view.c:345
-#: calendar/gui/print.c:769
+#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
 msgid "am"
 msgstr "д.п."
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:612 calendar/gui/e-week-view.c:348
-#: calendar/gui/print.c:771
+#: calendar/gui/e-day-view.c:615 calendar/gui/e-week-view.c:351
 msgid "pm"
 msgstr "п.п."
 
-#: calendar/gui/e-day-view.c:3425 calendar/gui/e-week-view.c:3278
+#: calendar/gui/e-day-view.c:3449 calendar/gui/e-week-view.c:3304
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-day-view.c:3435 calendar/gui/e-week-view.c:3288
+#: calendar/gui/e-day-view.c:3459 calendar/gui/e-week-view.c:3314
 #: ui/evolution-calendar.xml.h:17
 msgid "Go to _Today"
 msgstr "Перейти к сегодняшнему дню"
 
-#: calendar/gui/e-day-view.c:3437 calendar/gui/e-week-view.c:3290
+#: calendar/gui/e-day-view.c:3461 calendar/gui/e-week-view.c:3316
 msgid "_Go to Date..."
 msgstr "Перейти к дате..."
 
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3298
+#: calendar/gui/e-day-view.c:3470 calendar/gui/e-week-view.c:3324
 msgid "_Delete this Appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:3465 calendar/gui/e-week-view.c:3323
+#: calendar/gui/e-day-view.c:3489 calendar/gui/e-week-view.c:3349
 msgid "Make this Occurrence _Movable"
 msgstr "Сделать эту вхождение перемещаемым"
 
-#: calendar/gui/e-day-view.c:3467 calendar/gui/e-week-view.c:3325
+#: calendar/gui/e-day-view.c:3491 calendar/gui/e-week-view.c:3351
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-day-view.c:3469 calendar/gui/e-week-view.c:3327
+#: calendar/gui/e-day-view.c:3493 calendar/gui/e-week-view.c:3353
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-itip-control.c:469
-msgid "Meeting begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:474
-msgid "Task begins: <b>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:479
-#, fuzzy
-msgid "Free/Busy info begins: <b>"
-msgstr "Необходимая информация"
-
-#: calendar/gui/e-itip-control.c:483
-msgid "Begins: <b>"
-msgstr ""
-
-#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:677
-msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:692
-#, c-format
-msgid "<b>Summary:</b> %s<br><br>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:692
-msgid "<i>None</i>"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:702
-#, c-format
-msgid "<b>Description:</b> %s"
-msgstr "<b>Описание:</b> %s"
-
-#: calendar/gui/e-itip-control.c:737
-#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:738
-msgid "Meeting Information"
-msgstr "Информация о встрече"
-
-#: calendar/gui/e-itip-control.c:742
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:743
-#, fuzzy
-msgid "Meeting Proposal"
-msgstr "Совещание"
-
-#: calendar/gui/e-itip-control.c:747
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:748
-#, fuzzy
-msgid "Meeting Update"
-msgstr "Время завершения собрания:"
-
-#: calendar/gui/e-itip-control.c:752
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:753
-msgid "Meeting Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:757
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "Это запрос совещания."
-
-#: calendar/gui/e-itip-control.c:758
-#, fuzzy
-msgid "Meeting Reply"
-msgstr "Совещание"
-
-#: calendar/gui/e-itip-control.c:762
-#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:763
-#, fuzzy
-msgid "Meeting Cancellation"
-msgstr "Выбрать действие"
-
-#: calendar/gui/e-itip-control.c:767 calendar/gui/e-itip-control.c:815
-#: calendar/gui/e-itip-control.c:848
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:768
-#, fuzzy
-msgid "Bad Meeting Message"
-msgstr "Поиск в сообщении"
-
-#: calendar/gui/e-itip-control.c:785
-#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:786
-#, fuzzy
-msgid "Task Information"
-msgstr "Информация"
-
-#: calendar/gui/e-itip-control.c:790
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:791
-msgid "Task Proposal"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:795
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:796
-#, fuzzy
-msgid "Task Update"
-msgstr "было после"
-
-#: calendar/gui/e-itip-control.c:800
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:801
-msgid "Task Update Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:805
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "Это запрос совещания."
-
-#: calendar/gui/e-itip-control.c:806
-#, fuzzy
-msgid "Task Reply"
-msgstr "Ответить"
-
-#: calendar/gui/e-itip-control.c:810
-#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:811
-#, fuzzy
-msgid "Task Cancellation"
-msgstr "Отменить операцию"
-
-#: calendar/gui/e-itip-control.c:816
-#, fuzzy
-msgid "Bad Task Message"
-msgstr "Сообщение календаря"
-
-#: calendar/gui/e-itip-control.c:833
-#, fuzzy, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "Необходимая информация"
-
-#: calendar/gui/e-itip-control.c:834
-#, fuzzy
-msgid "Free/Busy Information"
-msgstr "Необходимая информация"
-
-#: calendar/gui/e-itip-control.c:838
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:839
-msgid "Free/Busy Request"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:843
-#, fuzzy, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "Это запрос совещания."
-
-#: calendar/gui/e-itip-control.c:844
-msgid "Free/Busy Reply"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:849
-#, fuzzy
-msgid "Bad Free/Busy Message"
-msgstr "Предыдущее сообщение"
-
-#: calendar/gui/e-itip-control.c:917
-#, fuzzy
-msgid "The message does not appear to be properly formed"
-msgstr "Видимо папка невостановимо испорчена."
-
-#: calendar/gui/e-itip-control.c:936
-msgid "The message contains only unsupported requests."
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:964 calendar/gui/e-itip-control.c:970
-msgid "The attachment does not contain a valid calendar message"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:995
-msgid "The attachment has no viewable calendar items"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1094
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1184
 msgid "Calendar file could not be updated!\n"
-msgstr "Курсор не может быть загружен\n"
+msgstr "Файл календаря не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1096
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1186
 msgid "Update complete\n"
-msgstr "Дата выполнения:"
+msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1141
+#: calendar/gui/e-itip-control.c:1231
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1239
 msgid "Attendee status ould not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1151
+#: calendar/gui/e-itip-control.c:1241
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1153
+#: calendar/gui/e-itip-control.c:1243
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy
 msgid "I couldn't remove the item from your calendar file!\n"
 msgstr "Не удалось открыть ваш файл календаря!\n"
 
-#: calendar/gui/e-itip-control.c:1183
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1273
 msgid "Removal Complete"
-msgstr "% Выполнения:"
+msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:1215 calendar/gui/e-itip-control.c:1249
-#, fuzzy
+#: calendar/gui/e-itip-control.c:1305 calendar/gui/e-itip-control.c:1339
 msgid "Item sent!\n"
-msgstr "Дата отправки"
+msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:1217 calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1307 calendar/gui/e-itip-control.c:1343
 msgid "The item could not be sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1417
+#: calendar/gui/e-itip-control.c:1507
 msgid "Unable to find any of your identities in the attendees list!\n"
 msgstr ""
 
@@ -4758,195 +4351,214 @@ msgstr "дата-завершения"
 msgid "date-start"
 msgstr "дата-начала"
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+#: calendar/gui/e-meeting-model.c:219 calendar/gui/e-meeting-model.c:236
+#: calendar/gui/e-meeting-model.c:520
 msgid "Individual"
 msgstr "Индивидуальное"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:671
+#: calendar/gui/e-meeting-model.c:221 calendar/gui/e-meeting-model.c:238
 msgid "Group"
 msgstr "Группа"
 
-#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
-#: calendar/gui/e-meeting-model.c:672
+#: calendar/gui/e-meeting-model.c:223 calendar/gui/e-meeting-model.c:240
 msgid "Resource"
 msgstr "Источник"
 
-#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
-#: calendar/gui/e-meeting-model.c:673
+#: calendar/gui/e-meeting-model.c:225 calendar/gui/e-meeting-model.c:242
 msgid "Room"
 msgstr "Комната"
 
-#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
-#: calendar/gui/e-meeting-model.c:690
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:279
+#: calendar/gui/e-meeting-model.c:344
+#: camel/providers/smtp/camel-smtp-transport.c:223
 #: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:440
 msgid "Unknown"
 msgstr "Неизвестное"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:686
+#: calendar/gui/e-meeting-model.c:254 calendar/gui/e-meeting-model.c:271
 msgid "Chair"
 msgstr "Председатель"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+#: calendar/gui/e-meeting-model.c:256 calendar/gui/e-meeting-model.c:273
+#: calendar/gui/e-meeting-model.c:522
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
-#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:688
+#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:275
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
-#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
-#: calendar/gui/e-meeting-model.c:689
+#: calendar/gui/e-meeting-model.c:260 calendar/gui/e-meeting-model.c:277
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
-#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
+#: calendar/gui/e-meeting-model.c:530
 #, fuzzy
 msgid "Needs Action"
 msgstr "Добавить действие"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:716
+#: calendar/gui/e-meeting-model.c:308 calendar/gui/e-meeting-model.c:331
 msgid "Accepted"
 msgstr "Принято"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:717
+#: calendar/gui/e-meeting-model.c:310 calendar/gui/e-meeting-model.c:333
 msgid "Declined"
 msgstr "Отклонено"
 
-#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
-#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:335
+#: calendar/gui/e-meeting-time-sel.c:409
 msgid "Tentative"
 msgstr "Экспериментальный"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
-#: calendar/gui/e-meeting-model.c:719
+#: calendar/gui/e-meeting-model.c:314 calendar/gui/e-meeting-model.c:337
 #, fuzzy
 msgid "Delegated"
 msgstr "Удаленное"
 
-#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:318 calendar/gui/e-meeting-model.c:341
 msgid "In Process"
 msgstr "В процессе"
 
+#: calendar/gui/e-meeting-model.c:1350 calendar/gui/e-meeting-model.c:1463
+#, fuzzy
+msgid "Chair Persons"
+msgstr "Телефон в машине"
+
+#: calendar/gui/e-meeting-model.c:1351 calendar/gui/e-meeting-model.c:1418
+#: calendar/gui/e-meeting-model.c:1465
+msgid "Required Participants"
+msgstr "Требуемые участники"
+
+#: calendar/gui/e-meeting-model.c:1352 calendar/gui/e-meeting-model.c:1467
+msgid "Optional Participants"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/e-meeting-model.c:1353 calendar/gui/e-meeting-model.c:1469
+#, fuzzy
+msgid "Non-Participants"
+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:472
-#: calendar/gui/e-meeting-time-sel.c:1937
+#: calendar/gui/e-meeting-time-sel-item.c:473
+#: calendar/gui/e-meeting-time-sel.c:2024
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %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:476
-#: calendar/gui/e-meeting-time-sel.c:1965 e-util/e-time-utils.c:186
+#: calendar/gui/e-meeting-time-sel-item.c:477
+#: calendar/gui/e-meeting-time-sel.c:2054 e-util/e-time-utils.c:186
 #: e-util/e-time-utils.c:345
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: calendar/gui/e-meeting-time-sel-item.c:481 e-util/e-time-utils.c:221
 #: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1577
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:394
+#: calendar/gui/e-meeting-time-sel.c:411
 msgid "Out of Office"
 msgstr "Вне офиса"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:412
 msgid "No Information"
 msgstr "Нет информации"
 
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:428
 msgid "_Invite Others..."
 msgstr "Пригласить других..."
 
-#: calendar/gui/e-meeting-time-sel.c:431
+#: calendar/gui/e-meeting-time-sel.c:448
 msgid "_Options"
 msgstr "Параметры"
 
-#: calendar/gui/e-meeting-time-sel.c:448
+#: calendar/gui/e-meeting-time-sel.c:465
 msgid "Show _Only Working Hours"
 msgstr "Показывать только рабочие часы"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _Zoomed Out"
 msgstr "Показывать уменьшенные"
 
-#: calendar/gui/e-meeting-time-sel.c:479
+#: calendar/gui/e-meeting-time-sel.c:496
 msgid "_Update Free/Busy"
 msgstr "Обновить Свободен/Занят"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:514
 msgid "_<<"
 msgstr "<<"
 
-#: calendar/gui/e-meeting-time-sel.c:514
+#: calendar/gui/e-meeting-time-sel.c:531
 msgid "_Autopick"
 msgstr "Автовыбор"
 
-#: calendar/gui/e-meeting-time-sel.c:528
+#: calendar/gui/e-meeting-time-sel.c:545
 msgid ">_>"
 msgstr ">>"
 
-#: calendar/gui/e-meeting-time-sel.c:545
+#: calendar/gui/e-meeting-time-sel.c:562
 msgid "_All People and Resources"
 msgstr "Все люди и ресурсы"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:575
 msgid "All _People and One Resource"
 msgstr "Все люди и один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:571
+#: calendar/gui/e-meeting-time-sel.c:588
 msgid "_Required People"
 msgstr "Требуемые люди"
 
-#: calendar/gui/e-meeting-time-sel.c:584
+#: calendar/gui/e-meeting-time-sel.c:601
 msgid "Required People and _One Resource"
 msgstr "Требуемые люди и один ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:624
 msgid "Meeting _start time:"
 msgstr "Время начала собрания:"
 
-#: calendar/gui/e-meeting-time-sel.c:626
+#: calendar/gui/e-meeting-time-sel.c:643
 msgid "Meeting _end time:"
 msgstr "Время завершения собрания:"
 
-#: calendar/gui/e-tasks.c:349
+#: calendar/gui/e-tasks.c:329
+#, fuzzy, c-format
+msgid "Opening tasks at %s"
+msgstr "Открытие хранилища %s"
+
+#: calendar/gui/e-tasks.c:356
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Невозможно загрузить задание в \"%s\""
 
-#: calendar/gui/e-tasks.c:361
+#: calendar/gui/e-tasks.c:368
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
 
-#: calendar/gui/e-week-view.c:3276 calendar/gui/e-week-view.c:3314
+#: calendar/gui/e-week-view.c:3302 calendar/gui/e-week-view.c:3340
 msgid "New _Appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/gnome-cal.c:1318
+#: calendar/gui/gnome-cal.c:1316
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Невозможно открыть папку \"%s\""
 
-#: calendar/gui/gnome-cal.c:1329
+#: calendar/gui/gnome-cal.c:1327
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
 
+#: calendar/gui/gnome-cal.c:1682
+#, fuzzy, c-format
+msgid "Opening calendar at %s"
+msgstr "Открытие папки \"%s\""
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Апрель"
@@ -5003,14 +4615,18 @@ msgstr "Октябрь"
 msgid "September"
 msgstr "Сентябрь"
 
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:244
 msgid "Atleast one attendee is necessary"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:283
+#: calendar/gui/itip-utils.c:275
 msgid "An organizer must be set."
 msgstr ""
 
+#: calendar/gui/itip-utils.c:571
+msgid "You must be an attendee of the event."
+msgstr ""
+
 #: calendar/gui/main.c:92
 #, fuzzy
 msgid "Could not create the component editor factory"
@@ -5201,21 +4817,21 @@ msgstr "Выбранный месяц (%b %Y)"
 msgid "Selected year (%Y)"
 msgstr "Выбранный год (%Y)"
 
-#: calendar/gui/print.c:2221
+#: calendar/gui/print.c:2386
 msgid "Print Calendar"
 msgstr "Напечатать календарь"
 
-#: calendar/gui/print.c:2312 calendar/gui/print.c:2404
-#: mail/mail-callbacks.c:2164 my-evolution/e-summary.c:607
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
+#: calendar/gui/print.c:2477 calendar/gui/print.c:2569
+#: mail/mail-callbacks.c:2306 my-evolution/e-summary.c:607
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:67
 msgid "Print Preview"
 msgstr "Просмотр печати"
 
-#: calendar/gui/print.c:2341
+#: calendar/gui/print.c:2506
 msgid "Print Item"
 msgstr "Печать элемента"
 
-#: calendar/gui/print.c:2422
+#: calendar/gui/print.c:2587
 msgid "Print Setup"
 msgstr "Настройка страницы"
 
@@ -5223,6 +4839,14 @@ msgstr "Настройка страницы"
 msgid "The URI of the tasks folder to display"
 msgstr "URI, который будет показан в папке заданий "
 
+#: calendar/gui/tasks-control-factory.c:76
+#, fuzzy
+msgid ""
+"Could not create the tasks view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Не удалось создать окно календаря. Пожалуйста проверьте вашу установку ORBit "
+"и OAF."
+
 #: calendar/gui/tasks-migrate.c:106
 msgid ""
 "Evolution has taken the tasks that were in your calendar folder and "
@@ -5257,111 +4881,111 @@ msgstr ""
 msgid "SMTWTFS"
 msgstr "ПВСЧПСВ"
 
-#: calendar/pcs/query.c:231
+#: calendar/pcs/query.c:235
 msgid "time-now expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:259
 msgid "make-time expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:260
+#: calendar/pcs/query.c:264
 msgid "make-time expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:268
+#: calendar/pcs/query.c:272
 msgid "make-time argument 1 must be an ISO 8601 date/time string"
 msgstr ""
 
-#: calendar/pcs/query.c:297
+#: calendar/pcs/query.c:301
 msgid "time-add-day expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:302
+#: calendar/pcs/query.c:306
 msgid "time-add-day expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:309
+#: calendar/pcs/query.c:313
 msgid "time-add-day expects argument 2 to be an integer"
 msgstr ""
 
-#: calendar/pcs/query.c:336
+#: calendar/pcs/query.c:340
 msgid "time-day-begin expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:341
+#: calendar/pcs/query.c:345
 msgid "time-day-begin expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:368
+#: calendar/pcs/query.c:372
 msgid "time-day-end expects 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:373
+#: calendar/pcs/query.c:377
 msgid "time-day-end expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:409
+#: calendar/pcs/query.c:413
 msgid "get-vtype expects 0 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:505
+#: calendar/pcs/query.c:509
 msgid "occur-in-time-range? expects 2 arguments"
 msgstr ""
 
-#: calendar/pcs/query.c:510
+#: calendar/pcs/query.c:514
 msgid "occur-in-time-range? expects argument 1 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:517
+#: calendar/pcs/query.c:521
 msgid "occur-in-time-range? expects argument 2 to be a time_t"
 msgstr ""
 
-#: calendar/pcs/query.c:647
+#: calendar/pcs/query.c:651
 #, fuzzy
 msgid "contains? expects 2 arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: calendar/pcs/query.c:652
+#: calendar/pcs/query.c:656
 msgid "contains? expects argument 1 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:659
+#: calendar/pcs/query.c:663
 msgid "contains? expects argument 2 to be a string"
 msgstr ""
 
-#: calendar/pcs/query.c:676
+#: calendar/pcs/query.c:680
 msgid ""
 "contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
 "\""
 msgstr ""
 
-#: calendar/pcs/query.c:718
+#: calendar/pcs/query.c:722
 msgid "has-categories? expects at least 1 argument"
 msgstr ""
 
-#: calendar/pcs/query.c:730
+#: calendar/pcs/query.c:734
 msgid ""
 "has-categories? expects all arguments to be strings or one and only one "
 "argument to be a boolean false (#f)"
 msgstr ""
 
-#: calendar/pcs/query.c:818
+#: calendar/pcs/query.c:822
 #, fuzzy
 msgid "is-completed? expects 0 arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: calendar/pcs/query.c:863
+#: calendar/pcs/query.c:867
 #, fuzzy
 msgid "completed-before? expects 1 argument"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: calendar/pcs/query.c:868
+#: calendar/pcs/query.c:872
 #, fuzzy
 msgid "completed-before? expects argument 1 to be a time_t"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: calendar/pcs/query.c:1156
+#: calendar/pcs/query.c:1160
 msgid "Evaluation of the search expression did not yield a boolean value"
 msgstr ""
 
@@ -5410,81 +5034,85 @@ msgstr ""
 msgid "You must be working online to complete this operation"
 msgstr ""
 
-#: camel/camel-filter-driver.c:549 camel/camel-filter-driver.c:558
+#: camel/camel-filter-driver.c:552 camel/camel-filter-driver.c:561
 msgid "Syncing folders"
 msgstr "Синхронизация папок"
 
-#: camel/camel-filter-driver.c:659
+#: camel/camel-filter-driver.c:662
 msgid "Unable to open spool folder"
 msgstr "Не удалось открыть папку спула"
 
-#: camel/camel-filter-driver.c:668
+#: camel/camel-filter-driver.c:671
 msgid "Unable to process spool folder"
 msgstr "Не удалось обработать папку спула"
 
-#: camel/camel-filter-driver.c:683
+#: camel/camel-filter-driver.c:686
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получение сообщения %d (%d%%)"
 
-#: camel/camel-filter-driver.c:687 camel/camel-filter-driver.c:700
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:703
 #, c-format
 msgid "Failed on message %d"
 msgstr "Сбой на сообщении %d"
 
-#: camel/camel-filter-driver.c:688
+#: camel/camel-filter-driver.c:691
 msgid "Cannot open message"
 msgstr "Невозможно открыть сообщение"
 
-#: camel/camel-filter-driver.c:714 camel/camel-filter-driver.c:829
+#: camel/camel-filter-driver.c:717 camel/camel-filter-driver.c:832
 msgid "Syncing folder"
 msgstr "Синхронизация папки"
 
-#: camel/camel-filter-driver.c:786
+#: camel/camel-filter-driver.c:721 camel/camel-filter-driver.c:837
+msgid "Complete"
+msgstr "Выполнено"
+
+#: camel/camel-filter-driver.c:789
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получение сообщения %d из %d"
 
-#: camel/camel-filter-driver.c:791 camel/camel-filter-driver.c:809
+#: camel/camel-filter-driver.c:794 camel/camel-filter-driver.c:812
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: camel/camel-filter-driver.c:918
+#: camel/camel-filter-driver.c:921
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Ошибка анализа фильтра: %s: %s"
 
-#: camel/camel-filter-driver.c:924
+#: camel/camel-filter-driver.c:927
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Ошибка выполнения фильтра: %s: %s"
 
-#: camel/camel-filter-search.c:493 camel/camel-filter-search.c:500
+#: camel/camel-filter-search.c:498 camel/camel-filter-search.c:505
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: camel/camel-folder.c:478
+#: camel/camel-folder.c:472
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1047
+#: camel/camel-folder.c:1041
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Ошибка при выполнении выражения поиска \"%s\":\n"
 "%s"
 
-#: camel/camel-folder.c:1087
+#: camel/camel-folder.c:1081
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
 "Ошибка при выполнении выражения поиска \"%s\":\n"
 "%s"
 
-#: camel/camel-folder.c:1266
+#: camel/camel-folder.c:1263
 #, fuzzy
 msgid "Moving messages"
 msgstr "Перемещение сообщений в %s"
@@ -5511,12 +5139,12 @@ msgstr ""
 msgid "(match-all) requires a single bool result"
 msgstr "(совпадает все) требует единственного логического результата"
 
-#: camel/camel-folder-search.c:638
+#: camel/camel-folder-search.c:639
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Совершение запроса на неизвестном заголовке: %s"
 
-#: camel/camel-folder-search.c:748 camel/camel-folder-search.c:792
+#: camel/camel-folder-search.c:749 camel/camel-folder-search.c:793
 msgid "Invalid type in body-contains, expecting string"
 msgstr "Недопустимый тип в тело-содержит, ожидается строка"
 
@@ -5617,81 +5245,81 @@ msgstr "Ошибка сохранения временного почтового файла: %s"
 msgid "Error copying mail temp file: %s"
 msgstr "Ошибка копирования временного почтового файла: %s"
 
-#: camel/camel-pgp-context.c:191
+#: camel/camel-pgp-context.c:194
 #, c-format
 msgid "Please enter your %s passphrase for %s"
 msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
 
-#: camel/camel-pgp-context.c:194
+#: camel/camel-pgp-context.c:197
 #, c-format
 msgid "Please enter your %s passphrase"
 msgstr "Пожалуйста введите вашу %s парольную фразу."
 
-#: camel/camel-pgp-context.c:525
+#: camel/camel-pgp-context.c:554
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to sign"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:532 camel/camel-pgp-context.c:706
+#: camel/camel-pgp-context.c:561 camel/camel-pgp-context.c:735
 #, fuzzy
 msgid "Cannot sign this message: no password provided"
 msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
 
-#: camel/camel-pgp-context.c:538 camel/camel-pgp-context.c:712
+#: camel/camel-pgp-context.c:567 camel/camel-pgp-context.c:741
 #, fuzzy, c-format
 msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:699
+#: camel/camel-pgp-context.c:728
 #, fuzzy
 msgid "Cannot sign this message: no plaintext to clearsign"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:891
+#: camel/camel-pgp-context.c:920
 #, fuzzy
 msgid "Cannot verify this message: no plaintext to verify"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:897
+#: camel/camel-pgp-context.c:926
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:908
+#: camel/camel-pgp-context.c:937
 #, fuzzy, c-format
 msgid "Cannot verify this message: couldn't create temp file: %s"
 msgstr "Не удалось создать временный файл: %s"
 
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1104
 #, fuzzy
 msgid "Cannot encrypt this message: no plaintext to encrypt"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:1086
+#: camel/camel-pgp-context.c:1114
 #, fuzzy
 msgid "Cannot encrypt this message: no password provided"
 msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
 
-#: camel/camel-pgp-context.c:1093
+#: camel/camel-pgp-context.c:1121
 #, fuzzy, c-format
 msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: camel/camel-pgp-context.c:1102
+#: camel/camel-pgp-context.c:1130
 #, fuzzy
 msgid "Cannot encrypt this message: no recipients specified"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1292
 #, fuzzy
 msgid "Cannot decrypt this message: no ciphertext to decrypt"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:1300
 msgid "Cannot decrypt this message: no password provided"
-msgstr ""
+msgstr "Невозможно расшифровать сообщение: не введён пароль"
 
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:1307
 #, fuzzy, c-format
 msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
@@ -5727,7 +5355,7 @@ msgid "Connection cancelled"
 msgstr "Соединение отменено"
 
 #: camel/camel-remote-store.c:267
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:271
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
@@ -5855,7 +5483,7 @@ msgstr ""
 "%s"
 
 #: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:494
+#: camel/providers/imap/camel-imap-store.c:497
 msgid "Bad authentication response from server."
 msgstr "Отрицательный ответ идентификации от сервера."
 
@@ -5875,13 +5503,13 @@ msgstr "Неизвестное состоиние идентификации."
 
 #: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:55
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:52
 msgid "Password"
 msgstr "Пароль"
 
 #: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
-msgstr ""
+msgstr "POP до SMTP"
 
 #: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
@@ -5920,22 +5548,22 @@ msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
 
-#: camel/camel-service.c:607
+#: camel/camel-service.c:612
 #, c-format
 msgid "Resolving: %s"
 msgstr "Распознавание: %s"
 
-#: camel/camel-service.c:634
+#: camel/camel-service.c:639
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Ошибка в разрешении имени: %s"
 
-#: camel/camel-service.c:659
+#: camel/camel-service.c:664
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Сбой поиска хоста: %s: хост не найден"
 
-#: camel/camel-service.c:661
+#: camel/camel-service.c:666
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Сбой поиска хоста: %s: причина неизвестна"
@@ -5948,12 +5576,12 @@ msgstr "Провайдер виртуальных папок электронной почты"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Для чтения почты по запросу к другому набору папок"
 
-#: camel/camel-session.c:324 camel/camel-session.c:393
+#: camel/camel-session.c:347 camel/camel-session.c:416
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:510
+#: camel/camel-session.c:533
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -5992,15 +5620,14 @@ msgid "Failed to find a common bulk algorithm."
 msgstr ""
 
 #: camel/camel-smime-context.c:810
-#, fuzzy
 msgid "Failed to decode message."
-msgstr "Сбойное сообщение %d"
+msgstr "Не удалось декодировать сообщение."
 
 #: camel/camel-smime-context.c:855
 msgid "Failed to verify certificates."
-msgstr ""
+msgstr "Не удалось проверить сертификаты."
 
-#: camel/camel-store.c:218
+#: camel/camel-store.c:219
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не удалось получить папку: %s: %s"
@@ -6010,7 +5637,7 @@ msgstr "Не удалось получить папку: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: camel/camel-tcp-stream-openssl.c:491
+#: camel/camel-tcp-stream-openssl.c:541
 #, c-format
 msgid ""
 "Issuer: %s\n"
@@ -6018,7 +5645,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:496 camel/camel-tcp-stream-ssl.c:369
+#: camel/camel-tcp-stream-openssl.c:546 camel/camel-tcp-stream-ssl.c:421
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -6033,7 +5660,7 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
-#: camel/camel-tcp-stream-ssl.c:353
+#: camel/camel-tcp-stream-ssl.c:405
 #, c-format
 msgid ""
 "EMail: %s\n"
@@ -6057,32 +5684,32 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Невозможно проанализировать URL \"%s\""
 
-#: camel/camel-vee-folder.c:562
+#: camel/camel-vee-folder.c:589
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нет сообщения %s в %s"
 
-#: camel/camel-vee-folder.c:702
+#: camel/camel-vee-folder.c:750
 #, c-format
 msgid "No such message: %s"
 msgstr "Нет такого сообщения: %s"
 
-#: camel/camel-vee-store.c:250
+#: camel/camel-vee-store.c:252
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: camel/camel-vee-store.c:285
+#: camel/camel-vee-store.c:287
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: camel/camel-vee-store.c:297
+#: camel/camel-vee-store.c:300
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: camel/camel-vee-store.c:325
+#: camel/camel-vee-store.c:308
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удалось получить папку: %s: %s"
@@ -6127,30 +5754,28 @@ msgstr "Невозможно загрузить итог для %s"
 
 #: camel/providers/imap/camel-imap-folder.c:274
 msgid "Folder was destroyed and recreated on server."
-msgstr ""
+msgstr "Папка была уничтожена и заново создана на сервере."
 
 #. Check UIDs and flags of all messages we already know of.
 #: camel/providers/imap/camel-imap-folder.c:436
-#, fuzzy
 msgid "Scanning for changed messages"
-msgstr "Сохранение сообщений"
+msgstr "Сканирование изменённых сообщений"
 
 #: camel/providers/imap/camel-imap-folder.c:1537
-#: camel/providers/imap/camel-imap-folder.c:1940
+#: camel/providers/imap/camel-imap-folder.c:1946
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент не доступно"
 
-#: camel/providers/imap/camel-imap-folder.c:1679
-#: camel/providers/imap/camel-imap-folder.c:1760
+#: camel/providers/imap/camel-imap-folder.c:1685
+#: camel/providers/imap/camel-imap-folder.c:1766
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1685
-#, fuzzy
+#: camel/providers/imap/camel-imap-folder.c:1691
 msgid "Scanning for new messages"
-msgstr "Сохранение сообщений"
+msgstr "Сканирование новых сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/imap/camel-imap-folder.c:1983
 msgid "Could not find message body in FETCH response."
 msgstr "Невозможно найти тело сообщения в ответе FETCH."
 
@@ -6160,14 +5785,14 @@ msgid "Could not open cache directory: %s"
 msgstr "Невозможно открыть каталог кэш: %s"
 
 #: camel/providers/imap/camel-imap-message-cache.c:243
-#: camel/providers/imap/camel-imap-message-cache.c:299
-#: camel/providers/imap/camel-imap-message-cache.c:330
-#: camel/providers/imap/camel-imap-message-cache.c:362
+#: camel/providers/imap/camel-imap-message-cache.c:300
+#: camel/providers/imap/camel-imap-message-cache.c:331
+#: camel/providers/imap/camel-imap-message-cache.c:363
 #, fuzzy, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Сбойное сообщение %d"
 
-#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:15
+#: camel/providers/imap/camel-imap-provider.c:43
 msgid "Checking for new mail"
 msgstr "Проверка новое почты"
 
@@ -6175,7 +5800,7 @@ msgstr "Проверка новое почты"
 msgid "Check for new messages in all folders"
 msgstr "Проверка новой почты во всех папках"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:836
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:839
 msgid "Folders"
 msgstr "Папки"
 
@@ -6212,28 +5837,28 @@ msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/imap/camel-imap-store.c:517
+#: camel/providers/imap/camel-imap-store.c:520
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не поддерживает затребованный тип идентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:527
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/imap/camel-imap-store.c:530
+#: camel/providers/smtp/camel-smtp-transport.c:387
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Идентификация типа %s не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:554
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:566
-#: camel/providers/smtp/camel-smtp-transport.c:432
+#: camel/providers/imap/camel-imap-store.c:569
+#: camel/providers/smtp/camel-smtp-transport.c:431
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:592
+#: camel/providers/imap/camel-imap-store.c:595
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -6244,12 +5869,12 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:891
+#: camel/providers/imap/camel-imap-store.c:894
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1150
+#: camel/providers/imap/camel-imap-store.c:1182
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
@@ -6280,12 +5905,13 @@ msgstr ""
 "этом сервере"
 
 #: camel/providers/local/camel-local-provider.c:69
-msgid "Qmail maildir-format mail files"
-msgstr "Почтовые файлы в формате почтовых каталогов qmail"
+#, fuzzy
+msgid "Maildir-format mail directories"
+msgstr "Почтовые каталоги в формате UNIX MH"
 
 #: camel/providers/local/camel-local-provider.c:70
 #, fuzzy
-msgid "For storing local mail in qmail maildir directories."
+msgid "For storing local mail in maildir directories."
 msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
 
 #: camel/providers/local/camel-local-provider.c:81
@@ -6349,18 +5975,23 @@ msgstr "Невозможно загрузить итог для %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не удалось добавить сообщение к итогу: причина неизвестна"
 
-#: camel/providers/local/camel-maildir-folder.c:181
+#: camel/providers/local/camel-maildir-folder.c:182
+#, fuzzy
+msgid "Maildir append message cancelled"
+msgstr "Сбой на сообщении %d"
+
+#: camel/providers/local/camel-maildir-folder.c:185
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-maildir-folder.c:218
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-mh-folder.c:204
-#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:210
+#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:230
+#: camel/providers/local/camel-mbox-folder.c:332
+#: camel/providers/local/camel-mh-folder.c:199
+#: camel/providers/local/camel-mh-folder.c:208
+#: camel/providers/local/camel-mh-folder.c:216
 #: camel/providers/local/camel-spool-folder.c:580
 #, c-format
 msgid ""
@@ -6370,15 +6001,15 @@ msgstr ""
 "Невозможно получить сообщение: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:206
-#: camel/providers/local/camel-mbox-folder.c:328
-#: camel/providers/local/camel-mh-folder.c:195
+#: camel/providers/local/camel-maildir-folder.c:210
+#: camel/providers/local/camel-mbox-folder.c:332
+#: camel/providers/local/camel-mh-folder.c:199
 #: camel/providers/local/camel-spool-folder.c:580
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: camel/providers/local/camel-maildir-folder.c:227
-#: camel/providers/local/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:231
+#: camel/providers/local/camel-mh-folder.c:217
 msgid "Invalid message contents"
 msgstr "Неправильное содержимое сообщения"
 
@@ -6452,14 +6083,19 @@ msgstr "Не удалось получить папку: %s: %s"
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:265
+#: camel/providers/local/camel-mbox-folder.c:266
+#, fuzzy
+msgid "Mail append cancelled"
+msgstr "Операция отменена"
+
+#: camel/providers/local/camel-mbox-folder.c:269
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:344
-#: camel/providers/local/camel-mbox-folder.c:376
-#: camel/providers/local/camel-mbox-folder.c:389
+#: camel/providers/local/camel-mbox-folder.c:348
+#: camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-mbox-folder.c:393
 #: camel/providers/local/camel-spool-folder.c:596
 #: camel/providers/local/camel-spool-folder.c:628
 #: camel/providers/local/camel-spool-folder.c:641
@@ -6471,12 +6107,12 @@ msgstr ""
 "Невозможно получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:377
+#: camel/providers/local/camel-mbox-folder.c:381
 #: camel/providers/local/camel-spool-folder.c:629
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:390
+#: camel/providers/local/camel-mbox-folder.c:394
 #: camel/providers/local/camel-spool-folder.c:642
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
@@ -6523,8 +6159,9 @@ msgstr "Папка \"%s\" не пуста. Не удалена."
 #. FIXME: If there is a failure, it shouldn't clear the summary and restart,
 #. it should try and merge the summary info's.  This is a bit tricky.
 #: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-mbox-summary.c:499
-#: camel/providers/local/camel-mbox-summary.c:700
+#: camel/providers/local/camel-mbox-summary.c:498
+#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-spool-summary.c:379
 #: camel/providers/local/camel-spool-summary.c:644
 #: camel/providers/local/camel-spool-summary.c:936
 #, fuzzy
@@ -6532,6 +6169,7 @@ msgid "Storing folder"
 msgstr "Синхронизация папки"
 
 #: camel/providers/local/camel-mbox-summary.c:254
+#: camel/providers/local/camel-spool-summary.c:384
 #, fuzzy, c-format
 msgid "Could not open folder: %s: %s"
 msgstr ""
@@ -6545,12 +6183,13 @@ msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
 
 #: camel/providers/local/camel-mbox-summary.c:371
+#: camel/providers/local/camel-spool-summary.c:498
 #, fuzzy, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:504
-#: camel/providers/local/camel-mbox-summary.c:705
+#: camel/providers/local/camel-mbox-summary.c:503
+#: camel/providers/local/camel-mbox-summary.c:704
 #: camel/providers/local/camel-spool-summary.c:649
 #, fuzzy, c-format
 msgid "Could not open file: %s: %s"
@@ -6558,16 +6197,16 @@ msgstr ""
 "Невозможно открыть файл \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:521
+#: camel/providers/local/camel-mbox-summary.c:520
 #: camel/providers/local/camel-spool-summary.c:673
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:546
-#: camel/providers/local/camel-mbox-summary.c:554
-#: camel/providers/local/camel-mbox-summary.c:743
-#: camel/providers/local/camel-mbox-summary.c:751
+#: camel/providers/local/camel-mbox-summary.c:545
+#: camel/providers/local/camel-mbox-summary.c:553
+#: camel/providers/local/camel-mbox-summary.c:742
+#: camel/providers/local/camel-mbox-summary.c:750
 #: camel/providers/local/camel-spool-summary.c:698
 #: camel/providers/local/camel-spool-summary.c:706
 #: camel/providers/local/camel-spool-summary.c:979
@@ -6575,43 +6214,48 @@ msgstr "Не удалось открыть временный почтовый ящик: %s"
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несовпадение папки и итога, даже после синхронизации"
 
-#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-mbox-summary.c:596
 #: camel/providers/local/camel-spool-summary.c:750
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:614
+#: camel/providers/local/camel-mbox-summary.c:613
 #: camel/providers/local/camel-spool-summary.c:772
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
-#: camel/providers/local/camel-mbox-summary.c:801
+#: camel/providers/local/camel-mbox-summary.c:631
+#: camel/providers/local/camel-mbox-summary.c:800
 #: camel/providers/local/camel-spool-summary.c:1037
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Невозможно закрыть исходную папку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:641
+#: camel/providers/local/camel-mbox-summary.c:640
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Невозможно закрыть временную папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:652
+#: camel/providers/local/camel-mbox-summary.c:651
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:875
+#: camel/providers/local/camel-mbox-summary.c:874
 #: camel/providers/local/camel-spool-summary.c:545
 #: camel/providers/local/camel-spool-summary.c:1111
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
 
-#: camel/providers/local/camel-mh-folder.c:172
+#: camel/providers/local/camel-mh-folder.c:173
+#, fuzzy
+msgid "MH append message cancelled"
+msgstr "Послать сообщение к контакту"
+
+#: camel/providers/local/camel-mh-folder.c:176
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
@@ -6654,23 +6298,6 @@ msgstr ""
 msgid "Spool folders cannot be deleted"
 msgstr ""
 
-#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
-#. it should try and merge the summary info's.  This is a bit tricky.
-#: camel/providers/local/camel-spool-summary.c:379
-#, fuzzy
-msgid "Summarising folder"
-msgstr "Суммаризация папки"
-
-#: camel/providers/local/camel-spool-summary.c:384
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
-
-#: camel/providers/local/camel-spool-summary.c:498
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Не удалось суммировать папку: %s: %s"
-
 #: camel/providers/local/camel-spool-summary.c:789
 #: camel/providers/local/camel-spool-summary.c:798
 #: camel/providers/local/camel-spool-summary.c:807
@@ -6818,7 +6445,7 @@ msgstr "Сохранять сообщения на сервере"
 msgid "Delete after %s day(s)"
 msgstr "Удалять через %s дней"
 
-#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:51
 msgid "POP"
 msgstr "POP"
 
@@ -6915,7 +6542,7 @@ msgid "Unexpected response from POP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:37
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:72
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -6968,7 +6595,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:67
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:65
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -6978,123 +6605,123 @@ msgstr ""
 "Для доставки почты с помощью подключения к удаленному почтовому узлу по "
 "протоколу SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Syntax error, command unrecognized"
 msgstr "Синтаксическая ошибка, команда не распознана"
 
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтаксическая ошибка в параметрах или аргументах"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Command not implemented"
 msgstr "Команда не реализована"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Command parameter not implemented"
 msgstr "Параметр команды не реализован"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "System status, or system help reply"
 msgstr "Состояние системы или ответ справки системы"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Help message"
 msgstr "Справочное сообщение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "Service ready"
 msgstr "Сервис готов"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Service closing transmission channel"
 msgstr "Сервис закрывает канал передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service not available, closing transmission channel"
 msgstr "Сервис не доступен, закрытие канала передачи"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested mail action okay, completed"
 msgstr "Запрошенное почтовое действие выполнено"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "User not local; will forward to <forward-path>"
 msgstr "Не локальный пользователь; будет отправлено к <путь-отправки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Запрошенное действие не выполнено: почтовый ящик не доступен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested action aborted: error in processing"
 msgstr "Запрошенное действие отменено: ошибка при обработке"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "User not local; please try <forward-path>"
 msgstr "Пользователь не локальный; пожалуйста попробуйте <путь-пересылки>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Запрошенное действие не выполнено: недостаточно системного хранилища"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Запрошенное действие не выполнено: название почтового ящика недопустимо"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Transaction failed"
 msgstr "Сбой транзакции"
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "A password transition is needed"
 msgstr "Необходима передача пароля"
 
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:214
 msgid "Authentication mechanism is too weak"
 msgstr "Слишком слабый механизм идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Для запрошенного механизма идентификации требуется шифрование"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Temporary authentication failure"
 msgstr "Временный сбой идентификации"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Authentication required"
 msgstr "Идентификация требуется"
 
-#: camel/providers/smtp/camel-smtp-transport.c:316
+#: camel/providers/smtp/camel-smtp-transport.c:315
 #, c-format
 msgid "Welcome response error: %s: possibly non-fatal"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:377
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s"
 msgstr "SMTP сервер %s не поддерживает затребованный тип идентификации %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:417
+#: camel/providers/smtp/camel-smtp-transport.c:416
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль SMTP для %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:440
+#: camel/providers/smtp/camel-smtp-transport.c:439
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -7105,169 +6732,169 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:556
+#: camel/providers/smtp/camel-smtp-transport.c:555
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP сервер %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:558
+#: camel/providers/smtp/camel-smtp-transport.c:557
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Доставка SMTP почты через %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:583
+#: camel/providers/smtp/camel-smtp-transport.c:582
 msgid "Cannot send message: sender address not defined."
 msgstr "Невозможно отправить сообщение: не определен адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:590
+#: camel/providers/smtp/camel-smtp-transport.c:589
 msgid "Cannot send message: sender address not valid."
 msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
 
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:546
+#: camel/providers/smtp/camel-smtp-transport.c:594 mail/mail-ops.c:560
 msgid "Sending message"
 msgstr "Отправка сообщения"
 
-#: camel/providers/smtp/camel-smtp-transport.c:606
+#: camel/providers/smtp/camel-smtp-transport.c:605
 msgid "Cannot send message: no recipients defined."
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "SMTP Greeting"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:708
+#: camel/providers/smtp/camel-smtp-transport.c:707
 #, c-format
 msgid "HELO request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:728
+#: camel/providers/smtp/camel-smtp-transport.c:727
 #, c-format
 msgid "HELO response error: %s: non-fatal"
 msgstr "Ошибка ответа HELO: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:760
+#: camel/providers/smtp/camel-smtp-transport.c:759
 msgid "SMTP Authentication"
 msgstr "Идентификация SMTP"
 
-#: camel/providers/smtp/camel-smtp-transport.c:766
+#: camel/providers/smtp/camel-smtp-transport.c:765
 msgid "Error creating SASL authentication object."
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:781
-#: camel/providers/smtp/camel-smtp-transport.c:793
+#: camel/providers/smtp/camel-smtp-transport.c:780
+#: camel/providers/smtp/camel-smtp-transport.c:792
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:801
 #, fuzzy
 msgid "AUTH request failed."
 msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:850
+#: camel/providers/smtp/camel-smtp-transport.c:849
 msgid "Bad authentication response from server.\n"
 msgstr "Отрицательный ответ идентификации от сервера.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:876
+#: camel/providers/smtp/camel-smtp-transport.c:875
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:895
+#: camel/providers/smtp/camel-smtp-transport.c:894
 #, c-format
 msgid "MAIL FROM response error: %s: mail not sent"
 msgstr "Ошибка ответа MAIL FROM: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:920
+#: camel/providers/smtp/camel-smtp-transport.c:919
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:939
+#: camel/providers/smtp/camel-smtp-transport.c:938
 #, c-format
 msgid "RCPT TO response error: %s: mail not sent"
 msgstr "Ошибка ответа RCPT TO: %s: почта не отправлена."
 
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:972
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "Превышено время ожидания ответа на DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:991
 #, c-format
 msgid "DATA response error: %s: mail not sent"
 msgstr "Ошибка ответа DATA: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1008
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1031
+#: camel/providers/smtp/camel-smtp-transport.c:1049
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1045
+#: camel/providers/smtp/camel-smtp-transport.c:1068
 #, c-format
 msgid "DATA response error: message termination: %s: mail not sent"
 msgstr "Ошибка ответа DATA: сообщение прервано: %s: почта не отправлена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1069
+#: camel/providers/smtp/camel-smtp-transport.c:1092
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Превышено время ожидания ответа на RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1088
+#: camel/providers/smtp/camel-smtp-transport.c:1111
 #, c-format
 msgid "RSET response error: %s"
 msgstr "Ошибка ответа RSET: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1111
+#: camel/providers/smtp/camel-smtp-transport.c:1134
 #, c-format
 msgid "QUIT request timed out: %s: non-fatal"
 msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1130
+#: camel/providers/smtp/camel-smtp-transport.c:1153
 #, c-format
 msgid "QUIT response error: %s: non-fatal"
 msgstr "Ошибка ответа QUIT: %s: не фатально"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:101
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:101
+#: composer/e-msg-composer-attachment-bar.c:103
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт"
 
-#: composer/e-msg-composer-attachment-bar.c:108
+#: composer/e-msg-composer-attachment-bar.c:110
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:112
+#: composer/e-msg-composer-attachment-bar.c:114
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:116
+#: composer/e-msg-composer-attachment-bar.c:118
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:357 mail/mail-display.c:134
+#: composer/e-msg-composer-attachment-bar.c:359 mail/mail-display.c:136
 msgid "attachment"
 msgstr "вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:498
+#: composer/e-msg-composer-attachment-bar.c:500
 msgid "Remove selected items from the attachment list"
 msgstr "Удалить выбранные элементы из списка вложений"
 
-#: composer/e-msg-composer-attachment-bar.c:529
+#: composer/e-msg-composer-attachment-bar.c:531
 msgid "Add attachment..."
 msgstr "Добавить вложение..."
 
-#: composer/e-msg-composer-attachment-bar.c:530
+#: composer/e-msg-composer-attachment-bar.c:532
 msgid "Attach a file to the message"
 msgstr "Присоединить файл к сообщению"
 
@@ -7299,52 +6926,52 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:326
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Click here for the address book"
 msgstr "Щелкните здесь для адресной книги"
 
 #.
 #. * From:
 #.
-#: composer/e-msg-composer-hdrs.c:357
+#: composer/e-msg-composer-hdrs.c:358
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Reply-To:
 #.
-#: composer/e-msg-composer-hdrs.c:363
+#: composer/e-msg-composer-hdrs.c:364
 msgid "Reply-To:"
 msgstr "Ответить:"
 
 #.
 #. * Subject:
 #.
-#: composer/e-msg-composer-hdrs.c:374
+#: composer/e-msg-composer-hdrs.c:375
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:388
+#: composer/e-msg-composer-hdrs.c:389
 msgid "To:"
 msgstr "Кому:"
 
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:390
 msgid "Enter the recipients of the message"
 msgstr "Введите получателей сообщения"
 
-#: composer/e-msg-composer-hdrs.c:392
+#: composer/e-msg-composer-hdrs.c:393
 msgid "Cc:"
 msgstr "Копия:"
 
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:394
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введите адресатов, которые получат копию сообщения"
 
-#: composer/e-msg-composer-hdrs.c:396
+#: composer/e-msg-composer-hdrs.c:397
 msgid "Bcc:"
 msgstr "Скр.копия:"
 
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:398
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -7357,7 +6984,7 @@ msgstr ""
 msgid "Attach a file"
 msgstr "Присоединить файл"
 
-#: composer/e-msg-composer.c:676
+#: composer/e-msg-composer.c:664
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -7366,29 +6993,29 @@ msgstr ""
 "Ошибка при чтении файла %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:858
+#: composer/e-msg-composer.c:847
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: composer/e-msg-composer.c:867
+#: composer/e-msg-composer.c:856
 msgid "Warning!"
 msgstr "Предупреждение!"
 
-#: composer/e-msg-composer.c:871
+#: composer/e-msg-composer.c:860
 msgid "File exists, overwrite?"
 msgstr "Файл существует, переписать?"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:882
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:901
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Ошибка при загрузке файла: %s"
 
-#: composer/e-msg-composer.c:983
+#: composer/e-msg-composer.c:972
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -7396,17 +7023,17 @@ msgstr ""
 "Не удалось открыть папку черновиков для этого счёта.\n"
 "Хотите использовать папку черновиков по умолчанию?"
 
-#: composer/e-msg-composer.c:1036
+#: composer/e-msg-composer.c:1025
 #, fuzzy, c-format
 msgid "Error accessing file: %s"
 msgstr "Ошибка сохранения файла: %s"
 
-#: composer/e-msg-composer.c:1044
+#: composer/e-msg-composer.c:1033
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Не удалось получить сообщение с POP сервера %s: %s"
 
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1040
 #, fuzzy, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -7415,7 +7042,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1058
+#: composer/e-msg-composer.c:1047
 #, fuzzy, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -7424,7 +7051,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1067
+#: composer/e-msg-composer.c:1056
 #, fuzzy, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -7433,7 +7060,7 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1169
+#: composer/e-msg-composer.c:1158
 #, fuzzy
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
@@ -7442,7 +7069,7 @@ msgstr ""
 "Evolution нашла почтовые файлы Pine.\n"
 "Хотите импортировать их в Evolution?"
 
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1309
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -7452,27 +7079,38 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: composer/e-msg-composer.c:1324
+#: composer/e-msg-composer.c:1316
 #, fuzzy
 msgid "Warning: Modified Message"
 msgstr "Пересланное сообщение"
 
-#: composer/e-msg-composer.c:1347
+#: composer/e-msg-composer.c:1339
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:1496
+#: composer/e-msg-composer.c:1488
 #, fuzzy
 msgid "Insert File"
 msgstr "Вставить текстовый файл..."
 
-#: composer/e-msg-composer.c:1871 composer/e-msg-composer.c:2317
+#: composer/e-msg-composer.c:1863 composer/e-msg-composer.c:2303
 msgid "Compose a message"
 msgstr "Создать сообщение"
 
-#: composer/e-msg-composer.c:2407
-msgid "Could not create composer window."
-msgstr "Невозможно создать окно редактора."
+#: composer/e-msg-composer.c:2320
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:2343
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Не удалось создать окно редактора, потому что вы еще не настройли\n"
+"ни одной личности в почтовом компоненте."
 
 #: composer/evolution-composer.c:349
 msgid ""
@@ -7486,7 +7124,7 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr "Невозможно инициализировать редактор почты Evolution."
 
-#: data/evolution.desktop.in.h:1 shell/main.c:80
+#: data/evolution.desktop.in.h:1 shell/main.c:83
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -7542,6 +7180,15 @@ msgstr "Имя содержит"
 msgid "Subject does not contain"
 msgstr "не содержит"
 
+#. Remember the password?
+#: e-util/e-passwords.c:348 mail/mail-session.c:258
+msgid "Remember this password"
+msgstr "Запомнить этот пароль"
+
+#: e-util/e-passwords.c:350 mail/mail-session.c:259
+msgid "Remember this password for the remainder of this session"
+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:359
@@ -7781,16 +7428,16 @@ msgstr ""
 "Оп-ля... Вы забыли выбрать папку.\n"
 "Пожалуйста, вернитесь и укажите правильную папку для доставки почты."
 
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:356
-#: mail/mail-account-gui.c:822
+#: filter/filter-folder.c:233 filter/vfolder-rule.c:357
+#: mail/mail-account-gui.c:834
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
-#: filter/filter-folder.c:257
+#: filter/filter-folder.c:258
 msgid "Enter folder URI"
 msgstr "Ввести URI папки"
 
-#: filter/filter-folder.c:303
+#: filter/filter-folder.c:305
 msgid "<click here to select a folder>"
 msgstr "<щелкните здесь для выбора папки>"
 
@@ -8029,11 +7676,10 @@ msgid "Replied to"
 msgstr "Ответить"
 
 #: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:5
 msgid "Score"
 msgstr "Подсчет"
 
-#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1326
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1352
 msgid "Sender"
 msgstr "Отправитель"
 
@@ -8062,12 +7708,15 @@ msgstr "Специфический заголовок"
 msgid "starts with"
 msgstr "начинается с"
 
+#: filter/libfilter-i18n.h:49
+msgid "Status"
+msgstr "Состояние"
+
 #: filter/libfilter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:51 mail/mail-format.c:926
-#: mail/message-list.etspec.h:9
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:922
 msgid "Subject"
 msgstr "Тема"
 
@@ -8079,15 +7728,15 @@ msgstr "было после"
 msgid "was before"
 msgstr "было до"
 
-#: filter/rule-editor.c:147
+#: filter/rule-editor.c:161
 msgid "Rules"
 msgstr "Правила"
 
-#: filter/rule-editor.c:240
+#: filter/rule-editor.c:257
 msgid "Add Rule"
 msgstr "Добавить правило"
 
-#: filter/rule-editor.c:301
+#: filter/rule-editor.c:322
 msgid "Edit Rule"
 msgstr "Правка правила"
 
@@ -8263,224 +7912,229 @@ msgstr "Виртуальные папки"
 msgid "Cannot connect to store: %s"
 msgstr "Не удалось подключиться к серверу: %s"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:143
 msgid "This folder cannot contain messages."
 msgstr "Эта папка не может содержать сообщения."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:377
 msgid "Properties..."
 msgstr "Свойства..."
 
-#: mail/component-factory.c:378
+#: mail/component-factory.c:377
 msgid "Change this folder's properties"
 msgstr "Изменить свойства этой папки"
 
-#: mail/component-factory.c:721
+#: mail/component-factory.c:751
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
 msgstr ""
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:919
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Почтовое сообщение"
 
-#: mail/component-factory.c:857
+#: mail/component-factory.c:919
 #, fuzzy
 msgid "New _Mail Message"
 msgstr "Почтовое сообщение"
 
-#: mail/component-factory.c:881
+#: mail/component-factory.c:943
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:890
+#: mail/component-factory.c:952
 #, fuzzy
 msgid "Cannot initialize Evolution's mail config component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:896
+#: mail/component-factory.c:958
 #, fuzzy
 msgid "Cannot initialize Evolution's folder info component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:1061
+#: mail/component-factory.c:1157
 msgid "Cannot register storage with shell"
 msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
 
-#: mail/folder-browser-ui.c:267
+#: mail/folder-browser-ui.c:271
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Свойства для \"%s\""
 
-#: mail/folder-browser-ui.c:269
+#: mail/folder-browser-ui.c:273
 msgid "Properties"
 msgstr "Свойства"
 
-#: mail/folder-browser.c:261 mail/mail-display.c:300
+#: mail/folder-browser.c:292 mail/mail-display.c:298
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/folder-browser.c:733
+#: mail/folder-browser.c:764
 #, c-format
 msgid "%d new"
 msgstr "Новых %d"
 
-#: mail/folder-browser.c:736 mail/folder-browser.c:741
-#: mail/folder-browser.c:763
+#: mail/folder-browser.c:767 mail/folder-browser.c:772
+#: mail/folder-browser.c:794
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:737
+#: mail/folder-browser.c:768
 #, c-format
 msgid "%d hidden"
 msgstr "Скрытых %d"
 
-#: mail/folder-browser.c:742
+#: mail/folder-browser.c:773
 #, fuzzy, c-format
 msgid "%d selected"
 msgstr "Удаленное"
 
-#: mail/folder-browser.c:765
+#: mail/folder-browser.c:796
 #, c-format
 msgid "%d unsent"
 msgstr "Неотправленных %d"
 
-#: mail/folder-browser.c:767
+#: mail/folder-browser.c:798
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "Неотправленных %d"
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:800
 #, c-format
 msgid "%d total"
 msgstr "Всего %d"
 
-#: mail/folder-browser.c:1012
+#: mail/folder-browser.c:1046
 msgid "Create vFolder from Search"
 msgstr "Создать вирт.папку по поиску"
 
-#: mail/folder-browser.c:1384
+#: mail/folder-browser.c:1427
 msgid "VFolder on _Subject"
 msgstr "Вирт.папка по теме"
 
-#: mail/folder-browser.c:1385
+#: mail/folder-browser.c:1428
 msgid "VFolder on Se_nder"
 msgstr "Вирт.папка по отправителю"
 
-#: mail/folder-browser.c:1386
+#: mail/folder-browser.c:1429
 msgid "VFolder on _Recipients"
 msgstr "Вирт.папка по получателю"
 
-#: mail/folder-browser.c:1387
+#: mail/folder-browser.c:1430
 msgid "VFolder on Mailing _List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:1391
+#: mail/folder-browser.c:1434
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/folder-browser.c:1392
+#: mail/folder-browser.c:1435
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/folder-browser.c:1393
+#: mail/folder-browser.c:1436
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/folder-browser.c:1394
+#: mail/folder-browser.c:1437
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:1402 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1445 ui/evolution-mail-message.xml.h:95
 #, fuzzy
 msgid "_Edit as New Message..."
 msgstr "Печать сообщения..."
 
-#: mail/folder-browser.c:1403 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1446 ui/evolution-mail-message.xml.h:104
 msgid "_Save As..."
 msgstr "Сохранить как..."
 
-#: mail/folder-browser.c:1404
+#: mail/folder-browser.c:1447
 msgid "_Print"
 msgstr "Печать"
 
-#: mail/folder-browser.c:1408 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1451 ui/evolution-mail-message.xml.h:103
 msgid "_Reply to Sender"
 msgstr "Ответить отправителю"
 
-#: mail/folder-browser.c:1409 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1452 ui/evolution-mail-message.xml.h:72
 msgid "Reply to _List"
 msgstr "Ответить в список"
 
-#: mail/folder-browser.c:1410 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1453 ui/evolution-mail-message.xml.h:71
 msgid "Reply to _All"
 msgstr "Ответить всем"
 
-#: mail/folder-browser.c:1411
+#: mail/folder-browser.c:1454
 msgid "_Forward"
 msgstr "Переслать"
 
-#: mail/folder-browser.c:1413 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1456 ui/evolution-mail-message.xml.h:42
 msgid "Mar_k as Read"
 msgstr "Пометить как прочитанное"
 
-#: mail/folder-browser.c:1414 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1457 ui/evolution-mail-message.xml.h:44
 msgid "Mark as U_nread"
 msgstr "Пометить как непрочтенное"
 
-#: mail/folder-browser.c:1415
+#: mail/folder-browser.c:1458
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/folder-browser.c:1416
+#: mail/folder-browser.c:1459
 msgid "Mark as Unim_portant"
 msgstr "Пометить как неважное"
 
-#: mail/folder-browser.c:1420
+#: mail/folder-browser.c:1463
 msgid "_Move to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/folder-browser.c:1421
+#: mail/folder-browser.c:1464
 msgid "_Copy to Folder..."
 msgstr "Скопировать в папку..."
 
-#: mail/folder-browser.c:1423 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1466 ui/evolution-mail-message.xml.h:106
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#: mail/folder-browser.c:1427
+#: mail/folder-browser.c:1470
 msgid "Add Sender to Address Book"
 msgstr "Добавить отправителя в адресную книгу"
 
-#: mail/folder-browser.c:1430
+#: mail/folder-browser.c:1473
 msgid "Apply Filters"
 msgstr "Применить фильтры"
 
-#: mail/folder-browser.c:1432
+#: mail/folder-browser.c:1475
 msgid "Create Ru_le From Message"
 msgstr "Создать правило из сообщения"
 
-#: mail/folder-browser.c:1582
+#: mail/folder-browser.c:1625
 msgid "Filter on Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/folder-browser.c:1583
+#: mail/folder-browser.c:1626
 msgid "VFolder on Mailing List"
 msgstr "Вирт.папка по списку рассылки"
 
-#: mail/folder-browser.c:1585
+#: mail/folder-browser.c:1628
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:1586
+#: mail/folder-browser.c:1629
 #, c-format
 msgid "VFolder on Mailing List (%s)"
 msgstr "Вирт.папка по списку рассылки (%s)"
 
+#: mail/folder-browser.h:26
+#, fuzzy
+msgid "Default"
+msgstr "Исх.значения"
+
 #: mail/folder-info.c:64
 #, fuzzy
 msgid "Getting Folder Information"
@@ -8503,18 +8157,28 @@ msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Импортирует файлы Outlook Express 4 в Evolution"
 
 #: mail/local-config.glade.h:1
+#, fuzzy
+msgid "Body contents"
+msgstr "содержит"
+
+#: mail/local-config.glade.h:2
 msgid "Current store format:"
 msgstr "Текущий формат хранения:"
 
-#: mail/local-config.glade.h:2
+#: mail/local-config.glade.h:3
+#, fuzzy
+msgid "Indexing:"
+msgstr "Индекс"
+
+#: mail/local-config.glade.h:4
 msgid "Mailbox Format"
 msgstr "Формат почтового ящика"
 
-#: mail/local-config.glade.h:3
+#: mail/local-config.glade.h:5
 msgid "New store format:"
 msgstr "Новый формат хранения:"
 
-#: mail/local-config.glade.h:4
+#: mail/local-config.glade.h:6
 msgid ""
 "Note: When converting between mailbox formats, a failure\n"
 "(such as lack of disk space) may not be automatically\n"
@@ -8524,15 +8188,15 @@ msgstr ""
 "(такой как нехватка дискового пространства) может не быть автоматически\n"
 "восстанавливаемым. Используйте эту возможность с осторожностью."
 
-#: mail/local-config.glade.h:7
+#: mail/local-config.glade.h:9
 msgid "maildir"
 msgstr "maildir"
 
-#: mail/local-config.glade.h:8
+#: mail/local-config.glade.h:10
 msgid "mbox"
 msgstr "mbox"
 
-#: mail/local-config.glade.h:9
+#: mail/local-config.glade.h:11
 msgid "mh"
 msgstr "mh"
 
@@ -8550,16 +8214,16 @@ msgstr "Редактор новостей Evolution"
 msgid "Evolution Account Editor"
 msgstr "Редактор счетов Evolution"
 
-#: mail/mail-account-gui.c:947
+#: mail/mail-account-gui.c:959
 #, fuzzy
 msgid "Could not save signature file."
 msgstr "Не удалось подключиться к POP серверу на %s."
 
-#: mail/mail-account-gui.c:1024
+#: mail/mail-account-gui.c:1036
 msgid "Save signature"
 msgstr "Сохранить подпись"
 
-#: mail/mail-account-gui.c:1030
+#: mail/mail-account-gui.c:1042
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -8569,7 +8233,7 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: mail/mail-account-gui.c:1615
+#: mail/mail-account-gui.c:1629
 msgid "You may not create two accounts with the same name."
 msgstr ""
 
@@ -8585,53 +8249,53 @@ msgstr "Отключить"
 msgid "Enable"
 msgstr "Включить"
 
-#: mail/mail-accounts.c:278
+#: mail/mail-accounts.c:279
 msgid "Are you sure you want to delete this account?"
 msgstr "Вы уверены что хотите удалить этот счет?"
 
-#: mail/mail-accounts.c:282
+#: mail/mail-accounts.c:283
 msgid "Don't delete"
 msgstr "Не удалять"
 
-#: mail/mail-accounts.c:285
+#: mail/mail-accounts.c:286
 msgid "Really delete account?"
 msgstr "Действительно удалить счёт?"
 
-#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
+#: mail/mail-accounts.c:512 mail/mail-accounts.c:516
 msgid "Are you sure you want to delete this news account?"
 msgstr "Вы уверены что хотите удалить этот новый счет?"
 
 #. give our dialog an Close button and title
-#: mail/mail-accounts.c:769 mail/mail-config.glade.h:45
+#: mail/mail-accounts.c:770 mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Mail Settings"
 msgstr "Установки почты..."
 
-#: mail/mail-autofilter.c:70
+#: mail/mail-autofilter.c:69
 #, c-format
 msgid "Mail to %s"
 msgstr "Почта для %s"
 
-#: mail/mail-autofilter.c:213
+#: mail/mail-autofilter.c:212
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема -- %s"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:228
 #, c-format
 msgid "Mail from %s"
 msgstr "Почта от %s"
 
-#: mail/mail-autofilter.c:285
+#: mail/mail-autofilter.c:284
 #, c-format
 msgid "%s mailing list"
 msgstr "%s список рассылки"
 
-#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:356
+#: mail/mail-autofilter.c:334 mail/mail-autofilter.c:355
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: mail/mail-callbacks.c:164
+#: mail/mail-callbacks.c:137
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -8643,7 +8307,7 @@ msgstr ""
 "отправлять, принимать или редактировать почту.\n"
 "Вы хотите настроить это сейчас?"
 
-#: mail/mail-callbacks.c:216
+#: mail/mail-callbacks.c:186
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -8651,7 +8315,7 @@ msgstr ""
 "Вы должны настроить пользователя\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:228
+#: mail/mail-callbacks.c:200
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -8659,23 +8323,23 @@ msgstr ""
 "Вы должны настроить передачу почты\n"
 "до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:252
+#: mail/mail-callbacks.c:230
 msgid "You have not set a mail transport method"
 msgstr "Вы не установили метод транспортировки почты"
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:283
+#: mail/mail-callbacks.c:265
 msgid ""
 "You are sending an HTML-formatted message, but the following recipients do "
 "not want HTML-formatted mail:\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:298
+#: mail/mail-callbacks.c:280
 #, fuzzy
 msgid "Send anyway?"
 msgstr "Отправить почту"
 
-#: mail/mail-callbacks.c:340
+#: mail/mail-callbacks.c:322
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -8683,59 +8347,59 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: mail/mail-callbacks.c:384
+#: mail/mail-callbacks.c:366
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
 msgstr ""
 
-#: mail/mail-callbacks.c:388
+#: mail/mail-callbacks.c:370
 #, fuzzy
 msgid "This message contains only Bcc recipients."
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-callbacks.c:392
+#: mail/mail-callbacks.c:374
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-callbacks.c:486
+#: mail/mail-callbacks.c:468
 msgid "This message contains invalid recipients:"
 msgstr ""
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:503
 msgid "You must specify recipients in order to send this message."
 msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:599
 msgid "You must configure an account before you can send this email."
 msgstr "Вы должны настроить счет до того как вы сможете послать почту."
 
-#: mail/mail-callbacks.c:850
+#: mail/mail-callbacks.c:836
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Неизвестная ошибка"
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:841
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
 msgstr ""
 
-#: mail/mail-callbacks.c:1244
+#: mail/mail-callbacks.c:1239
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:1246
+#: mail/mail-callbacks.c:1241
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:1622
+#: mail/mail-callbacks.c:1701
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Вы уверены что вы хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:1644
+#: mail/mail-callbacks.c:1726
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -8743,7 +8407,7 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:1679
+#: mail/mail-callbacks.c:1765
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -8751,28 +8415,28 @@ msgstr ""
 "Вы можете только перепослать сообщения\n"
 "из папки \"Отправленные\"."
 
-#: mail/mail-callbacks.c:1692
+#: mail/mail-callbacks.c:1779
 #, fuzzy, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Вы уверены что вы хотите править все %d сообщений?"
 
-#: mail/mail-callbacks.c:1713
+#: mail/mail-callbacks.c:1805
 msgid "No Message Selected"
 msgstr "Сообщение не выбрано"
 
-#: mail/mail-callbacks.c:1800
+#: mail/mail-callbacks.c:1899
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:1802
+#: mail/mail-callbacks.c:1901
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:1947 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:2070 widgets/misc/e-messagebox.c:159
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: mail/mail-callbacks.c:1954
+#: mail/mail-callbacks.c:2077
 msgid ""
 "This operation will permanently erase all messages marked as deleted. If you "
 "continue, you will not be able to recover these messages.\n"
@@ -8780,12 +8444,12 @@ msgid ""
 "Really erase these messages?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1961
+#: mail/mail-callbacks.c:2084
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Не спрашивать снова"
 
-#: mail/mail-callbacks.c:2066
+#: mail/mail-callbacks.c:2192
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -8794,19 +8458,19 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:2077
+#: mail/mail-callbacks.c:2204
 msgid "Filters"
 msgstr "Фильтры"
 
-#: mail/mail-callbacks.c:2125
+#: mail/mail-callbacks.c:2267
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/mail-callbacks.c:2171
+#: mail/mail-callbacks.c:2313
 msgid "Printing of message failed"
 msgstr "Сбой печати сообщения"
 
-#: mail/mail-callbacks.c:2260
+#: mail/mail-callbacks.c:2415
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Вы уверены что хотите открыть все %d сообщений в отдельных окнах?"
@@ -8871,12 +8535,7 @@ msgstr ""
 msgid "Evolution Account Assistant"
 msgstr "Помощник по счетам Evolution"
 
-#: mail/mail-config.c:315
-#, fuzzy, c-format
-msgid "Account %d"
-msgstr "Счет"
-
-#: mail/mail-config.c:1618
+#: mail/mail-config.c:1643
 #, c-format
 msgid ""
 "Could not get inbox for new mail store:\n"
@@ -8884,19 +8543,11 @@ msgid ""
 "No shortcut will be created."
 msgstr ""
 
-#. Create the shortcut. FIXME: This only works if the
-#. * full name matches the path.
-#.
-#: mail/mail-config.c:1629
-#, fuzzy, c-format
-msgid "%s: Inbox"
-msgstr "Входящие"
-
-#: mail/mail-config.c:1873
+#: mail/mail-config.c:1896
 msgid "Checking Service"
 msgstr ""
 
-#: mail/mail-config.c:1944 mail/mail-config.c:1947
+#: mail/mail-config.c:1967 mail/mail-config.c:1970
 msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
@@ -8914,34 +8565,34 @@ msgid "(SSL is not supported in this build of evolution)"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
 #: mail/mail-config.glade.h:4
+msgid "A_lways encrypt to myself when sending encrypted mail"
+msgstr ""
+
+#: mail/mail-config.glade.h:5
 msgid "Account"
 msgstr "Счет"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "Account Information"
 msgstr "Информация о счете"
 
-#: mail/mail-config.glade.h:6 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:7 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Account Management"
 msgstr "Управление счетами"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
 msgid "Accounts"
 msgstr "Счета"
 
-#: mail/mail-config.glade.h:8
-msgid "Always encrypt to myself when sending encrypted mail"
-msgstr ""
-
 #: mail/mail-config.glade.h:9
-msgid "Always encrypt to myself when sending encrypyed mail"
+msgid "Always _encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:10
-msgid "Always sign outgoing messages when using this account"
+msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:11 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:11
 msgid "Attachment"
 msgstr "Вложение"
 
@@ -8950,28 +8601,25 @@ msgid "Authentication"
 msgstr "Идентификация"
 
 #: mail/mail-config.glade.h:13
-msgid "Authentication Type: "
-msgstr "Тип идентификации: "
+#, fuzzy
+msgid "Checking for New Mail"
+msgstr "Проверка новое почты"
 
 #: mail/mail-config.glade.h:14
-msgid "Certificate ID:"
-msgstr ""
-
-#: mail/mail-config.glade.h:16
 msgid "Composer"
 msgstr "Редактор"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Confirm when Expunging a folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:17
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -8987,232 +8635,241 @@ msgstr ""
 "\n"
 "Нажмите \"Завершить\", чтобы сохранить ваши настройки."
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:23
 msgid "De_fault"
 msgstr "Исх.значения"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:24
 msgid "Default Forward style is: "
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:25
 msgid "Default character encoding: "
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:27
 msgid "Digital IDs..."
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:28
 msgid "Display"
 msgstr "Отобразить"
 
-#: mail/mail-config.glade.h:31 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:29 shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Done"
 msgstr "Сделано"
 
-#: mail/mail-config.glade.h:32 shell/e-local-storage.c:174
+#: mail/mail-config.glade.h:30
 msgid "Drafts"
 msgstr "Черновики"
 
-#: mail/mail-config.glade.h:33
-msgid "Drafts folder:"
-msgstr "Папка черновиков:"
-
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:31
 msgid "E_nable"
 msgstr "Включить"
 
-#: mail/mail-config.glade.h:35 widgets/misc/e-filter-bar.h:96
-#: widgets/misc/e-filter-bar.h:103
+#: mail/mail-config.glade.h:32 widgets/misc/e-filter-bar.h:97
+#: widgets/misc/e-filter-bar.h:104
 msgid "Edit..."
 msgstr "Правка..."
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:33
 msgid "Enabled"
 msgstr "Включено"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:34
 msgid "Get Digital ID..."
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:35
 msgid "HTML signature file:"
 msgstr "HTML-файл подписи:"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:36
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:40 shell/glade/evolution-startup-wizard.glade.h:4
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Identity"
 msgstr "Именование"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:38
 msgid "In HTML mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:39
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:40
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:41
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:43
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:44
 msgid "Make this my _default account"
 msgstr "Сделать моим счетом по умолчанию"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:45
 msgid "NNTP Server:"
 msgstr "Сервер NNTP"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:46
 msgid "News"
 msgstr "Новые"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:48
 msgid "Optional Information"
 msgstr "Дополнительная информация"
 
-#: mail/mail-config.glade.h:53
-msgid "PGP Key ID:"
+#: mail/mail-config.glade.h:50
+msgid "PGP _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:53
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:54
 msgid "Pretty Good Privacy"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:55
 #, fuzzy
 msgid "Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:56
 #, fuzzy
 msgid "Prompt when sending messages with an _empty subject"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:57
 #, fuzzy
 msgid "Prompt when sending messages with only _Bcc recipients defined"
 msgstr "Невозможно отправить сообщение: не определены получатели."
 
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:58
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:59
 msgid "Quoted"
 msgstr "Процитированное"
 
-#: mail/mail-config.glade.h:63 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:60
+#, fuzzy
+msgid "Re_member this password"
+msgstr "Запомнить этот пароль"
+
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
 msgid "Receiving Email"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:62
 msgid "Receiving Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:63
 msgid "Receiving Options"
 msgstr "Получение параметров"
 
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
 msgid "Required Information"
 msgstr "Необходимая информация"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:66
 msgid "Secure MIME"
 msgstr ""
 
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:67
 msgid "Security"
 msgstr "Безопасность"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:68
 msgid "Select Filter Log file..."
 msgstr "Выбрать файл журнала для фильтров..."
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:69
 msgid "Select PGP binary"
 msgstr "Выбрать программу PGP"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:71
 msgid "Sending Mail"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:75 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:177
+#: mail/mail-config.glade.h:73
 msgid "Sent"
 msgstr "Отправленное"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:74
+#, fuzzy
+msgid "Sent _messages folder:"
+msgstr "Папка отправленных сообщений:"
+
+#: mail/mail-config.glade.h:75
 msgid "Sent and Draft Messages"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:77
-msgid "Sent messages folder:"
-msgstr "Папка отправленных сообщений:"
+#: mail/mail-config.glade.h:76
+#, fuzzy
+msgid "Ser_ver requires authentication"
+msgstr "Сервер требует идентификации"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:77
 msgid "Server Configuration"
 msgstr "Настройка сервера"
 
-#: mail/mail-config.glade.h:79
-msgid "Server Type: "
+#: mail/mail-config.glade.h:78
+#, fuzzy
+msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:80
-msgid "Server requires _authentication"
-msgstr "Сервер требует идентификации"
-
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:79
 msgid "Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:80
 msgid "Source"
 msgstr "Источник"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:81
 msgid "Source Information"
 msgstr "Информация об источнике"
 
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:82
 msgid "Sources"
 msgstr "Источники"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:83
 msgid "Special Folders"
 msgstr "Специальные папки"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:84
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:88
-msgid "Use secure connection (_SSL)"
+#: mail/mail-config.glade.h:85
+#: shell/glade/e-active-connection-dialog.glade.h:5
+msgid "Type"
+msgstr "Тип"
+
+#: mail/mail-config.glade.h:86
+#, fuzzy
+msgid "Use s_ecure connection (SSL)"
 msgstr "Использовать защищенное подключение (SSL)"
 
-#: mail/mail-config.glade.h:89
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -9223,104 +8880,129 @@ msgstr ""
 "\n"
 "Нажмите \"След.\" для начала."
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:91
 msgid "_Always load images off the net"
 msgstr ""
 
+#: mail/mail-config.glade.h:92
+msgid "_Always sign outgoing messages when using this account"
+msgstr ""
+
+#: mail/mail-config.glade.h:93
+#, fuzzy
+msgid "_Authentication Type: "
+msgstr "Тип идентификации: "
+
 #: mail/mail-config.glade.h:94
-msgid "_Automatically check for new mail every"
+#, fuzzy
+msgid "_Automatically check for new mail"
 msgstr "Автоматически проверять почту каждые"
 
 #: mail/mail-config.glade.h:95
-msgid "_Check for supported types"
-msgstr " Проверка поддерживаемых типов "
+msgid "_Certificate ID:"
+msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:97
+#, fuzzy
+msgid "_Drafts folder:"
+msgstr "Папка черновиков:"
+
+#: mail/mail-config.glade.h:99
 msgid "_Email Address:"
 msgstr "Эл.адрес:"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "_Empty trash folders on exit"
 msgstr "Очищать корзину при выходе"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "_Full Name:"
 msgstr "Полное имя:"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:102
 msgid "_HTML Signature:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "_Highlight citations with"
 msgstr "Выделять цитаты с помощью"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "_Host:"
 msgstr "Хост:"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "_Load images if sender is in addressbook"
 msgstr "Загрузить изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 msgid "_Log filter actions to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:107
 msgid "_Mark messages as Read after"
 msgstr "Помечать сообщения как \"Прочитанные\" после:"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 msgid "_Name:"
 msgstr "Имя:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:109
 msgid "_Never load images off the net"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "_Organization:"
 msgstr "Организация:"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "_PGP binary path:"
 msgstr "Путь к программе PGP:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "_Path:"
 msgstr "Путь:"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "_Remember this password"
 msgstr "Запомнить этот пароль"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "_Send mail in HTML format by default."
 msgstr "По умолчанию отправлять почту в формате HTML."
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "_Server Type: "
+msgstr "Тип сервера:"
+
+#: mail/mail-config.glade.h:116
 msgid "_Signature file:"
 msgstr "Файл подписи:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:117
 msgid "_Username:"
 msgstr "Имя пользователя:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:118
+#, fuzzy
+msgid "_every"
+msgstr "Каждый"
+
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "description"
 msgstr "Описание:"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "newswindow1"
 msgstr "newswindow1"
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:122
 msgid "placeholder"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "seconds."
 msgstr "секунд."
 
@@ -9368,201 +9050,174 @@ msgstr "Невозможно создать окно редактора."
 msgid "Could not create a S/MIME decode context."
 msgstr "Невозможно создать окно редактора."
 
-#: mail/mail-display.c:245
+#: mail/mail-display.c:243
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:352
+#: mail/mail-display.c:350
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:354
+#: mail/mail-display.c:352
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:354
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:417
+#: mail/mail-display.c:415
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:421
+#: mail/mail-display.c:419
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-display.c:442
+#: mail/mail-display.c:440
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:1107
+#: mail/mail-display.c:1133
 msgid "Loading message content"
 msgstr "Загрузка содержимого сообщения"
 
-#: mail/mail-display.c:1587
+#: mail/mail-display.c:1615
 msgid "Open Link in Browser"
 msgstr "Открыть ссылку в браузере"
 
-#: mail/mail-display.c:1589
+#: mail/mail-display.c:1617
 msgid "Copy Link Location"
 msgstr "Скопировать ссылку"
 
-#: mail/mail-display.c:1592
+#: mail/mail-display.c:1620
 msgid "Save Link as (FIXME)"
 msgstr "Сохранить ссылку как"
 
-#: mail/mail-display.c:1595
+#: mail/mail-display.c:1623
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: mail/mail-format.c:628
+#: mail/mail-format.c:631
 #, c-format
 msgid "%s attachment"
 msgstr "%s вложение"
 
-#: mail/mail-format.c:681
+#: mail/mail-format.c:676
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
 
-#: mail/mail-format.c:765
+#: mail/mail-format.c:760
 msgid "Date"
 msgstr "Дата"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:862
 msgid "Bad Address"
 msgstr "Неправильный эл.адрес"
 
-#: mail/mail-format.c:908 mail/message-list.etspec.h:3
+#: mail/mail-format.c:904
 msgid "From"
 msgstr "От"
 
-#: mail/mail-format.c:911
+#: mail/mail-format.c:907
 msgid "Reply-To"
 msgstr "Ответить"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:10
+#: mail/mail-format.c:911
 msgid "To"
 msgstr "Кому"
 
-#: mail/mail-format.c:919
+#: mail/mail-format.c:915
 msgid "Cc"
 msgstr "Копия"
 
-#: mail/mail-format.c:923
+#: mail/mail-format.c:919
 #, fuzzy
 msgid "Bcc"
 msgstr "Скр.копия:"
 
-#: mail/mail-format.c:1370
-msgid "No GPG/PGP program configured."
-msgstr "Программа GPG/PGP не настроена."
-
-#: mail/mail-format.c:1386
-msgid "Encrypted message not displayed"
-msgstr "Зашифрованное сообщение не отображается"
-
-#: mail/mail-format.c:1397
-msgid "Encrypted message"
-msgstr "Зашифрованное сообщение"
-
-#: mail/mail-format.c:1398
-msgid "Click icon to decrypt."
-msgstr "Щелкните на пиктограмме для дешифрации."
-
-#: mail/mail-format.c:1453
-msgid "This message is digitally signed and has been found to be authentic."
-msgstr ""
-"Это сообщение с цифровой подписью, которая прошла проверку идентичности."
-
-#: mail/mail-format.c:1464
-msgid "This message is digitally signed but can not be proven to be authentic."
-msgstr ""
-"Это сообщение с цифровой подписью, которая не может быть проверена на "
-"идентичность."
-
-#: mail/mail-format.c:2141
+#: mail/mail-format.c:2054
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/mail-format.c:2155
+#: mail/mail-format.c:2068
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:2160
+#: mail/mail-format.c:2073
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Указатель на локальный файл (%s)"
 
-#: mail/mail-format.c:2189
+#: mail/mail-format.c:2102
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Указатель на FTP сайт (%s)"
 
-#: mail/mail-format.c:2197
+#: mail/mail-format.c:2110
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
 
-#: mail/mail-format.c:2202
+#: mail/mail-format.c:2115
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:582
+#: mail/mail-local.c:620
 #, fuzzy
 msgid "Reconfiguring folder"
 msgstr "Обновление папки"
 
-#: mail/mail-local.c:655
+#: mail/mail-local.c:701
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s: %s"
 msgstr ""
 
-#: mail/mail-local.c:708
+#: mail/mail-local.c:754
 #, fuzzy, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Не удалось получить папку: %s: %s"
 
-#: mail/mail-local.c:754
+#: mail/mail-local.c:800
 #, fuzzy, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr ""
 "Невозможно удалить папку \"%s\":\n"
 "%s"
 
-#: mail/mail-local.c:1119
+#: mail/mail-local.c:1213
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Изменение папки \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:1134
+#: mail/mail-local.c:1228
 #, c-format
 msgid "%s may not be reconfigured because it is not a local folder"
 msgstr ""
 
-#: mail/mail-local.c:1156
+#: mail/mail-local.c:1250
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1244
+#: mail/mail-local.c:1339
 #, fuzzy
 msgid "You cannot change the format of a non-local folder."
 msgstr "Вы не можете скопировать сообщения из этой папки для мусора."
 
-#: mail/mail-local.c:1253
+#: mail/mail-local.c:1348
 #, fuzzy, c-format
 msgid "Reconfigure /%s"
 msgstr "Перенастроить %s"
 
-#: mail/mail-mt.c:199
+#: mail/mail-mt.c:251
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -9571,7 +9226,7 @@ msgstr ""
 "Ошибка при \"%s\":\n"
 "%s"
 
-#: mail/mail-mt.c:202
+#: mail/mail-mt.c:254
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -9580,147 +9235,123 @@ msgstr ""
 "Ошибка при выполнении операции:\n"
 "%s"
 
-#. Remember the password?
-#: mail/mail-mt.c:506
-msgid "Remember this password"
-msgstr "Запомнить этот пароль"
-
-#: mail/mail-mt.c:507
-msgid "Remember this password for the remainder of this session"
-msgstr ""
-
-#: mail/mail-mt.c:564
-#, fuzzy, c-format
-msgid "Enter Password for %s"
-msgstr "Пожалуйста введите вашу парольную фразу для %s"
-
-#: mail/mail-mt.c:567
-#, fuzzy
-msgid "Enter Password"
-msgstr "Пароль"
-
-#: mail/mail-mt.c:883
+#: mail/mail-mt.c:893
 msgid "Working"
 msgstr "Обработка"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:85
 msgid "Filtering Folder"
 msgstr "Фильтрация папки"
 
-#: mail/mail-ops.c:229
+#: mail/mail-ops.c:248
 msgid "Fetching Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-ops.c:473 mail/mail-ops.c:505
+#: mail/mail-ops.c:491 mail/mail-ops.c:520
 msgid "However, the message was successfully sent."
 msgstr ""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:556
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:661
+#: mail/mail-ops.c:676
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:680
+#: mail/mail-ops.c:695
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:682 mail/mail-send-recv.c:522
+#: mail/mail-ops.c:697 mail/mail-send-recv.c:537
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:775
+#: mail/mail-ops.c:790
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:870
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:855
+#: mail/mail-ops.c:870
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:877
+#: mail/mail-ops.c:892
 #, fuzzy, c-format
 msgid "Cannot copy a folder `%s' to itself"
 msgstr ""
 "Невозможно скопировать файлы в\n"
 "\"%s\"."
 
-#: mail/mail-ops.c:884
+#: mail/mail-ops.c:899
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:887
+#: mail/mail-ops.c:902
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:997
+#: mail/mail-ops.c:1012
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#. Fill in the new fields
-#: mail/mail-ops.c:1047 shell/e-local-storage.c:179
-msgid "Trash"
-msgstr "Мусорная корзина"
-
-#: mail/mail-ops.c:1180
+#: mail/mail-ops.c:1195
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1223
+#: mail/mail-ops.c:1238
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1310
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1364
+#: mail/mail-ops.c:1379
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1473
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1545
+#: mail/mail-ops.c:1560
 msgid "Expunging folder"
 msgstr "Вычеркивание папки"
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1609
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1661
+#: mail/mail-ops.c:1676
 #, fuzzy, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Получение сообщений"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1762
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:1874
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -9729,7 +9360,7 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1887
+#: mail/mail-ops.c:1902
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -9738,11 +9369,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1961
+#: mail/mail-ops.c:1976
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:1992
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -9751,17 +9382,17 @@ msgstr ""
 "Не удалось создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2023
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2092
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2078
+#: mail/mail-ops.c:2093
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Подключение к серверу..."
@@ -9770,93 +9401,103 @@ msgstr "Подключение к серверу..."
 msgid "_Search"
 msgstr "Поиск"
 
-#: mail/mail-search.c:138
+#: mail/mail-search.c:137
 msgid "(Untitled Message)"
 msgstr "(Неозаглавленное сообщение)"
 
-#: mail/mail-search.c:241
+#: mail/mail-search.c:240
 msgid "Untitled Message"
 msgstr "Неозаглавленное сообщение"
 
-#: mail/mail-search.c:245
+#: mail/mail-search.c:244
 msgid "Empty Message"
 msgstr "Пустое сообщение"
 
-#: mail/mail-search.c:292
+#: mail/mail-search.c:291
 msgid "Find in Message"
 msgstr "Поиск в сообщении"
 
-#: mail/mail-search.c:322
+#: mail/mail-search.c:321
 msgid "Case Sensitive"
 msgstr "Учитывать регистр"
 
-#: mail/mail-search.c:324
+#: mail/mail-search.c:323
 msgid "Search Forward"
 msgstr "Поиск вперёд"
 
-#: mail/mail-search.c:344
+#: mail/mail-search.c:343
 msgid "Find:"
 msgstr "Поиск:"
 
-#: mail/mail-search.c:347
+#: mail/mail-search.c:346
 msgid "Matches:"
 msgstr "Совпадения:"
 
-#: mail/mail-send-recv.c:139
+#: mail/mail-send-recv.c:141
 msgid "Cancelling..."
 msgstr "Отмена..."
 
-#: mail/mail-send-recv.c:243
+#: mail/mail-send-recv.c:245
 #, fuzzy, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Тип сервера:"
 
-#: mail/mail-send-recv.c:245
+#: mail/mail-send-recv.c:247
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr ""
 
-#: mail/mail-send-recv.c:247
+#: mail/mail-send-recv.c:249
 #, fuzzy, c-format
 msgid "Type: %s"
 msgstr "Тип:"
 
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:286
 #, fuzzy
 msgid "Send & Receive Mail"
 msgstr "Получение и отправка почты"
 
-#: mail/mail-send-recv.c:284
+#: mail/mail-send-recv.c:288
 #, fuzzy
 msgid "Cancel All"
 msgstr "Отмена"
 
-#: mail/mail-send-recv.c:333
+#: mail/mail-send-recv.c:348
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
+#: mail/mail-send-recv.c:349 mail/mail-send-recv.c:402
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-send-recv.c:518
+#: mail/mail-send-recv.c:533
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: mail/mail-session.c:183
+#: mail/mail-session.c:211
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-tools.c:241
+#: mail/mail-session.c:310
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Пожалуйста введите вашу парольную фразу для %s"
+
+#: mail/mail-session.c:313
+#, fuzzy
+msgid "Enter Password"
+msgstr "Пароль"
+
+#: mail/mail-tools.c:248
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:252
 msgid "Forwarded message"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-tools.c:378
+#: mail/mail-tools.c:386
 msgid "Forwarded Message"
 msgstr "Пересланное сообщение"
 
@@ -9865,12 +9506,12 @@ msgstr "Пересланное сообщение"
 msgid "Setting up vfolder: %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-vfolder.c:203
+#: mail/mail-vfolder.c:204
 #, fuzzy, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-vfolder.c:416
+#: mail/mail-vfolder.c:415
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -9879,29 +9520,25 @@ msgid ""
 "And have been updated."
 msgstr ""
 
-#: mail/mail-vfolder.c:638
-msgid "VFolders"
-msgstr "Вирт.папки"
-
-#: mail/mail-vfolder.c:736
+#: mail/mail-vfolder.c:784
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Правка вирт.папок"
 
-#: mail/mail-vfolder.c:751
+#: mail/mail-vfolder.c:799
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr ""
 
-#: mail/mail-vfolder.c:805
+#: mail/mail-vfolder.c:853
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
-#: mail/message-browser.c:121
+#: mail/message-browser.c:123
 msgid "(No subject)"
 msgstr "(Без темы)"
 
-#: mail/message-browser.c:123
+#: mail/message-browser.c:125
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Сообщение"
@@ -9962,24 +9599,10 @@ msgstr "%a %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2334
+#: mail/message-list.c:2327
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
-#: mail/message-list.etspec.h:2
-msgid "Flagged"
-msgstr ""
-
-#: mail/message-list.etspec.h:4
-#, fuzzy
-msgid "Received"
-msgstr "Дата получения"
-
-#: mail/message-list.etspec.h:7
-#, fuzzy
-msgid "Size"
-msgstr "Размер:"
-
 #: mail/subscribe-dialog.c:219
 #, fuzzy, c-format
 msgid "Scanning folders under %s on \"%s\""
@@ -9990,27 +9613,26 @@ msgstr "Считывание папок в \"%s\""
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/subscribe-dialog.c:320
+#: mail/subscribe-dialog.c:318
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписывание на папку \"%s\""
 
-#: mail/subscribe-dialog.c:322
+#: mail/subscribe-dialog.c:320
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:1
+#: mail/subscribe-dialog.c:1278
 msgid "Folder"
 msgstr "Папка"
 
-#: mail/subscribe-dialog.c:1521
+#: mail/subscribe-dialog.c:1519
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Сообщение не выбрано"
 
-#: mail/subscribe-dialog.c:1582
+#: mail/subscribe-dialog.c:1580
 #, fuzzy
 msgid "Please select a server."
 msgstr "Выбрать сервис"
@@ -10057,29 +9679,36 @@ msgstr "Отказаться"
 msgid "Evolution component for the executive summary."
 msgstr "Компонент Evolution для Executive Summary."
 
+#. FIXME: Inbox shortcut should point to something else for
+#. people who won't care about using /Local Folders/Inbox
+#: my-evolution/component-factory.c:45 shell/e-shortcuts.c:1049
+#: shell/e-storage-set-view.c:1460
+msgid "Summary"
+msgstr "Итог"
+
 #: my-evolution/component-factory.c:45
 msgid "Folder containing the Evolution Summary"
 msgstr ""
 
 #: my-evolution/component-factory.c:154
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr ""
-"Невозможно инициализировать компонент Executive Summary программы Evolution."
+#, fuzzy
+msgid "Cannot initialize Evolution's Summary component."
+msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: my-evolution/e-summary-calendar.c:326 my-evolution/e-summary-calendar.c:344
+#: my-evolution/e-summary-calendar.c:341 my-evolution/e-summary-calendar.c:359
 msgid "Appointments"
 msgstr "Встречи"
 
-#: my-evolution/e-summary-calendar.c:327
+#: my-evolution/e-summary-calendar.c:342
 msgid "No appointments"
 msgstr "Нет встреч"
 
-#: my-evolution/e-summary-calendar.c:364
+#: my-evolution/e-summary-calendar.c:378
 #, fuzzy
-msgid "%k%M %d %B"
+msgid "%k:%M %d %B"
 msgstr "%A %d %B"
 
-#: my-evolution/e-summary-calendar.c:366
+#: my-evolution/e-summary-calendar.c:380
 #, fuzzy
 msgid "%l:%M %d %B"
 msgstr "%A %d %B"
@@ -10097,48 +9726,48 @@ msgstr "Итог почты"
 msgid "KBOS:ZSAM:EGAA"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:441
+#: my-evolution/e-summary-preferences.c:442
 msgid "Dictionary.com Word of the Day"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:464
+#: my-evolution/e-summary-preferences.c:465
 msgid "Quotes of the Day"
 msgstr "Цитата дня"
 
-#: my-evolution/e-summary-preferences.c:930
+#: my-evolution/e-summary-preferences.c:931
 msgid "Add a news feed"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:938
+#: my-evolution/e-summary-preferences.c:939
 msgid "Enter the URL of the news feed you wish to add"
 msgstr ""
 
-#: my-evolution/e-summary-preferences.c:942
+#: my-evolution/e-summary-preferences.c:943
 msgid "Name:"
 msgstr "Имя:"
 
-#: my-evolution/e-summary-preferences.c:1487
+#: my-evolution/e-summary-preferences.c:1489
 #, fuzzy
 msgid "Summary Settings"
 msgstr "Итог содержит"
 
 #: my-evolution/e-summary-rdf.c:297 my-evolution/e-summary-rdf.c:382
-#: my-evolution/e-summary-rdf.c:415
+#: my-evolution/e-summary-rdf.c:416
 #, fuzzy
 msgid "Error downloading RDF"
 msgstr "<b>Ошибка при загрузке календаря</b>"
 
-#: my-evolution/e-summary-rdf.c:507
+#: my-evolution/e-summary-rdf.c:529
 #, fuzzy
 msgid "News Feed"
 msgstr "Новая папка"
 
-#: my-evolution/e-summary-tasks.c:236
+#: my-evolution/e-summary-tasks.c:247
 #, fuzzy
 msgid "No tasks"
 msgstr "Показать задания"
 
-#: my-evolution/e-summary-tasks.c:275
+#: my-evolution/e-summary-tasks.c:286
 #, fuzzy
 msgid "(No Description)"
 msgstr "Описание:"
@@ -10151,7 +9780,7 @@ msgstr ""
 msgid "<dd><b>The weather server could not be contacted</b></dd>"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:539
+#: my-evolution/e-summary-weather.c:560
 #, fuzzy
 msgid "Weather"
 msgstr "Погода"
@@ -10160,11 +9789,11 @@ msgstr "Погода"
 #. see in My Evolution by default. You can find the list of all
 #. stations and their codes in Evolution sources
 #. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:630
+#: my-evolution/e-summary-weather.c:662
 msgid "KBOS:EGAA:RJTT"
 msgstr ""
 
-#: my-evolution/e-summary-weather.c:691
+#: my-evolution/e-summary-weather.c:723
 #, fuzzy
 msgid "Regions"
 msgstr "Разделы:"
@@ -10190,11 +9819,11 @@ msgid "Executive summary component could not initialize Bonobo.\n"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 
 #: my-evolution/metar.c:29
-msgid "╟F"
+msgid " F"
 msgstr ""
 
 #: my-evolution/metar.c:29
-msgid "╟C"
+msgid " C"
 msgstr ""
 
 #: my-evolution/metar.c:33
@@ -10243,7 +9872,7 @@ msgstr ""
 msgid "Overcast"
 msgstr ""
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:137
+#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
 msgid "Invalid"
 msgstr ""
 
@@ -10315,1083 +9944,1087 @@ msgstr "Северозападный"
 msgid "North - Northwest"
 msgstr "Северный - Северозападный"
 
-#. NONE                         VICINITY                             LIGHT                      MODERATE                      HEAVY                      SHALLOW                      PATCHES                         PARTIAL                      THUNDERSTORM                    BLOWING                      SHOWERS                         DRIFTING                      FREEZING
-#. ******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************
-#. NONE
 #. DRIZZLE
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:127
 msgid "Drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:128
 msgid "Drizzle in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:129
 msgid "Light drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:130
 msgid "Moderate drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:131
 msgid "Heavy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:132
 msgid "Shallow drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:133
 msgid "Patches of drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:134
 msgid "Partial drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100 my-evolution/metar.c:101
+#: my-evolution/metar.c:135 my-evolution/metar.c:150
 msgid "Thunderstorm"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:136
 msgid "Windy drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:137
 #, fuzzy
 msgid "Showers"
 msgstr "Показать"
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:138
 msgid "Drifting drizzle"
 msgstr ""
 
-#: my-evolution/metar.c:100
+#: my-evolution/metar.c:139
 msgid "Freezing drizzle"
 msgstr ""
 
 #. RAIN
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:142
 msgid "Rain"
 msgstr "Дождь"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:143
 msgid "Rain in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:144
 msgid "Light rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:145
 msgid "Moderate rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:146
 msgid "Heavy rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:147
 msgid "Shallow rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:148
 msgid "Patches of rain"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:149
 msgid "Partial rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:151
 msgid "Blowing rainfall"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:152
 msgid "Rain showers"
 msgstr ""
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:153
 #, fuzzy
 msgid "Drifting rain"
 msgstr "Описание содержит"
 
-#: my-evolution/metar.c:101
+#: my-evolution/metar.c:154
 #, fuzzy
 msgid "Freezing rain"
 msgstr "Повторный поиск"
 
 #. SNOW
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:157
 msgid "Snow"
 msgstr "Снег"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:158
 msgid "Snow in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:159
 msgid "Light snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:160
 #, fuzzy
 msgid "Moderate snow"
 msgstr "Обновить сейчас"
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:161
 msgid "Heavy snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:162
 msgid "Shallow snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:163
 msgid "Patches of snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:164
 msgid "Partial snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102 my-evolution/metar.c:103
+#: my-evolution/metar.c:165 my-evolution/metar.c:180
 msgid "Snowstorm"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:166
 msgid "Blowing snowfall"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:167
 msgid "Snow showers"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:168
 msgid "Drifting snow"
 msgstr ""
 
-#: my-evolution/metar.c:102
+#: my-evolution/metar.c:169
 msgid "Freezing snow"
 msgstr ""
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:172
 msgid "Snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:173
 msgid "Snow grains in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:174
 msgid "Light snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:175
 msgid "Moderate snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:176
 msgid "Heavy snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:177
 msgid "Shallow snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:178
 msgid "Patches of snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:179
 msgid "Partial snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:181
 msgid "Blowing snow grains"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:182
 msgid "Snow grain showers"
 msgstr ""
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:183
 #, fuzzy
 msgid "Drifting snow grains"
 msgstr "Описание содержит"
 
-#: my-evolution/metar.c:103
+#: my-evolution/metar.c:184
 msgid "Freezing snow grains"
 msgstr ""
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:187
 msgid "Ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:188
 msgid "Ice crystals in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:189
 msgid "Few ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:190
 msgid "Moderate ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:191
 msgid "Heavy ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:193
 msgid "Patches of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:194
 msgid "Partial ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:195
 msgid "Ice crystal storm"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:196
 msgid "Blowing ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:197
 msgid "Showers of ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:198
 msgid "Drifting ice crystals"
 msgstr ""
 
-#: my-evolution/metar.c:104
+#: my-evolution/metar.c:199
 msgid "Freezing ice crystals"
 msgstr ""
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:202
 msgid "Ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:203
 msgid "Ice pellets in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:204
 msgid "Few ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:205
 msgid "Moderate ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:206
 msgid "Heavy ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:207
 msgid "Shallow ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:208
 msgid "Patches of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:209
 msgid "Partial ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:210
 msgid "Ice pellet storm"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:211
 msgid "Blowing ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:212
 msgid "Showers of ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:213
 msgid "Drifting ice pellets"
 msgstr ""
 
-#: my-evolution/metar.c:105
+#: my-evolution/metar.c:214
 msgid "Freezing ice pellets"
 msgstr ""
 
 #. HAIL
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:217
 #, fuzzy
 msgid "Hail"
 msgstr "Эл.адрес"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:218
 msgid "Hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:106 my-evolution/metar.c:107
+#: my-evolution/metar.c:219 my-evolution/metar.c:234
 msgid "Light hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:220
 msgid "Moderate hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:221
 msgid "Heavy hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:222
 #, fuzzy
 msgid "Shallow hail"
 msgstr "Показать диалог"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:223
 msgid "Patches of hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:224
 #, fuzzy
 msgid "Partial hail"
 msgstr "Первый эл.адрес"
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:225
 msgid "Hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:226
 msgid "Blowing hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:227
 msgid "Hail showers"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:228
 msgid "Drifting hail"
 msgstr ""
 
-#: my-evolution/metar.c:106
+#: my-evolution/metar.c:229
 #, fuzzy
 msgid "Freezing hail"
 msgstr "Получение эл.почты"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:232
 msgid "Small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:233
 msgid "Small hail in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:235
 msgid "Moderate small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:236
 msgid "Heavy small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:237
 msgid "Shallow small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:238
 msgid "Patches of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:239
 msgid "Partial small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:240
 msgid "Small hailstorm"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:241
 msgid "Blowing small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:242
 msgid "Showers of small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:243
 msgid "Drifting small hail"
 msgstr ""
 
-#: my-evolution/metar.c:107
+#: my-evolution/metar.c:244
 msgid "Freezing small hail"
 msgstr ""
 
 #. PRECIPITATION
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:247
 #, fuzzy
 msgid "Unknown precipitation"
 msgstr "Неизвестное состоиние идентификации."
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:248
 msgid "Precipitation in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:249
 msgid "Light precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:250
 msgid "Moderate precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:251
 msgid "Heavy precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:252
 msgid "Shallow precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:253
 msgid "Patches of precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:254
 msgid "Partial precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:255
 #, fuzzy
 msgid "Unknown thunderstorm"
 msgstr "Неизвестная ошибка"
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:256
 msgid "Blowing precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:257
 msgid "Showers, type unknown"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:258
 msgid "Drifting precipitation"
 msgstr ""
 
-#: my-evolution/metar.c:108
+#: my-evolution/metar.c:259
 #, fuzzy
 msgid "Freezing precipitation"
 msgstr "Приглашение на встречу"
 
 #. MIST
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:262
 msgid "Mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:263
 msgid "Mist in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:264
 msgid "Light mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:265
 msgid "Moderate mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:266
 msgid "Thick mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:267
 msgid "Shallow mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:268
 msgid "Patches of mist"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:269
 #, fuzzy
 msgid "Partial mist"
 msgstr "Портрет"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:271
 msgid "Mist with wind"
 msgstr ""
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:273
 #, fuzzy
 msgid "Drifting mist"
 msgstr "Список рассылки"
 
-#: my-evolution/metar.c:109
+#: my-evolution/metar.c:274
 msgid "Freezing mist"
 msgstr ""
 
 #. FOG
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:277
 msgid "Fog"
 msgstr "Туман"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:278
 msgid "Fog in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:279
 msgid "Light fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:280
 msgid "Moderate fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:281
 msgid "Thick fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:282
 msgid "Shallow fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:283
 msgid "Patches of fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:284
 msgid "Partial fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:286
 #, fuzzy
 msgid "Fog with wind"
 msgstr "Закрыть это окно"
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:288
 msgid "Drifting fog"
 msgstr ""
 
-#: my-evolution/metar.c:110
+#: my-evolution/metar.c:289
 msgid "Freezing fog"
 msgstr ""
 
 #. SMOKE
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:292
 msgid "Smoke"
 msgstr "Дым"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:293
 msgid "Smoke in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:294
 msgid "Thin smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:295
 msgid "Moderate smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:296
 msgid "Thick smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:297
 #, fuzzy
 msgid "Shallow smoke"
 msgstr "Показать задания"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:298
 msgid "Patches of smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:299
 msgid "Partial smoke"
 msgstr ""
 
-#: my-evolution/metar.c:111
-msgid "Smoke w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:300
+#, fuzzy
+msgid "Thunderous smoke"
+msgstr "Задания"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:301
 #, fuzzy
 msgid "Smoke with wind"
 msgstr "Закрыть это окно"
 
-#: my-evolution/metar.c:111
+#: my-evolution/metar.c:303
 msgid "Drifting smoke"
 msgstr ""
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:307
 msgid "Volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:308
 msgid "Volcanic ash in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:310
 msgid "Moderate volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:311
 msgid "Thick volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:312
 msgid "Shallow volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:313
 msgid "Patches of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:314
 msgid "Partial volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Volcanic ash w/ thunders"
-msgstr ""
+#: my-evolution/metar.c:315
+#, fuzzy
+msgid "Thunderous volcanic ash"
+msgstr "Задания"
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:316
 msgid "Blowing volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
-msgid "Showers of volcanic ash "
+#: my-evolution/metar.c:317
+msgid "Showers of volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:318
 msgid "Drifting volcanic ash"
 msgstr ""
 
-#: my-evolution/metar.c:112
+#: my-evolution/metar.c:319
 msgid "Freezing volcanic ash"
 msgstr ""
 
 #. SAND
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:322
 #, fuzzy
 msgid "Sand"
 msgstr "Отправить"
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:323
 msgid "Sand in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:324
 msgid "Light sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:325
 msgid "Moderate sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:326
 msgid "Heavy sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:328
 msgid "Patches of sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:329
 msgid "Partial sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:331
 msgid "Blowing sand"
 msgstr ""
 
-#: my-evolution/metar.c:113
+#: my-evolution/metar.c:333
 msgid "Drifting sand"
 msgstr ""
 
 #. HAZE
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:337
 #, fuzzy
 msgid "Haze"
 msgstr "Заголовок"
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:338
 msgid "Haze in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:339
 msgid "Light haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:340
 msgid "Moderate haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:341
 msgid "Thick haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:342
 msgid "Shallow haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:343
 msgid "Patches of haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:344
 msgid "Partial haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:346
 msgid "Haze with wind"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:348
 msgid "Drifting haze"
 msgstr ""
 
-#: my-evolution/metar.c:114
+#: my-evolution/metar.c:349
 msgid "Freezing haze"
 msgstr ""
 
 #. SPRAY
-#: my-evolution/metar.c:115
+#: my-evolution/metar.c:352
 #, fuzzy
-msgid "Sprays"
+msgid "Spray"
 msgstr "дни"
 
-#: my-evolution/metar.c:115
-msgid "Sprays in the vicinity"
+#: my-evolution/metar.c:353
+msgid "Spray in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Light sprays"
+#: my-evolution/metar.c:354
+msgid "Light spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Moderate sprays"
-msgstr ""
+#: my-evolution/metar.c:355
+#, fuzzy
+msgid "Moderate spray"
+msgstr "Обновить сейчас"
 
-#: my-evolution/metar.c:115
-msgid "Heavy sprays"
+#: my-evolution/metar.c:356
+msgid "Heavy spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Shallow sprays"
-msgstr ""
+#: my-evolution/metar.c:357
+#, fuzzy
+msgid "Shallow spray"
+msgstr "Показать диалог"
 
-#: my-evolution/metar.c:115
-msgid "Patches of sprays"
+#: my-evolution/metar.c:358
+msgid "Patches of spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Partial sprays"
-msgstr ""
+#: my-evolution/metar.c:359
+#, fuzzy
+msgid "Partial spray"
+msgstr "Портрет"
 
-#: my-evolution/metar.c:115
-msgid "Blowing sprays"
+#: my-evolution/metar.c:361
+msgid "Blowing spray"
 msgstr ""
 
-#: my-evolution/metar.c:115
-msgid "Drifting sprays"
-msgstr ""
+#: my-evolution/metar.c:363
+#, fuzzy
+msgid "Drifting spray"
+msgstr "Описание содержит"
 
-#: my-evolution/metar.c:115
-msgid "Freezing sprays"
-msgstr ""
+#: my-evolution/metar.c:364
+#, fuzzy
+msgid "Freezing spray"
+msgstr "Повторный поиск"
 
 #. DUST
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:367
 msgid "Dust"
 msgstr "Пыль"
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:368
 msgid "Dust in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:369
 msgid "Light dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:370
 msgid "Moderate dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:371
 msgid "Heavy dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:373
 msgid "Patches of dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:374
 msgid "Partial dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:376
 msgid "Blowing dust"
 msgstr ""
 
-#: my-evolution/metar.c:116
+#: my-evolution/metar.c:378
 msgid "Drifting dust"
 msgstr ""
 
 #. SQUALL
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:382
 msgid "Squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:383
 msgid "Squall in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:384
 msgid "Light squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:385
 msgid "Moderate squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:386
 msgid "Heavy squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:389
 msgid "Partial squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:390
 msgid "Thunderous squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:391
 msgid "Blowing squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:393
 msgid "Drifting squall"
 msgstr ""
 
-#: my-evolution/metar.c:117
+#: my-evolution/metar.c:394
 msgid "Freezing squall"
 msgstr ""
 
 #. SANDSTORM
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:397
 msgid "Sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:398
 msgid "Sandstorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:399
 msgid "Light standstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:400
 msgid "Moderate sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:401
 msgid "Heavy sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:402
 msgid "Shallow sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:404
 msgid "Partial sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:405
 msgid "Thunderous sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:406
 msgid "Blowing sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:408
 msgid "Drifting sandstorm"
 msgstr ""
 
-#: my-evolution/metar.c:118
+#: my-evolution/metar.c:409
 msgid "Freezing sandstorm"
 msgstr ""
 
 #. DUSTSTORM
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:412
 msgid "Duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:413
 msgid "Duststorm in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:414
 msgid "Light duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:415
 msgid "Moderate duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:416
 msgid "Heavy duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:417
 msgid "Shallow duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:419
 msgid "Partial duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:420
 msgid "Thunderous duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:421
 msgid "Blowing duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:423
 msgid "Drifting duststorm"
 msgstr ""
 
-#: my-evolution/metar.c:119
+#: my-evolution/metar.c:424
 msgid "Freezing duststorm"
 msgstr ""
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:427
 msgid "Funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:428
 msgid "Funnel cloud in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:429
 msgid "Light funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:430
 msgid "Moderate funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:431
 msgid "Thick funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:432
 msgid "Shallow funnel cloud"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:433
 msgid "Patches of funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:434
 msgid "Partial funnel clouds"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:436
 msgid "Funnel cloud w/ wind"
 msgstr ""
 
-#: my-evolution/metar.c:120
+#: my-evolution/metar.c:438
 msgid "Drifting funnel cloud"
 msgstr ""
 
 #. TORNADO
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:442 my-evolution/metar.c:451
 msgid "Tornado"
 msgstr "Торнадо"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:443
 msgid "Tornado in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:445
 msgid "Moderate tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:446
 #, fuzzy
 msgid "Raging tornado"
 msgstr "Задания"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:449
 msgid "Partial tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:450
 #, fuzzy
 msgid "Thunderous tornado"
 msgstr "Задания"
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:453
 msgid "Drifting tornado"
 msgstr ""
 
-#: my-evolution/metar.c:121
+#: my-evolution/metar.c:454
 msgid "Freezing tornado"
 msgstr ""
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:457
 msgid "Dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:458
 msgid "Dust whirls in the vicinity"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:459
 msgid "Light dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:460
 msgid "Moderate dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:461
 msgid "Heavy dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:462
 msgid "Shallow dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:463
 msgid "Patches of dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:464
 msgid "Partial dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:466
 msgid "Blowing dust whirls"
 msgstr ""
 
-#: my-evolution/metar.c:122
+#: my-evolution/metar.c:468
 msgid "Drifting dust whirls"
 msgstr ""
 
@@ -11401,7 +11034,7 @@ msgstr "Удалить"
 
 #: my-evolution/my-evolution.glade.h:2
 #, fuzzy
-msgid "Add n_ew feed"
+msgid "Add n_ews feed"
 msgstr "Отвечено"
 
 #: my-evolution/my-evolution.glade.h:3
@@ -11417,18 +11050,17 @@ msgstr "Все папки:"
 msgid "All news _feeds:"
 msgstr "Отвечено"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "How many days should the calendar display at once?"
-msgstr "Сколько дней должен календарь отображать одновременно?"
+#: my-evolution/my-evolution.glade.h:6
+msgid "C_elcius"
+msgstr "Цельсия"
 
 #: my-evolution/my-evolution.glade.h:8
-#, fuzzy
-msgid "M_etric"
-msgstr "Мексика"
+msgid "How many days should the calendar display at once?"
+msgstr "Сколько дней должен календарь отображать одновременно?"
 
 #: my-evolution/my-evolution.glade.h:9
 msgid "Ma_x number of items shown:"
-msgstr ""
+msgstr "Макс. число отображаемых элементов:"
 
 #: my-evolution/my-evolution.glade.h:10
 msgid "News Feed Settings"
@@ -11444,16 +11076,15 @@ msgstr "Одна неделя"
 
 #: my-evolution/my-evolution.glade.h:13
 msgid "R_efresh time (seconds):"
-msgstr ""
+msgstr "Период обновления (секунд):"
 
 #: my-evolution/my-evolution.glade.h:14
 msgid "Refresh _time (seconds):"
-msgstr ""
+msgstr "Период обновления (секунд):"
 
 #: my-evolution/my-evolution.glade.h:15
-#, fuzzy
 msgid "S_how full path for folders"
-msgstr "со всеми активными удалёнными папками"
+msgstr "Показать полный путь к папкам"
 
 #: my-evolution/my-evolution.glade.h:16
 msgid "Show _all tasks"
@@ -11464,17 +11095,16 @@ msgid "Show _today's tasks"
 msgstr "Показать задания на сегодня"
 
 #: my-evolution/my-evolution.glade.h:18
-msgid "Tasks "
-msgstr "Задания "
+msgid "Show temperatures in:"
+msgstr "Показывать температуру в:"
 
 #: my-evolution/my-evolution.glade.h:19
-msgid "Units: "
-msgstr "Единицы:  "
+msgid "Tasks "
+msgstr "Задания "
 
 #: my-evolution/my-evolution.glade.h:20
-#, fuzzy
 msgid "Weather settings"
-msgstr "Очистить выделение"
+msgstr "Установки погоды"
 
 #: my-evolution/my-evolution.glade.h:22
 msgid "_Display folders:"
@@ -11490,13 +11120,12 @@ msgid "_Displayed feeds:"
 msgstr "Отобразить"
 
 #: my-evolution/my-evolution.glade.h:25
-msgid "_Five days"
-msgstr "Пять дней"
+msgid "_Fahrenheit"
+msgstr "Фаренгейт"
 
 #: my-evolution/my-evolution.glade.h:26
-#, fuzzy
-msgid "_Imperial"
-msgstr "Апрель"
+msgid "_Five days"
+msgstr "Пять дней"
 
 #: my-evolution/my-evolution.glade.h:27
 msgid "_Mail"
@@ -11512,16 +11141,25 @@ msgid "_One day"
 msgstr "Один день"
 
 #: my-evolution/my-evolution.glade.h:30
-#, fuzzy
 msgid "_Schedule"
-msgstr ""
-"Вставить встречу\n"
-"в расписание"
+msgstr "Расписание"
 
 #: my-evolution/my-evolution.glade.h:31
 msgid "_Weather"
 msgstr "Погода"
 
+#: my-evolution/my-evolution.glade.h:33
+msgid "label27"
+msgstr "метка26"
+
+#: my-evolution/my-evolution.glade.h:34
+msgid "label39"
+msgstr "метка26"
+
+#: my-evolution/my-evolution.glade.h:35
+msgid "label40"
+msgstr "метка26"
+
 #: shell/GNOME_Evolution_Shell.oaf.in.h:1
 msgid "The Evolution shell."
 msgstr "Оболочка Evolution."
@@ -11534,25 +11172,11 @@ msgstr "Показать подробности"
 msgid "Cancel Operation"
 msgstr "Отменить операцию"
 
-#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
-msgid "Inbox"
-msgstr "Входящие"
-
-#: shell/e-local-storage.c:176
-#, fuzzy
-msgid "Outbox"
-msgstr "mbox"
-
-#: shell/e-local-storage.c:624
-#, fuzzy
-msgid "Local Folders"
-msgstr "Специальные папки"
-
-#: shell/e-setup.c:125
+#: shell/e-setup.c:124
 msgid "Evolution installation"
 msgstr "Установка Evolution"
 
-#: shell/e-setup.c:129
+#: shell/e-setup.c:128
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -11560,16 +11184,16 @@ msgstr ""
 "Этой новой версии Evolution требуется установить дополнительные файлы\n"
 "в ваш личный каталог Evolution"
 
-#: shell/e-setup.c:130
+#: shell/e-setup.c:129
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Пожалуйста нажмите \"Ок\", чтобы установить файлы или \"Отмена\" для выхода."
 
-#: shell/e-setup.c:170
+#: shell/e-setup.c:169
 msgid "Could not update files correctly"
 msgstr "Невозможно обновить файлы корректно"
 
-#: shell/e-setup.c:193
+#: shell/e-setup.c:192
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -11580,14 +11204,14 @@ msgstr ""
 "%s\n"
 "Ошибка: %s"
 
-#: shell/e-setup.c:208
+#: shell/e-setup.c:207
 #, fuzzy, c-format
 msgid ""
 "An error occurred in copying files into\n"
 "`%s'."
 msgstr "При чтении файла возникла ошибка."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:281
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -11598,7 +11222,7 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-setup.c:296
+#: shell/e-setup.c:295
 msgid ""
 "Evolution has detected an old\n"
 "Executive-Summary directory.\n"
@@ -11607,7 +11231,7 @@ msgid ""
 "Do you want me to remove this directory?"
 msgstr ""
 
-#: shell/e-setup.c:321
+#: shell/e-setup.c:320
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -11618,78 +11242,91 @@ msgstr ""
 "Пожалуйста, удалите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
+#: shell/e-shell-about-box.c:40
+msgid "Evolution "
+msgstr "Evolution "
+
+#: shell/e-shell-about-box.c:41
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright (C) 1999-2001 Ximian, Inc."
+
+#: shell/e-shell-about-box.c:43
+msgid "Brought to you by"
+msgstr "Создана для вас"
+
 #: shell/e-shell-folder-commands.c:176
-#, fuzzy
 msgid "Cannot move a folder over itself."
-msgstr "Не удалось получить папку: %s: %s"
+msgstr "Невозможно переместить папку в себя саму."
 
 #: shell/e-shell-folder-commands.c:178
-#, fuzzy
 msgid "Cannot copy a folder over itself."
-msgstr ""
-"Невозможно скопировать файлы в\n"
-"\"%s\"."
+msgstr "Невозможно скопировать папку в себя саму."
 
 #: shell/e-shell-folder-commands.c:192
 msgid "Cannot move a folder into one of its descendants."
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:308
+#: shell/e-shell-folder-commands.c:307
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr ""
+msgstr "Указать папку, в которую будет скопирована папка \"%s\":"
 
-#: shell/e-shell-folder-commands.c:313
+#: shell/e-shell-folder-commands.c:312
 msgid "Copy folder"
 msgstr "Скопировать папку"
 
-#: shell/e-shell-folder-commands.c:355
+#: shell/e-shell-folder-commands.c:354
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
-msgstr ""
+msgstr "Указать папку, в которую будет перемещена папка \"%s\":"
 
-#: shell/e-shell-folder-commands.c:360
+#: shell/e-shell-folder-commands.c:359
 msgid "Move folder"
 msgstr "Переместить папку"
 
-#: shell/e-shell-folder-commands.c:386
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:385
+#, c-format
 msgid ""
 "Cannot delete folder:\n"
 "%s"
 msgstr ""
-"Невозможно удалить папку \"%s\":\n"
+"Невозможно удалить папку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:402
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:401
+#, c-format
 msgid "Delete \"%s\""
-msgstr "Удалить"
+msgstr "Удалить \"%s\""
 
 #. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:412
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:411
+#, c-format
 msgid "Are you sure you want to remove the \"%s\" folder?"
 msgstr "Вы уверены в том, что хотите удалить папку \"%s\"?"
 
-#: shell/e-shell-folder-commands.c:457
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:488
+#, c-format
 msgid ""
 "Cannot rename folder:\n"
 "%s"
 msgstr ""
-"Невозможно удалить папку \"%s\":\n"
+"Невозможно удалить папку:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:490
-#, fuzzy, c-format
+#: shell/e-shell-folder-commands.c:536
+#, c-format
 msgid "Rename the \"%s\" folder to:"
-msgstr "Переименовать папку \"%s\""
+msgstr "Переименовать папку \"%s\" в:"
 
-#: shell/e-shell-folder-commands.c:493
-#, fuzzy
+#: shell/e-shell-folder-commands.c:542
 msgid "Rename folder"
-msgstr "Переименовать папку \"%s\""
+msgstr "Переименовать папку"
+
+#: shell/e-shell-folder-commands.c:552
+#: shell/e-shell-folder-creation-dialog.c:148
+#, c-format
+msgid "The specified folder name is not valid: %s"
+msgstr "Указанное имя папки не допустимо: %s"
 
 #: shell/e-shell-folder-creation-dialog.c:111
 #, c-format
@@ -11700,34 +11337,11 @@ msgstr ""
 "Невозможно создать указанную папку:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:126
-#, fuzzy
-msgid "No folder name specified."
-msgstr "Не указаны получатели"
-
-#: shell/e-shell-folder-creation-dialog.c:132
-msgid "Folder name cannot contain the Return character."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:137
-#, fuzzy
-msgid "Folder cannot contain the directory separator."
-msgstr "Невозможно открыть каталог кэш: %s"
-
-#: shell/e-shell-folder-creation-dialog.c:142
-msgid "'.' and '..' are reserved folder names."
-msgstr ""
-
-#: shell/e-shell-folder-creation-dialog.c:180
-#, fuzzy, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Указанное имя папки не допустимо."
-
-#: shell/e-shell-folder-creation-dialog.c:300
+#: shell/e-shell-folder-creation-dialog.c:267
 msgid "Evolution - Create new folder"
 msgstr "Эволюция - Создать новую папку"
 
-#: shell/e-shell-folder-selection-dialog.c:99
+#: shell/e-shell-folder-selection-dialog.c:98
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
@@ -11735,19 +11349,19 @@ msgstr ""
 "Тип выбранной папки не подходит для\n"
 "запрошенного действия."
 
-#: shell/e-shell-folder-selection-dialog.c:360
+#: shell/e-shell-folder-selection-dialog.c:359
 msgid "New..."
 msgstr "Новая..."
 
-#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
+#: shell/e-shell-folder-title-bar.c:584 shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
-#: shell/e-shell-importer.c:141
+#: shell/e-shell-importer.c:142
 msgid "Choose the type of importer to run"
 msgstr ""
 
-#: shell/e-shell-importer.c:144
+#: shell/e-shell-importer.c:145
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -11761,13 +11375,13 @@ msgstr ""
 "Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
 "попытается опознать его."
 
-#: shell/e-shell-importer.c:150
+#: shell/e-shell-importer.c:151
 msgid "Please select the information that you would like to import"
-msgstr ""
+msgstr "Пожалуйста, укажите какую информацию вы хотите импортировать"
 
 #. Importer isn't ready yet.
 #. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:242
+#: shell/e-shell-importer.c:243
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11778,7 +11392,7 @@ msgstr ""
 "Импортер не готов.\n"
 "5 секунд ожидания перед повтором."
 
-#: shell/e-shell-importer.c:262 shell/e-shell-importer.c:293
+#: shell/e-shell-importer.c:263 shell/e-shell-importer.c:294
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11787,16 +11401,16 @@ msgstr ""
 "Импортирование %s\n"
 "Импортирование элемента %d."
 
-#: shell/e-shell-importer.c:396
-#, fuzzy, c-format
+#: shell/e-shell-importer.c:397
+#, c-format
 msgid "File %s does not exist"
-msgstr "Папка \"%s\" не существует."
+msgstr "Файл \"%s\" не существует."
 
-#: shell/e-shell-importer.c:408
+#: shell/e-shell-importer.c:409
 msgid "You may only import to local folders"
 msgstr ""
 
-#: shell/e-shell-importer.c:423
+#: shell/e-shell-importer.c:424
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -11805,11 +11419,11 @@ msgstr ""
 "Нет импортера, который способен обработать\n"
 "%s"
 
-#: shell/e-shell-importer.c:433
+#: shell/e-shell-importer.c:434
 msgid "Importing"
 msgstr "Импортирование"
 
-#: shell/e-shell-importer.c:441
+#: shell/e-shell-importer.c:442
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -11818,17 +11432,17 @@ msgstr ""
 "Импортирование %s.\n"
 "Начато %s"
 
-#: shell/e-shell-importer.c:454
+#: shell/e-shell-importer.c:455
 #, c-format
 msgid "Error starting %s"
 msgstr "Ошибка при загрузке %s"
 
-#: shell/e-shell-importer.c:473
+#: shell/e-shell-importer.c:474
 #, c-format
 msgid "Error loading %s"
 msgstr "Ошибка при загрузке %s"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -11837,187 +11451,163 @@ msgstr ""
 "Импортирование %s\n"
 "Импортирование элемента 1."
 
-#: shell/e-shell-importer.c:560
+#: shell/e-shell-importer.c:561
 msgid "Automatic"
 msgstr "Автоматическое"
 
-#: shell/e-shell-importer.c:611
+#: shell/e-shell-importer.c:612
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: shell/e-shell-importer.c:616
+#: shell/e-shell-importer.c:617
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: shell/e-shell-importer.c:626
+#: shell/e-shell-importer.c:627
 msgid "File type:"
 msgstr "Тип файла:"
 
-#: shell/e-shell-importer.c:651
+#: shell/e-shell-importer.c:652
 msgid "Import data and settings from older programs"
-msgstr ""
+msgstr "Импорт данных и установок из старых программ"
 
-#: shell/e-shell-importer.c:655
-#, fuzzy
+#: shell/e-shell-importer.c:656
 msgid "Import a single file"
-msgstr "Импортировать во внешний формат файла"
+msgstr "Импорт одного файла"
 
-#: shell/e-shell-importer.c:720 shell/e-shell-startup-wizard.c:582
+#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:576
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
+"Пожалуйста подождите...\n"
+"Сканирование существующих установок"
 
-#: shell/e-shell-importer.c:721 shell/e-shell-startup-wizard.c:585
+#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:579
 msgid "Starting Intelligent Importers"
-msgstr ""
+msgstr "Запуск интеллектуального импортёра"
 
-#: shell/e-shell-importer.c:840 shell/e-shell-startup-wizard.c:703
-#, fuzzy, c-format
+#: shell/e-shell-importer.c:848 shell/e-shell-startup-wizard.c:702
+#, c-format
 msgid "From %s:"
-msgstr "От:"
+msgstr "Из %s:"
 
-#: shell/e-shell-importer.c:1003
+#: shell/e-shell-importer.c:1011
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: shell/e-shell-importer.c:1004
+#: shell/e-shell-importer.c:1012
 msgid "Select a destination folder for importing this data"
 msgstr ""
 
-#: shell/e-shell-importer.c:1116 shell/importer/intelligent.c:194
+#: shell/e-shell-importer.c:1124 shell/importer/intelligent.c:194
 msgid "Import"
 msgstr "Импортировать"
 
-#: shell/e-shell-offline-handler.c:562
+#: shell/e-shell-offline-handler.c:572
 msgid "Closing connections..."
 msgstr "Закрытие соединений..."
 
 #: shell/e-shell-startup-wizard.c:159
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not start the Evolution Mailer Wizard interface\n"
-"%s"
-msgstr ""
+"Could not start the Evolution Mailer Assistant interface\n"
+"(%s)"
+msgstr "Невозможно инициализировать оболочку Evolution: %s"
 
-#: shell/e-shell-startup-wizard.c:168
+#: shell/e-shell-startup-wizard.c:169
 #, fuzzy
-msgid "Cannot initialize the Evolution Mailer Wizard interface"
+msgid "Could not start the Evolution Mailer Assistant interface\n"
 msgstr "Невозможно инициализировать оболочку Evolution: %s"
 
-#: shell/e-shell-startup-wizard.c:745
+#: shell/e-shell-startup-wizard.c:744
 msgid ""
 "Please select the information\n"
 "that you would like to import"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:201
+#: shell/e-shell-view-menu.c:165
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy не был найден в вашем $PATH."
 
-#: shell/e-shell-view-menu.c:209
+#: shell/e-shell-view-menu.c:173
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy не может быть запущен."
 
-#: shell/e-shell-view-menu.c:235
-#, fuzzy
-msgid "Ximian Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:237
-msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-msgstr "Copyright (C) 1999-2001 Ximian, Inc."
+#: shell/e-shell-view-menu.c:215
+msgid "About Ximian Evolution"
+msgstr "О программе Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:239
-#, fuzzy
-msgid ""
-"Ximian Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
-msgstr ""
-"\"Эволюция\" это набор приложений электронной почты,\n"
-"ведения календарей и контактной информации для\n"
-"групповой работы в среде GNOME."
-
-#: shell/e-shell-view-menu.c:442
+#: shell/e-shell-view-menu.c:409
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
-#: shell/e-shell-view-menu.c:443
+#: shell/e-shell-view-menu.c:410
 msgid "Select the folder that you want to open"
 msgstr "Выберите папку, которую вы хотите открыть"
 
-#: shell/e-shell-view-menu.c:563
-#, fuzzy
+#: shell/e-shell-view-menu.c:530
 msgid "Create a new shortcut"
-msgstr "Создать новую группу закладок"
+msgstr "Создать новый ярлык"
 
-#: shell/e-shell-view-menu.c:564
+#: shell/e-shell-view-menu.c:531
 msgid "Select the folder you want the shortcut to point to:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:595
+#: shell/e-shell-view-menu.c:562
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:603
-#, fuzzy, c-format
+#: shell/e-shell-view-menu.c:570
+#, c-format
 msgid "Error executing %s."
-msgstr "Ошибка выполнения фильтра: %s: %s"
+msgstr "Ошибка выполнения %s."
 
-#: shell/e-shell-view-menu.c:705
-msgid "Work Online"
+#: shell/e-shell-view-menu.c:672
+msgid "_Work Online"
 msgstr "Работать в сети"
 
-#: shell/e-shell-view-menu.c:718 shell/e-shell-view-menu.c:731
-#: ui/evolution.xml.h:30
+#: shell/e-shell-view-menu.c:685 ui/evolution.xml.h:51
+msgid "_Work Offline"
+msgstr "Работать вне сети"
+
+#: shell/e-shell-view-menu.c:698 ui/evolution.xml.h:30
 msgid "Work Offline"
 msgstr "Работать вне сети"
 
-#: shell/e-shell-view.c:214
+#: shell/e-shell-view.c:213
 msgid "(No folder displayed)"
 msgstr "(Папки не показаны)"
 
-#: shell/e-shell-view.c:1584
+#: shell/e-shell-view.c:1587
 #, c-format
 msgid "%s (%d)"
-msgstr ""
+msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1586
-#, fuzzy
+#: shell/e-shell-view.c:1589
 msgid "(None)"
 msgstr "(нет)"
 
-#: shell/e-shell-view.c:1591
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1593
-#, fuzzy, c-format
-msgid "%s - Ximian Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
-
-#: shell/e-shell-view.c:1633
+#: shell/e-shell-view.c:1636
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1640
+#: shell/e-shell-view.c:1643
 msgid "Ximian Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-view.c:1646
+#: shell/e-shell-view.c:1649
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell.c:563
+#: shell/e-shell.c:653
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Невозможно установить локальное хранилище -- %s"
 
-#: shell/e-shell.c:1497
+#: shell/e-shell.c:1659
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -12025,36 +11615,35 @@ msgid ""
 "in order to access that data again."
 msgstr ""
 
-#: shell/e-shell.c:1702 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1884 widgets/misc/e-cell-date-edit.c:249
 msgid "OK"
 msgstr "Ок"
 
-#: shell/e-shell.c:1704
+#: shell/e-shell.c:1886
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: shell/e-shell.c:1706
-#, fuzzy
+#: shell/e-shell.c:1888
 msgid "Cannot register on OAF"
-msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
+msgstr "Не удалось зарегистрировать в OAF"
 
-#: shell/e-shell.c:1708
+#: shell/e-shell.c:1890
 msgid "Configuration Database not found"
-msgstr ""
+msgstr "База данных конфигурации не найдена"
 
-#: shell/e-shell.c:1710 shell/e-storage.c:501
+#: shell/e-shell.c:1892 shell/e-storage.c:500
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
-#: shell/e-shortcuts-view.c:75
+#: shell/e-shortcuts-view.c:74
 msgid "Create new shortcut group"
 msgstr "Создать новую группу закладок"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:75
 msgid "Group name:"
 msgstr "Название группы:"
 
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:175
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -12063,187 +11652,281 @@ msgstr ""
 "Вы действительно хотите удалить группу\n"
 "\"%s\" из панели закладок?"
 
-#: shell/e-shortcuts-view.c:181
+#: shell/e-shortcuts-view.c:180
 msgid "Don't remove"
 msgstr "Не удалять"
 
-#: shell/e-shortcuts-view.c:210
+#: shell/e-shortcuts-view.c:209
 #, fuzzy
 msgid "Rename Shortcut Group"
 msgstr "Удалить эту группу закладок"
 
-#: shell/e-shortcuts-view.c:211
+#: shell/e-shortcuts-view.c:210
 #, fuzzy
 msgid "Rename selected shortcut group to:"
 msgstr "Удалить эту группу закладок"
 
-#: shell/e-shortcuts-view.c:225
+#: shell/e-shortcuts-view.c:224
 msgid "_Small Icons"
 msgstr "Маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:226
+#: shell/e-shortcuts-view.c:225
 msgid "Show the shortcuts as small icons"
 msgstr "Показать закладки как маленькие пиктограммы"
 
-#: shell/e-shortcuts-view.c:228
+#: shell/e-shortcuts-view.c:227
 msgid "_Large Icons"
 msgstr "Большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:229
+#: shell/e-shortcuts-view.c:228
 msgid "Show the shortcuts as large icons"
 msgstr "Показать закладки как большие пиктограммы"
 
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:239
 msgid "_New Group..."
 msgstr "Новая группа..."
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:240
 msgid "Create a new shortcut group"
 msgstr "Создать новую группу закладок"
 
-#: shell/e-shortcuts-view.c:243
+#: shell/e-shortcuts-view.c:242
 msgid "_Remove this Group..."
 msgstr "Удалить эту группу..."
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:243
 msgid "Remove this shortcut group"
 msgstr "Удалить эту группу закладок"
 
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:245
 msgid "Re_name this Group..."
 msgstr "Переименовать эту группу..."
 
-#: shell/e-shortcuts-view.c:247
-#, fuzzy
+#: shell/e-shortcuts-view.c:246
 msgid "Rename this shortcut group"
-msgstr "Удалить эту группу закладок"
+msgstr "Переименовать эту группу закладок"
 
-#: shell/e-shortcuts-view.c:252
+#: shell/e-shortcuts-view.c:251
 msgid "_Hide the Shortcut Bar"
 msgstr "Скрыть строку закладок"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:252
 msgid "Hide the shortcut bar"
 msgstr "Скрыть строку закладок"
 
-#: shell/e-shortcuts-view.c:372
-#, fuzzy
+#: shell/e-shortcuts-view.c:371
 msgid "Rename shortcut"
-msgstr "Удалить эту группу закладок"
+msgstr "Переименовать закладку"
 
-#: shell/e-shortcuts-view.c:373
-#, fuzzy
+#: shell/e-shortcuts-view.c:372
 msgid "Rename selected shortcut to:"
-msgstr "Удалить эту группу закладок"
+msgstr "Переименовать выбранную закладку в:"
 
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:384
 msgid "Open the folder linked to this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+#: shell/e-shortcuts-view.c:386 ui/evolution.xml.h:19
 msgid "Open in New _Window"
 msgstr "Открыть в новом окне"
 
-#: shell/e-shortcuts-view.c:387
+#: shell/e-shortcuts-view.c:386
 #, fuzzy
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Отправить текущее сообщение в новом окне"
 
-#: shell/e-shortcuts-view.c:390
-#, fuzzy
+#: shell/e-shortcuts-view.c:389
 msgid "_Rename"
 msgstr "Переименовать"
 
-#: shell/e-shortcuts-view.c:390
-#, fuzzy
+#: shell/e-shortcuts-view.c:389
 msgid "Rename this shortcut"
-msgstr "Удалить эту группу закладок"
+msgstr "Переименовать эту закладку"
 
-#: shell/e-shortcuts-view.c:392
-#, fuzzy
+#: shell/e-shortcuts-view.c:391
 msgid "Re_move"
 msgstr "Удалить"
 
-#: shell/e-shortcuts-view.c:392
+#: shell/e-shortcuts-view.c:391
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Удалить эту закладку из строки закладок"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:640
 msgid "Error saving shortcuts."
 msgstr "Ошибка сохранения закладок."
 
-#: shell/e-shortcuts.c:1044
-#, fuzzy
+#: shell/e-shortcuts.c:1043
 msgid "Shortcuts"
-msgstr "Строка закладок"
+msgstr "Закладки"
 
-#: shell/e-storage-set-view.c:645
-#, fuzzy, c-format
+#: shell/e-shortcuts.c:1052
+msgid "Inbox"
+msgstr "Входящие"
+
+#: shell/e-storage-set-view.c:644
+#, c-format
 msgid ""
 "Cannot transfer folder:\n"
 "%s"
 msgstr ""
-"Невозможно удалить папку \"%s\":\n"
+"Невозможно переместить папку:\n"
 "%s"
 
-#: shell/e-storage.c:182 shell/e-storage.c:188
+#: shell/e-storage.c:181 shell/e-storage.c:187
 msgid "(No name)"
 msgstr "(Без имени)"
 
-#: shell/e-storage.c:499
+#: shell/e-storage.c:498
 msgid "No error"
 msgstr "Нет ошибки"
 
-#: shell/e-storage.c:503
+#: shell/e-storage.c:502
 msgid "A folder with the same name already exists"
 msgstr "Папка с таким названием уже существует"
 
-#: shell/e-storage.c:505
+#: shell/e-storage.c:504
 msgid "The specified folder type is not valid"
 msgstr "Указанный тип папки не допустим"
 
-#: shell/e-storage.c:507
+#: shell/e-storage.c:506
 msgid "I/O error"
 msgstr "Ошибка ввода/вывода"
 
-#: shell/e-storage.c:509
+#: shell/e-storage.c:508
 msgid "Not enough space to create the folder"
 msgstr "Недостаточно места для создания папки"
 
-#: shell/e-storage.c:511
+#: shell/e-storage.c:510
+msgid "The folder is not empty"
+msgstr "Папка не пуста"
+
+#: shell/e-storage.c:512
 msgid "The specified folder was not found"
 msgstr "Указанная папка не найдена"
 
-#: shell/e-storage.c:513
+#: shell/e-storage.c:514
 msgid "Function not implemented in this storage"
 msgstr "Функция не реализована для этого носителя"
 
-#: shell/e-storage.c:517
+#: shell/e-storage.c:518
 msgid "Operation not supported"
 msgstr "Операция не поддерживается"
 
-#: shell/e-storage.c:519
+#: shell/e-storage.c:520
 msgid "The specified type is not supported in this storage"
 msgstr "Указанный тип не поддерживается для этого носителя"
 
-#: shell/e-storage.c:521
-#, fuzzy
+#: shell/e-storage.c:522
 msgid "The specified folder cannot be modified or removed"
-msgstr "Указанная папка не найдена"
+msgstr "Указанная папка не может быть изменена или удалена"
 
-#: shell/e-storage.c:523
+#: shell/e-storage.c:524
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr ""
 
-#: shell/e-task-widget.c:192
+#: shell/e-storage.c:526
+msgid "Cannot create a folder with that name"
+msgstr "Невозможно создать папку с таким названием"
+
+#: shell/e-task-widget.c:191
 #, c-format
 msgid "%s (...)"
-msgstr ""
+msgstr "%s (...)"
 
-#: shell/e-task-widget.c:197
-#, fuzzy, c-format
+#: shell/e-task-widget.c:196
+#, c-format
 msgid "%s (%d%% complete)"
-msgstr "% Выполнения:"
+msgstr "%s (%d%% выполнено)"
+
+#: shell/evolution-shell-component.c:973
+msgid "CORBA error"
+msgstr "Ошибка CORBA"
+
+#: shell/evolution-shell-component.c:975
+msgid "Interrupted"
+msgstr "Прервано"
+
+#: shell/evolution-shell-component.c:977
+msgid "Invalid argument"
+msgstr "Недопустимый аргумент"
+
+#: shell/evolution-shell-component.c:979
+msgid "Already has an owner"
+msgstr "Уже имеет владельца"
+
+#: shell/evolution-shell-component.c:981
+msgid "No owner"
+msgstr "Нет владельца"
+
+#: shell/evolution-shell-component.c:983
+msgid "Not found"
+msgstr "Не найдено"
+
+#: shell/evolution-shell-component.c:985
+msgid "Unsupported type"
+msgstr "Неподдерживаемый тип"
+
+#: shell/evolution-shell-component.c:987
+msgid "Unsupported schema"
+msgstr "Неподдерживаемая схема"
+
+#: shell/evolution-shell-component.c:989
+msgid "Unsupported operation"
+msgstr "Неподдерживаемая операция"
+
+#: shell/evolution-shell-component.c:991
+msgid "Internal error"
+msgstr "Внутренняя ошибка"
+
+#: shell/evolution-shell-component.c:995
+msgid "Exists"
+msgstr "Существует"
+
+#: shell/evolution-shell-component.c:997
+#, fuzzy
+msgid "Invalid URI"
+msgstr "URI календаря"
+
+#: shell/evolution-shell-component.c:1001
+msgid "Has subfolders"
+msgstr "Имеет вложенные папки"
+
+#: shell/evolution-shell-component.c:1003
+msgid "No space left"
+msgstr "Нет места"
+
+#: shell/evolution-shell-component.c:1005
+msgid "Old owner has died"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Неизвестная ошибка."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
 
 #: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Active connections"
@@ -12275,22 +11958,19 @@ msgstr "Указать где создать папку:"
 
 #: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "First Run Setup Assistant"
-msgstr ""
+msgstr "Помощник по установке при первом запуске"
 
 #: shell/glade/evolution-startup-wizard.glade.h:5
-#, fuzzy
 msgid "Importing Data"
-msgstr "Импортирование"
+msgstr "Импортирование данных"
 
 #: shell/glade/evolution-startup-wizard.glade.h:8
-#, fuzzy
 msgid "Setup Assistant"
-msgstr "Помощник"
+msgstr "Помощник по установке"
 
 #: shell/glade/evolution-startup-wizard.glade.h:9
-#, fuzzy
 msgid "Timezone "
-msgstr "Часовой пояс: "
+msgstr "Часовой пояс "
 
 #: shell/glade/evolution-startup-wizard.glade.h:10
 msgid ""
@@ -12300,9 +11980,8 @@ msgid ""
 msgstr ""
 
 #: shell/glade/evolution-startup-wizard.glade.h:13
-#, fuzzy
 msgid "Your configuration is complete."
-msgstr "Настройка почты"
+msgstr "Настройка закончена."
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -12310,33 +11989,28 @@ msgstr ""
 "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
 
 #: shell/importer/import.glade.h:2
-#, fuzzy
 msgid "Evolution Import Assistant"
-msgstr "Средство импортирования Evolution"
+msgstr "Помощник по импортированию Evolution"
 
 #: shell/importer/import.glade.h:3
-#, fuzzy
 msgid "Evolution Importer Assistant"
-msgstr "Средство импортирования Evolution"
+msgstr "Помощник по импортированию Evolution"
 
 #: shell/importer/import.glade.h:4
-#, fuzzy
 msgid "Import File (step 3 of 3)"
-msgstr "Выбрать файл"
+msgstr "Импорт файла (шаг 3 из 3)"
 
 #: shell/importer/import.glade.h:5
 msgid "Importer Type (step 1 of 3)"
-msgstr ""
+msgstr "Тип импортёра (шаг 1 из 3)"
 
 #: shell/importer/import.glade.h:6
-#, fuzzy
 msgid "Select Importers (step 2 of 3)"
-msgstr "Выбрать файл"
+msgstr "Выбор импортёра (шаг 2 из 3)"
 
 #: shell/importer/import.glade.h:7
-#, fuzzy
 msgid "Select a File (step 2 of 3)"
-msgstr "Выбрать файл"
+msgstr "Выбор файла (шаг 2 из 3)"
 
 #: shell/importer/import.glade.h:8
 #, fuzzy
@@ -12350,9 +12024,8 @@ msgstr ""
 "внешних файлов в Evolution."
 
 #: shell/importer/intelligent.c:191
-#, fuzzy
 msgid "Importers"
-msgstr "Импортировать"
+msgstr "Импортёры"
 
 #: shell/importer/intelligent.c:197
 msgid "Don't import"
@@ -12367,12 +12040,12 @@ msgstr "Не спрашивать снова"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution нашла следующие источники данных:"
 
-#: shell/main.c:86
+#: shell/main.c:89
 #, fuzzy
 msgid "Evolution is now exiting ..."
 msgstr "Установки почты..."
 
-#: shell/main.c:162
+#: shell/main.c:193
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -12406,8 +12079,7 @@ msgstr ""
 "Мы надеемся, что вам понравятся результаты нашей упорной работы и мы\n"
 "рассчитываем на ваше участие!\n"
 
-#: shell/main.c:183
-#, fuzzy
+#: shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -12415,28 +12087,44 @@ msgstr ""
 "С благодарностью\n"
 "Команда Evolution\n"
 
-#: shell/main.c:236
-#, fuzzy
+#: shell/main.c:268
 msgid "Cannot access the Ximian Evolution shell."
-msgstr "Невозможно инициализировать оболочку Evolution."
+msgstr "Нет доступа к оболочке Ximian Evolution."
 
-#: shell/main.c:245
-#, fuzzy, c-format
+#: shell/main.c:277
+#, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Невозможно инициализировать оболочку Evolution: %s"
 
-#: shell/main.c:301
+#: shell/main.c:347
 msgid "Disable splash screen"
 msgstr "Отключить заставку"
 
-#: shell/main.c:302
+#: shell/main.c:348
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:344
+#: shell/main.c:390
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
+#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Ошибка при загрузке адресной книги по умолчанию."
+
+#: tools/evolution-addressbook-export.c:46
+msgid "Output File"
+msgstr "Файл вывода"
+
+#: tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Файл ввода"
+
+#: tools/evolution-addressbook-import.c:80
+msgid "No filename provided."
+msgstr "Не указаны имя файла."
+
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:5
 #: ui/evolution-tasks.xml.h:3
 msgid "Copy"
@@ -12467,7 +12155,6 @@ msgid "Delete selected contacts"
 msgstr "Удалить выбранные контакты"
 
 #: ui/evolution-addressbook.xml.h:12
-#, fuzzy
 msgid "New List"
 msgstr "Новый список"
 
@@ -12502,7 +12189,6 @@ msgid "Select all contacts"
 msgstr "Выбрать все контакты"
 
 #: ui/evolution-addressbook.xml.h:23 ui/evolution-contact-editor.xml.h:10
-#, fuzzy
 msgid "Send _Message to Contact..."
 msgstr "Послать сообщение к контакту..."
 
@@ -12532,7 +12218,7 @@ msgstr "Остановить загрузку"
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
 #: ui/evolution-contact-list-editor.xml.h:10 ui/evolution-event-editor.xml.h:9
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-message.xml.h:84 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:90 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-task-editor.xml.h:9
 msgid "_Actions"
 msgstr "Действия"
@@ -12555,7 +12241,7 @@ msgid "_Forward Contact..."
 msgstr "Контакты..."
 
 #: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:102
 #: ui/my-evolution.xml.h:7
 msgid "_Print..."
 msgstr "Печать..."
@@ -12565,7 +12251,6 @@ msgid "_Save as VCard"
 msgstr "Сохранить как VCard"
 
 #: ui/evolution-addressbook.xml.h:39
-#, fuzzy
 msgid "_Search for Contacts"
 msgstr "Поиск контактов"
 
@@ -12575,15 +12260,13 @@ msgstr "Выбрать все"
 
 #: ui/evolution-calendar.xml.h:2
 msgid "Configure the calendar's settings"
-msgstr ""
+msgstr "Настроить календарь"
 
 #: ui/evolution-calendar.xml.h:4
-#, fuzzy
 msgid "Create a New All Day _Event"
 msgstr "Создать новое ежедневное событие"
 
 #: ui/evolution-calendar.xml.h:5
-#, fuzzy
 msgid "Create a New _Task"
 msgstr "Создать новое задание"
 
@@ -12596,26 +12279,22 @@ msgid "Create an event for the whole day"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:11
-#, fuzzy
 msgid "Day"
 msgstr "День"
 
 #: ui/evolution-calendar.xml.h:12
-#, fuzzy
 msgid "Delete the appointment"
 msgstr "Удалить эту встречу"
 
-#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:38
+#: ui/evolution-calendar.xml.h:13 ui/evolution-mail-message.xml.h:39
 msgid "Go To"
 msgstr "Перейти к"
 
 #: ui/evolution-calendar.xml.h:14
-#, fuzzy
 msgid "Go back"
 msgstr "Перейти в прошлое"
 
 #: ui/evolution-calendar.xml.h:15
-#, fuzzy
 msgid "Go forward"
 msgstr "Перейти в будущее"
 
@@ -12628,12 +12307,10 @@ msgid "Go to a specific date"
 msgstr "Перейти к указанной дате"
 
 #: ui/evolution-calendar.xml.h:19
-#, fuzzy
 msgid "Go to today"
 msgstr "Перейти к сегодняшнему дню"
 
 #: ui/evolution-calendar.xml.h:20
-#, fuzzy
 msgid "Month"
 msgstr "Месяц"
 
@@ -12654,7 +12331,6 @@ msgid "Print Pre_view"
 msgstr "Просмотр печати"
 
 #: ui/evolution-calendar.xml.h:26
-#, fuzzy
 msgid "Print this calendar"
 msgstr "Напечатать этот календарь"
 
@@ -12663,17 +12339,14 @@ msgid "Publish Free/Busy information for this calendar"
 msgstr ""
 
 #: ui/evolution-calendar.xml.h:28
-#, fuzzy
 msgid "Show one day"
 msgstr "Показать 1 день"
 
 #: ui/evolution-calendar.xml.h:29
-#, fuzzy
 msgid "Show one month"
 msgstr "Показать 1 месяц"
 
 #: ui/evolution-calendar.xml.h:30
-#, fuzzy
 msgid "Show one week"
 msgstr "Показать 1 неделю"
 
@@ -12682,7 +12355,6 @@ msgid "Show the working week"
 msgstr "Показать рабочую неделю"
 
 #: ui/evolution-calendar.xml.h:32
-#, fuzzy
 msgid "Week"
 msgstr "Неделя"
 
@@ -12700,9 +12372,8 @@ msgid "_Publish Free/Busy Information"
 msgstr "Необходимая информация"
 
 #: ui/evolution-calendar.xml.h:43
-#, fuzzy
 msgid "_Task..."
-msgstr "Задание"
+msgstr "Задание..."
 
 #: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
@@ -12713,9 +12384,8 @@ msgid "Close"
 msgstr "Закрыть"
 
 #: ui/evolution-comp-editor.xml.h:3
-#, fuzzy
 msgid "Close this item"
-msgstr "Удалить этот элемент"
+msgstr "Закрыть этот элемент"
 
 #: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
@@ -12740,7 +12410,7 @@ msgstr "Печать..."
 
 #: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:19
-#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
+#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:237
 msgid "Save"
 msgstr "Сохранить"
 
@@ -12749,14 +12419,12 @@ msgid "Save and Close"
 msgstr "Сохранить и закрыть"
 
 #: ui/evolution-comp-editor.xml.h:15
-#, fuzzy
 msgid "Save the item and close the dialog box"
-msgstr "Сохранить этот список и закрыть окно диалога"
+msgstr "Сохранить этот элемент и закрыть окно диалога"
 
 #: ui/evolution-comp-editor.xml.h:16
-#, fuzzy
 msgid "Save this item to disk"
-msgstr "Изменить вид на %s"
+msgstr "Сохранить этот элемент на диске"
 
 #: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
 #: ui/evolution-contact-list-editor.xml.h:11
@@ -12911,7 +12579,7 @@ msgstr "Отправить почту из очереди и получить новую почту"
 
 #: ui/evolution-mail-global.xml.h:15
 msgid "Show message preview window"
-msgstr ""
+msgstr "Показать окно просмотра сообщения"
 
 #: ui/evolution-mail-global.xml.h:16
 msgid "Subscribe or unsubscribe to folders on remote servers"
@@ -12978,7 +12646,7 @@ msgstr "Скрыть прочитанные сообщения"
 #: ui/evolution-mail-list.xml.h:8
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr ""
+msgstr "Скрывать удалённые сообщения вместо перечёркивания"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as R_ead"
@@ -12993,9 +12661,8 @@ msgid "Paste message in the clipboard"
 msgstr "Вставить сообщение в буфер обмена"
 
 #: ui/evolution-mail-list.xml.h:12
-#, fuzzy
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Переместить выбранные сообщения в другую папку"
+msgstr "Окончательно удалить все удалённые сообщения из этой папки"
 
 #: ui/evolution-mail-list.xml.h:13 ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
@@ -13102,306 +12769,326 @@ msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:12
-#, fuzzy
 msgid "Create a virtual folder for these recipients"
-msgstr "Создать вирт.папку из сообщения"
+msgstr "Создать вирт.папку по этим получателям"
 
 #: ui/evolution-mail-message.xml.h:13
-#, fuzzy
 msgid "Create a virtual folder for this mailing list"
-msgstr "Создать вирт.папку из сообщения"
+msgstr "Создать вирт.папку для этого списка рассылки"
 
 #: ui/evolution-mail-message.xml.h:14
-#, fuzzy
 msgid "Create a virtual folder for this sender"
-msgstr "Создать вирт.папку из сообщения"
+msgstr "Создать вирт.папку для этого отправителя"
 
 #: ui/evolution-mail-message.xml.h:15
-#, fuzzy
 msgid "Create a virtual folder for this subject"
-msgstr "Создать вирт.папку из сообщения"
+msgstr "Создать вирт.папку для этой темы"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:16
+msgid "Decrease the text size"
+msgstr "Уменьшить размер текста"
+
+#: ui/evolution-mail-message.xml.h:18
 msgid "Display the next important message"
 msgstr "Показать следующее важное сообщение"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:19
 msgid "Display the next message"
 msgstr "Показать следующее сообщение"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:20
 msgid "Display the next unread message"
 msgstr "Показать следующее непрочитанное сообщение"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next unread thread"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the previous important message"
 msgstr "Показать предыдущее важное сообщение"
 
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the previous message"
 msgstr "Показать предыдущее сообщение"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the previous unread message"
 msgstr "Показать предыдущее непрочитанное сообщение"
 
-#: ui/evolution-mail-message.xml.h:24
+#: ui/evolution-mail-message.xml.h:25
 msgid "Filter on Mailing _List..."
 msgstr "Фильтр по списку рассылки..."
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:26
 msgid "Filter on Se_nder..."
 msgstr "Фильтр по отправителю..."
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:27
 msgid "Filter on _Recipients..."
 msgstr "Фильтр по получателю..."
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:28
 msgid "Filter on _Subject..."
 msgstr "Фильтр по теме..."
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:29
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:30
 msgid "Forward"
 msgstr "Переслать"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:31
 msgid "Forward As"
 msgstr "Переслать как"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:32
 msgid "Forward _Attached"
 msgstr "Переслать вложенное"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:33
 msgid "Forward _Inline"
 msgstr "Переслать встроенное"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:34
 msgid "Forward _Quoted"
 msgstr "Переслать процитированное"
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:35
 msgid "Forward the selected message in the body of a new message"
 msgstr "Переслать выбранное сообщение в теле нового сообщения"
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:36
 msgid "Forward the selected message quoted like a reply"
 msgstr "Переслать выбранное сообщение процитированное как при ответе"
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:37
 #, fuzzy
 msgid "Forward the selected message to someone"
 msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:38
 #, fuzzy
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Переслать выбранную почту кому-то"
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:40
+#, fuzzy
+msgid "Increase the text size"
+msgstr "Вставить текстовый файл..."
+
+#: ui/evolution-mail-message.xml.h:41
 msgid "Load _Images"
 msgstr "Загрузить изображения"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:43
 msgid "Mark as I_mportant"
 msgstr "Пометить как важное"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as Unimp_ortant"
 msgstr "Пометить как неважное"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark the selected messages as having been read"
 msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected messages as important"
 msgstr "Пометить выбранные сообщения как важные"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected messages as not having been read"
 msgstr "Пометить выбранные сообщения как ещё не прочитанные"
 
-#: ui/evolution-mail-message.xml.h:47
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected messages as unimportant"
 msgstr "Пометить выбранные сообщения как неважные"
 
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages for deletion"
 msgstr "Пометить выбранные сообщения для удаления"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:51
 msgid "Move"
 msgstr "Переместить"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move selected messages to another folder"
 msgstr "Переместить выбранные сообщения в другую папку"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:53
 msgid "Next"
 msgstr "След."
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next Important Message"
 msgstr "Следующее важное сообщение"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:55
 msgid "Next Message"
 msgstr "Следующее сообщение"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:56
 msgid "Next Thread"
 msgstr "Следующая подшивка"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:57
 msgid "Next Unread Message"
 msgstr "Следующее непрочитанное сообщение"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Отправить выбранное сообщение в новом окне"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:59
 #, fuzzy
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Пометить выбранные сообщения как уже прочитанные"
 
-#: ui/evolution-mail-message.xml.h:58
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:60
+msgid "Original Si_ze"
+msgstr "Исходный размер"
+
+#: ui/evolution-mail-message.xml.h:61
 msgid "Preview the message to be printed"
 msgstr "Просмотр печатаемых сообщений"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:62
 msgid "Previous"
 msgstr "Пред."
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:63
 msgid "Previous Important Message"
 msgstr "Предыдущее важное сообщение"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:64
 msgid "Previous Message"
 msgstr "Предыдущее сообщение"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:65
 msgid "Previous Unread Message"
 msgstr "Предыдущее непрочитанное сообщение"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:68
 msgid "Print this message"
 msgstr "Печать этого сообщения"
 
-#: ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-message.xml.h:69
 msgid "Reply"
 msgstr "Ответить"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:70
 msgid "Reply to All"
 msgstr "Ответить всем"
 
-#: ui/evolution-mail-message.xml.h:70
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:73
+msgid "Reset the text to its original size"
+msgstr "Сбросить размер текста в исходный"
+
+#: ui/evolution-mail-message.xml.h:74
 msgid "S_earch Message..."
-msgstr "Поиск сообщения"
+msgstr "Поиск сообщения..."
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:75
+msgid "S_maller"
+msgstr "Меньше"
+
+#: ui/evolution-mail-message.xml.h:76
 msgid "Save the message as a text file"
 msgstr "Сохранить сообщение в текстовом файле"
 
-#: ui/evolution-mail-message.xml.h:72
+#: ui/evolution-mail-message.xml.h:77
 msgid "Search for text in the body of the displayed message"
 msgstr "Поиск в тексте отображаемого сообщения"
 
-#: ui/evolution-mail-message.xml.h:73
+#: ui/evolution-mail-message.xml.h:78
 msgid "Setup the page settings for your current printer"
 msgstr "Настройки страницы для вашего текущего принтера"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:79
 msgid "Show Email _Source"
-msgstr ""
+msgstr "Показать источник эл.почты"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:80
 msgid "Show Full _Headers"
 msgstr "Показать полные заголовки"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:81
 msgid "Show message in the normal style"
 msgstr "Показать сообщение в обычном стиле"
 
-#: ui/evolution-mail-message.xml.h:77
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show message with all email headers"
 msgstr "Показать сообщение со всеми заголовками"
 
-#: ui/evolution-mail-message.xml.h:78
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show the raw email source of the message"
-msgstr "Присоединить файл к сообщению"
+msgstr "Показать полный исходный текст сообщения"
 
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-mail-message.xml.h:84
+msgid "Text Si_ze"
+msgstr "Размер текста"
+
+#: ui/evolution-mail-message.xml.h:85
 msgid "Un-delete the selected messages"
 msgstr "Вернуть удалённые выделенные сообщения"
 
-#: ui/evolution-mail-message.xml.h:80
+#: ui/evolution-mail-message.xml.h:86
 msgid "VFolder on Mailing _List..."
 msgstr "Вирт.папка по списку рассылки..."
 
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:87
 msgid "VFolder on Se_nder..."
 msgstr "Вирт.папка по отправителю..."
 
-#: ui/evolution-mail-message.xml.h:82
+#: ui/evolution-mail-message.xml.h:88
 msgid "VFolder on _Recipients..."
 msgstr "Вирт.папка по получателям..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on _Subject..."
 msgstr "Вирт.папка по теме..."
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:91
 msgid "_Apply Filters"
 msgstr "Применить фильтры"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:92
 msgid "_Copy to Folder"
 msgstr "Скопировать в папку"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:93
 msgid "_Create Filter From Message"
 msgstr "Создать фильтр из сообщения"
 
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Forward Message"
 msgstr "Переслать сообщение"
 
-#: ui/evolution-mail-message.xml.h:91
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:97
+msgid "_Larger"
+msgstr "Больше"
+
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Message Display"
-msgstr "Сообщения"
+msgstr "Отображение сообщения"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:99
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: ui/evolution-mail-message.xml.h:93
-#, fuzzy
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Normal Display"
-msgstr "Отобразить"
+msgstr "Нормальное отображение"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Open Message"
 msgstr "Открыть сообщение"
 
-#: ui/evolution-mail-message.xml.h:98 ui/evolution.xml.h:49
+#: ui/evolution-mail-message.xml.h:105 ui/evolution.xml.h:49
 #: ui/my-evolution.xml.h:9
 msgid "_Tools"
 msgstr "Инструменты"
@@ -13447,7 +13134,7 @@ msgid "F_ormat"
 msgstr "Формат"
 
 #: ui/evolution-message-composer.xml.h:9
-msgid "HTML"
+msgid "H_TML"
 msgstr "HTML"
 
 #: ui/evolution-message-composer.xml.h:10
@@ -13744,7 +13431,7 @@ msgstr "Выйти из программы"
 
 #: ui/evolution.xml.h:15
 msgid "Import data from other programs"
-msgstr ""
+msgstr "Импортировать данные из других программ"
 
 #: ui/evolution.xml.h:17
 msgid "Move this folder to another place"
@@ -13851,33 +13538,25 @@ msgstr "Закладка"
 msgid "_Shortcut Bar"
 msgstr "Строка закладок"
 
-#: ui/evolution.xml.h:51
-msgid "_Work Offline"
-msgstr "Работать вне сети"
-
 #: ui/my-evolution.xml.h:1
-#, fuzzy
 msgid "Change the settings for the summary"
-msgstr "Изменить свойства этой папки"
+msgstr "Изменить установки итога"
 
 #: ui/my-evolution.xml.h:4
-#, fuzzy
 msgid "Print summary"
-msgstr "Итог почты"
+msgstr "Печать итога"
 
 #: ui/my-evolution.xml.h:5
-#, fuzzy
 msgid "Reload"
-msgstr "Прочитанное"
+msgstr "Перезагрузить"
 
 #: ui/my-evolution.xml.h:6
 msgid "Reload the view"
 msgstr ""
 
 #: ui/my-evolution.xml.h:8
-#, fuzzy
 msgid "_Summary Settings..."
-msgstr "Установки почты..."
+msgstr "Установки итога..."
 
 #: views/addressbook/galview.xml.h:1
 msgid "Address Cards"
@@ -13930,11 +13609,11 @@ msgid ""
 " Use the right mouse button to zoom out."
 msgstr ""
 
-#: widgets/menus/gal-view-menus.c:218
+#: widgets/menus/gal-view-menus.c:195
 msgid "_Current View"
 msgstr "Текущий просмотр"
 
-#: widgets/menus/gal-view-menus.c:260
+#: widgets/menus/gal-view-menus.c:222
 msgid "Define Views"
 msgstr "Определить окна просмотра"
 
@@ -13949,19 +13628,23 @@ msgstr "ПВСЧПСВ"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:224 widgets/misc/e-dateedit.c:439
+#: widgets/misc/e-cell-date-edit.c:225 widgets/misc/e-dateedit.c:439
 msgid "Now"
 msgstr "Сейчас"
 
-#: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:445
+#: widgets/misc/e-cell-date-edit.c:233 widgets/misc/e-dateedit.c:445
 msgid "Today"
 msgstr "Сегодня"
 
-#: widgets/misc/e-cell-date-edit.c:738
+#: widgets/misc/e-cell-date-edit.c:742
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Время должно быть в формате: %s"
 
+#: widgets/misc/e-cell-percent.c:78
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Значение процента должно быть между 0 и 100, включительно"
+
 #: widgets/misc/e-charset-picker.c:59
 msgid "Baltic"
 msgstr "Балтийский"
@@ -14039,24 +13722,24 @@ msgstr "Кодировка символов"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:158
+#: widgets/misc/e-filter-bar.c:150
 msgid "Search Editor"
 msgstr "Редактор поиска"
 
-#: widgets/misc/e-filter-bar.c:174
+#: widgets/misc/e-filter-bar.c:166
 msgid "Save Search"
 msgstr "Сохранить результаты поиска"
 
-#: widgets/misc/e-filter-bar.h:94
+#: widgets/misc/e-filter-bar.h:95
 #, fuzzy
 msgid "Add to Saved Searches"
 msgstr "Сохранить результаты поиска"
 
-#: widgets/misc/e-filter-bar.h:95
+#: widgets/misc/e-filter-bar.h:96
 msgid "Clear"
 msgstr "Очистить"
 
-#: widgets/misc/e-filter-bar.h:102
+#: widgets/misc/e-filter-bar.h:103
 msgid "Show All"
 msgstr "Показать все"
 
@@ -14081,11 +13764,11 @@ msgstr "Сообщение"
 msgid "Don't show this message again."
 msgstr "Не показывать это сообщение снова."
 
-#: widgets/misc/e-search-bar.c:334
+#: widgets/misc/e-search-bar.c:335
 msgid "Sear_ch"
 msgstr "Поиск"
 
-#: widgets/misc/e-search-bar.c:460
+#: widgets/misc/e-search-bar.c:461
 msgid "Find Now"
 msgstr "Найти"
 
@@ -14099,18 +13782,346 @@ msgstr "Сервер персональных адресных книг"
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Персональный календарный сервер; фабрика календаря"
 
-#: wombat/wombat.c:176
+#: wombat/wombat.c:193
 msgid "setup_vfs(): could not initialize GNOME-VFS"
 msgstr "setup_vfs(): Не удалось инициализировать GNOME-VFS"
 
-#: wombat/wombat.c:188
+#: wombat/wombat.c:205
 msgid "init_corba(): could not initialize GNOME"
 msgstr "init_corba(): Не удалось инициализировать GNOME"
 
-#: wombat/wombat.c:201
+#: wombat/wombat.c:218
 msgid "init_bonobo(): could not initialize Bonobo"
 msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 
+#~ msgid "Other Contacts"
+#~ msgstr "Другие контакты"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Вы уверены, в том что хотите\n"
+#~ "удалить этот контакт?"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s and ending on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment starting on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment ending on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your appointment"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s and ending on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task starting on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task ending on %s"
+#~ msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "Notification about your task"
+#~ msgstr "Показать информацию о программе Evolution"
+
+#~ msgid "Alarm on %A %b %d %Y %H:%M"
+#~ msgstr "Таймер на %A %b %d %Y %H:%M"
+
+#, fuzzy
+#~ msgid "%s at an unknown time"
+#~ msgstr "Неизвестная ошибка"
+
+#, fuzzy
+#~ msgid "Attendee"
+#~ msgstr "Все сопровождение"
+
+#, fuzzy
+#~ msgid "Click here to add an attendee"
+#~ msgstr "* Щелкните здесь для добавления контакта *"
+
+#, fuzzy
+#~ msgid "Common Name"
+#~ msgstr "Название счёта"
+
+#, fuzzy
+#~ msgid "Delegated From"
+#~ msgstr "Удаленное"
+
+#, fuzzy
+#~ msgid "Delegated To"
+#~ msgstr "Удаленное"
+
+#~ msgid "Language"
+#~ msgstr "Язык"
+
+#~ msgid "Member"
+#~ msgstr "Член"
+
+#~ msgid "Role"
+#~ msgstr "Роль"
+
+#~ msgid "_Confidential"
+#~ msgstr "Конфиденциальное"
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#, fuzzy
+#~ msgid "Completion Date"
+#~ msgstr "Выполнено"
+
+#, fuzzy
+#~ msgid "Due Date"
+#~ msgstr "Условленная дата:"
+
+#, fuzzy
+#~ msgid "End Date"
+#~ msgstr "Дата"
+
+#~ msgid "Priority"
+#~ msgstr "Приоритет"
+
+#~ msgid "Start Date"
+#~ msgstr "Дата начала"
+
+#, fuzzy
+#~ msgid "Task sort"
+#~ msgstr "Список заданий"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "Free/Busy info begins: <b>"
+#~ msgstr "Необходимая информация"
+
+#~ msgid "<b>Description:</b> %s"
+#~ msgstr "<b>Описание:</b> %s"
+
+#~ msgid "Meeting Information"
+#~ msgstr "Информация о встрече"
+
+#, fuzzy
+#~ msgid "Meeting Proposal"
+#~ msgstr "Совещание"
+
+#, fuzzy
+#~ msgid "Meeting Update"
+#~ msgstr "Время завершения собрания:"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a meeting request."
+#~ msgstr "Это запрос совещания."
+
+#, fuzzy
+#~ msgid "Meeting Reply"
+#~ msgstr "Совещание"
+
+#, fuzzy
+#~ msgid "Meeting Cancellation"
+#~ msgstr "Выбрать действие"
+
+#, fuzzy
+#~ msgid "Bad Meeting Message"
+#~ msgstr "Поиск в сообщении"
+
+#, fuzzy
+#~ msgid "Task Information"
+#~ msgstr "Информация"
+
+#, fuzzy
+#~ msgid "Task Update"
+#~ msgstr "было после"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a task assignment."
+#~ msgstr "Это запрос совещания."
+
+#, fuzzy
+#~ msgid "Task Reply"
+#~ msgstr "Ответить"
+
+#, fuzzy
+#~ msgid "Task Cancellation"
+#~ msgstr "Отменить операцию"
+
+#, fuzzy
+#~ msgid "Bad Task Message"
+#~ msgstr "Сообщение календаря"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has published free/busy information."
+#~ msgstr "Необходимая информация"
+
+#, fuzzy
+#~ msgid "Free/Busy Information"
+#~ msgstr "Необходимая информация"
+
+#, fuzzy
+#~ msgid "<b>%s</b> has replied to a free/busy request."
+#~ msgstr "Это запрос совещания."
+
+#, fuzzy
+#~ msgid "Bad Free/Busy Message"
+#~ msgstr "Предыдущее сообщение"
+
+#, fuzzy
+#~ msgid "The message does not appear to be properly formed"
+#~ msgstr "Видимо папка невостановимо испорчена."
+
+#~ msgid "Qmail maildir-format mail files"
+#~ msgstr "Почтовые файлы в формате почтовых каталогов qmail"
+
+#, fuzzy
+#~ msgid "Summarising folder"
+#~ msgstr "Суммаризация папки"
+
+#, fuzzy
+#~ msgid "Could not open folder: %s: summarising from position %ld: %s"
+#~ msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
+
+#~ msgid "Cannot summarise folder: %s: %s"
+#~ msgstr "Не удалось суммировать папку: %s: %s"
+
+#~ msgid "Could not create composer window."
+#~ msgstr "Невозможно создать окно редактора."
+
+#, fuzzy
+#~ msgid "Account %d"
+#~ msgstr "Счет"
+
+#, fuzzy
+#~ msgid "%s: Inbox"
+#~ msgstr "Входящие"
+
+#~ msgid "No GPG/PGP program configured."
+#~ msgstr "Программа GPG/PGP не настроена."
+
+#~ msgid "Encrypted message not displayed"
+#~ msgstr "Зашифрованное сообщение не отображается"
+
+#~ msgid "Encrypted message"
+#~ msgstr "Зашифрованное сообщение"
+
+#~ msgid "Click icon to decrypt."
+#~ msgstr "Щелкните на пиктограмме для дешифрации."
+
+#~ msgid "This message is digitally signed and has been found to be authentic."
+#~ msgstr ""
+#~ "Это сообщение с цифровой подписью, которая прошла проверку идентичности."
+
+#~ msgid ""
+#~ "This message is digitally signed but can not be proven to be authentic."
+#~ msgstr ""
+#~ "Это сообщение с цифровой подписью, которая не может быть проверена на "
+#~ "идентичность."
+
+#~ msgid "Trash"
+#~ msgstr "Мусорная корзина"
+
+#~ msgid "VFolders"
+#~ msgstr "Вирт.папки"
+
+#, fuzzy
+#~ msgid "Received"
+#~ msgstr "Дата получения"
+
+#, fuzzy
+#~ msgid "Size"
+#~ msgstr "Размер:"
+
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr ""
+#~ "Невозможно инициализировать компонент Executive Summary программы "
+#~ "Evolution."
+
+#, fuzzy
+#~ msgid "M_etric"
+#~ msgstr "Мексика"
+
+#~ msgid "Units: "
+#~ msgstr "Единицы:  "
+
+#, fuzzy
+#~ msgid "_Imperial"
+#~ msgstr "Апрель"
+
+#, fuzzy
+#~ msgid "Outbox"
+#~ msgstr "mbox"
+
+#, fuzzy
+#~ msgid "Local Folders"
+#~ msgstr "Специальные папки"
+
+#, fuzzy
+#~ msgid "Folder cannot contain the directory separator."
+#~ msgstr "Невозможно открыть каталог кэш: %s"
+
+#, fuzzy
+#~ msgid "Ximian Evolution"
+#~ msgstr "Evolution"
+
+#, fuzzy
+#~ msgid ""
+#~ "Ximian Evolution is a suite of groupware applications\n"
+#~ "for mail, calendaring, and contact management\n"
+#~ "within the GNOME desktop environment."
+#~ msgstr ""
+#~ "\"Эволюция\" это набор приложений электронной почты,\n"
+#~ "ведения календарей и контактной информации для\n"
+#~ "групповой работы в среде GNOME."
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s"
+#~ msgstr "%s - Evolution %s"
+
+#, fuzzy
+#~ msgid "%s - Ximian Evolution %s [%s]"
+#~ msgstr "%s - Evolution %s [%s]"
+
 #~ msgid "Please enter your email address and password for access to %s"
 #~ msgstr "Пожалуйста введите ваш эл.адрес и парольную фразу для доступа к %s"
 
@@ -14347,9 +14358,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "Pine mail"
 #~ msgstr "Почта Pine"
 
-#~ msgid "Factory for the Evolution mail component."
-#~ msgstr "Фабрика для почтового компонента Evolution."
-
 #~ msgid "Forwarded message:\n"
 #~ msgstr "Пересланное сообщение:\n"
 
@@ -14393,15 +14401,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "RDF Summary"
 #~ msgstr "Итог:"
 
-#~ msgid "label18"
-#~ msgstr "метка26"
-
-#~ msgid "label19"
-#~ msgstr "метка26"
-
-#~ msgid "label20"
-#~ msgstr "метка26"
-
 #~ msgid "Category contains"
 #~ msgstr "Категория содержит"
 
@@ -14414,24 +14413,15 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "Canceled"
 #~ msgstr "Отменено"
 
-#~ msgid "label26"
-#~ msgstr "метка26"
-
 #~ msgid "All"
 #~ msgstr "Все"
 
 #~ msgid "Unfiled"
 #~ msgstr "Незаполненное"
 
-#~ msgid "label55"
-#~ msgstr "метка26"
-
 #~ msgid "Calendar Preferences"
 #~ msgstr "Настройки календаря"
 
-#~ msgid "label21"
-#~ msgstr "метка26"
-
 #~ msgid "This is an event that can be added to your calendar."
 #~ msgstr "Это событие можно занести в ваш календарь."
 
@@ -14469,15 +14459,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 #~ msgid "Printing of My Evolution failed"
 #~ msgstr "Сбой печати сообщения"
 
-#~ msgid "label27"
-#~ msgstr "метка26"
-
-#~ msgid "label39"
-#~ msgstr "метка26"
-
-#~ msgid "label40"
-#~ msgstr "метка26"
-
 #, fuzzy
 #~ msgid "My Evolution"
 #~ msgstr "Evolution"
@@ -14539,6 +14520,3 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
 
 #~ msgid "Using the _Mailer"
 #~ msgstr "Использование почты"
-
-#~ msgid "_Index"
-#~ msgstr "Индекс"
author	Valek Frob <frob@src.gnome.org>	2001-10-27 21:03:55 +0800
committer	Valek Frob <frob@src.gnome.org>	2001-10-27 21:03:55 +0800
commit	ee72dd5eb5817ad069517cb74790722ec7be0196 (patch)
tree	5526e047ed6a66f87f93d535236cd7f0c58d8b0a /po
parent	cf59ac9504656b8b53acad2868a8dc20d59df50e (diff)
download	gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.gz gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.bz2 gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.lz gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.xz gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.tar.zst gsoc2013-evolution-ee72dd5eb5817ad069517cb74790722ec7be0196.zip