[evolution/gnome-2-28] Updated Russian translation



commit 1d5b5f5a33d4cdaad9b823ab4b91b79a03ca2092
Author: Leonid Kanter <leon asplinux ru>
Date:   Tue Oct 6 19:39:33 2009 +0300

    Updated Russian translation

 po/ru.po |10497 ++++++++++++++++++++++++++++----------------------------------
 1 files changed, 4711 insertions(+), 5786 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index 3f77d35..90ba3ad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,43 +1,44 @@
+# translation of ru.po to Russian
 # translation of evolution to Russian
-# Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2000,2002,2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #
+#: ../shell/main.c:631
 # Valek Filippov <frob df ru>, 2000.
 # Dmitry Mastrukov  <dmitry taurussoft org>, 2001-2003.
-# Leonid Kanter <leon asplinux ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008.
+# Leonid Kanter <leon asplinux ru>, 2001-2003, 2004, 2005, 2006, 2007, 2008, 2009.
 # Michael Yakhontov <mvy asplinux ru>, 2003, 2005.
 # Anatol Kamynin <anatol tiflocomp ru>, 2008.
-#: ../shell/main.c:603
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution trunk\n"
+"Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-15 18:27+0300\n"
-"PO-Revision-Date: 2009-03-15 15:56+0300\n"
-"Last-Translator: Yuriy Penkin <yuriy penkin gmail com>\n"
-"Language-Team: Russian <gnome-cyr gnome org>\n"
+"POT-Creation-Date: 2009-10-06 13:52+0300\n"
+"PO-Revision-Date: 2009-10-06 19:36+0300\n"
+"Last-Translator: Leonid Kanter <leon asplinux ru>\n"
+"Language-Team: Russian <ru li org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
+#: ../a11y/addressbook/ea-minicard-view.c:178
 msgid "evolution address book"
 msgstr "адÑ?еÑ?наÑ? книга evolution"
 
 #: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:237
+#: ../addressbook/gui/component/addressbook-component.c:208
 msgid "New Contact"
 msgstr "СоздаÑ?Ñ? конÑ?акÑ?"
 
 #: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:245
+#: ../addressbook/gui/component/addressbook-component.c:216
 msgid "New Contact List"
 msgstr "СоздаÑ?Ñ? Ñ?пиÑ?ок конÑ?акÑ?ов"
 
-#: ../a11y/addressbook/ea-minicard-view.c:162
+#: ../a11y/addressbook/ea-minicard-view.c:161
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -61,32 +62,32 @@ msgstr "Ð?онÑ?акÑ?: "
 msgid "evolution minicard"
 msgstr "миникаÑ?Ñ?оÑ?ка evolution"
 
-#: ../a11y/calendar/ea-cal-view-event.c:265
+#: ../a11y/calendar/ea-cal-view-event.c:263
 msgid "It has alarms."
 msgstr "Ð?мееÑ? Ñ?игналÑ?."
 
-#: ../a11y/calendar/ea-cal-view-event.c:268
+#: ../a11y/calendar/ea-cal-view-event.c:266
 msgid "It has recurrences."
 msgstr "Ð?мееÑ? повÑ?оÑ?ениÑ?."
 
-#: ../a11y/calendar/ea-cal-view-event.c:271
+#: ../a11y/calendar/ea-cal-view-event.c:269
 msgid "It is a meeting."
 msgstr "ЭÑ?о Ñ?обÑ?ание."
 
-#: ../a11y/calendar/ea-cal-view-event.c:277
+#: ../a11y/calendar/ea-cal-view-event.c:275
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "СобÑ?Ñ?ие календаÑ?Ñ?: Сводка: %s."
 
-#: ../a11y/calendar/ea-cal-view-event.c:279
+#: ../a11y/calendar/ea-cal-view-event.c:277
 msgid "Calendar Event: It has no summary."
 msgstr "СобÑ?Ñ?ие календаÑ?Ñ?: Ð?е имееÑ? Ñ?водки."
 
-#: ../a11y/calendar/ea-cal-view-event.c:299
+#: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "Ñ?обÑ?Ñ?ие обзоÑ?а календаÑ?Ñ?"
 
-#: ../a11y/calendar/ea-cal-view-event.c:527
+#: ../a11y/calendar/ea-cal-view-event.c:525
 msgid "Grab Focus"
 msgstr "Ð?еÑ?еÑ?ваÑ?Ñ?ваÑ?Ñ? Ñ?окÑ?Ñ?"
 
@@ -110,8 +111,8 @@ msgstr "Ð?еÑ?ейÑ?и к Ñ?егоднÑ?Ñ?немÑ? днÑ?"
 msgid "Go to Date"
 msgstr "Ð?еÑ?ейÑ?и к даÑ?е"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
+#: ../a11y/calendar/ea-day-view-main-item.c:300
+#: ../a11y/calendar/ea-week-view-main-item.c:297
 msgid "a table to view and select the current time range"
 msgstr "Ñ?аблиÑ?а длÑ? пÑ?оÑ?моÑ?Ñ?а и вÑ?боÑ?а Ñ?екÑ?Ñ?его диапазона вÑ?емени"
 
@@ -156,7 +157,7 @@ msgid "calendar view for one or more days"
 msgstr "окно календаÑ?Ñ? длÑ? пÑ?оÑ?моÑ?Ñ?а одного или более дней"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:821
+#: ../calendar/gui/calendar-component.c:771
 msgid "%A %d %b %Y"
 msgstr "%A, %d %b %Y"
 
@@ -167,18 +168,18 @@ msgstr "%A, %d %b %Y"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:189
-#: ../calendar/gui/calendar-component.c:824
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1599
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/calendar-component.c:774
+#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-week-view-main-item.c:368
 msgid "%a %d %b"
 msgstr "%a, %d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:191
 #: ../a11y/calendar/ea-gnome-calendar.c:196
 #: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:826
-#: ../calendar/gui/calendar-component.c:831
-#: ../calendar/gui/calendar-component.c:833
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/calendar-component.c:781
+#: ../calendar/gui/calendar-component.c:783
 msgid "%a %d %b %Y"
 msgstr "%a, %d %b %Y"
 
@@ -186,10 +187,10 @@ msgstr "%a, %d %b %Y"
 #: ../a11y/calendar/ea-gnome-calendar.c:221
 #: ../a11y/calendar/ea-gnome-calendar.c:227
 #: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:845
-#: ../calendar/gui/calendar-component.c:852
-#: ../calendar/gui/calendar-component.c:858
-#: ../calendar/gui/calendar-component.c:860
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/calendar-component.c:802
+#: ../calendar/gui/calendar-component.c:808
+#: ../calendar/gui/calendar-component.c:810
 msgid "%d %b %Y"
 msgstr "%d %b %Y"
 
@@ -199,15 +200,15 @@ msgstr "%d %b %Y"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:219
-#: ../calendar/gui/calendar-component.c:850
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1615
-#: ../calendar/gui/e-week-view-main-item.c:349
+#: ../calendar/gui/calendar-component.c:800
+#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-week-view-main-item.c:382
 msgid "%d %b"
 msgstr "%d %b"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:245
 #: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/importers/icalendar-importer.c:782
 msgid "Gnome Calendar"
 msgstr "Ð?алендаÑ?Ñ? Gnome"
 
@@ -219,11 +220,11 @@ msgstr "панелÑ? поиÑ?ка"
 msgid "evolution calendar search bar"
 msgstr "панелÑ? поиÑ?ка календаÑ?Ñ? evolution"
 
-#: ../a11y/calendar/ea-jump-button.c:147
+#: ../a11y/calendar/ea-jump-button.c:146
 msgid "Jump button"
 msgstr "Ð?нопка пеÑ?еÑ?ода"
 
-#: ../a11y/calendar/ea-jump-button.c:156
+#: ../a11y/calendar/ea-jump-button.c:155
 msgid "Click here, you can find more events."
 msgstr "Ð?ажмиÑ?е здеÑ?Ñ?, вÑ? можеÑ?е найÑ?и болÑ?Ñ?е Ñ?обÑ?Ñ?ий."
 
@@ -254,20 +255,20 @@ msgstr "конÑ?екÑ?Ñ?ное окно"
 msgid "popup a child"
 msgstr "Ñ?оздаÑ?Ñ? конÑ?екÑ?Ñ?ное окно"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:616
 msgid "edit"
 msgstr "пÑ?авка"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:617
 msgid "begin editing this cell"
 msgstr "наÑ?аÑ?Ñ? Ñ?едакÑ?иÑ?ование Ñ?Ñ?ой Ñ?Ñ?ейки"
 
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:169
 msgid "toggle"
 msgstr "пеÑ?еклÑ?Ñ?иÑ?Ñ?"
 
 #. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
+#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:170
 msgid "toggle the cell"
 msgstr "пеÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?Ñ?ейкÑ?"
 
@@ -287,17 +288,17 @@ msgstr "Ñ?веÑ?нÑ?Ñ?Ñ?"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Ñ?воÑ?аÑ?иваеÑ? Ñ?Ñ?Ñ?окÑ? в ETree, Ñ?одеÑ?жаÑ?Ñ?Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?ейкÑ?"
 
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
+#: ../a11y/e-table/gal-a11y-e-cell.c:120
 msgid "Table Cell"
 msgstr "ЯÑ?ейка Ñ?аблиÑ?Ñ?"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:58
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/e-table-click-to-add.c:578
 msgid "click to add"
 msgstr "нажмиÑ?е, Ñ?Ñ?обÑ? добавиÑ?Ñ?"
 
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
+#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:67
 msgid "click"
 msgstr "нажмиÑ?е"
 
@@ -331,14 +332,6 @@ msgstr "Ð?кÑ?ивиÑ?оваÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? по Ñ?молÑ?аниÑ?"
 msgid "Popup Menu"
 msgstr "Ð?Ñ?падаÑ?Ñ?ее менÑ?"
 
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? панелÑ? вложений"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "акÑ?ивиÑ?оваÑ?Ñ?"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -392,9 +385,9 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?."
 
 #: ../addressbook/addressbook.error.xml.h:11
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "Ð? наÑ?Ñ?оÑ?Ñ?ее вÑ?емÑ? вÑ? можеÑ?е полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п Ñ?олÑ?ко к Ñ?иÑ?Ñ?емной адÑ?еÑ?ной "
 "книге GroupWise из Evolution. Ð?ожалÑ?йÑ?Ñ?а, иÑ?полÑ?зÑ?йÑ?е какой-нибÑ?дÑ? дÑ?Ñ?гой "
@@ -419,7 +412,7 @@ msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и на Ñ?еÑ?веÑ?е LDA
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1746
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1752
 msgid "Failed to delete contact"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? конÑ?акÑ?"
 
@@ -445,10 +438,8 @@ msgid "The Evolution address book has quit unexpectedly."
 msgstr "РабоÑ?а компоненÑ?а адÑ?еÑ?ной книги Evolution неожиданно завеÑ?Ñ?илаÑ?Ñ?."
 
 #: ../addressbook/addressbook.error.xml.h:22
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Ð?Ñ?бÑ?анное вами изобÑ?ажение Ñ?лиÑ?ком велико. Ð?змениÑ?Ñ? Ñ?азмеÑ? пеÑ?ед Ñ?оÑ?Ñ?анением?"
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Ð?Ñ?бÑ?анное вами изобÑ?ажение Ñ?лиÑ?ком велико. Ð?змениÑ?Ñ? Ñ?азмеÑ? пеÑ?ед Ñ?оÑ?Ñ?анением?"
 
 #: ../addressbook/addressbook.error.xml.h:23
 msgid ""
@@ -530,8 +521,7 @@ msgid ""
 msgstr "Ð?Ñ? изменили Ñ?Ñ?оÑ? конÑ?акÑ?. СоÑ?Ñ?аниÑ?Ñ? изменениÑ??"
 
 #: ../addressbook/addressbook.error.xml.h:37
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Ð?аÑ?и конÑ?акÑ?Ñ? длÑ? {0} не бÑ?дÑ?Ñ? доÑ?Ñ?Ñ?пнÑ? до пеÑ?езапÑ?Ñ?ка Evolution."
 
 #: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
@@ -568,104 +558,93 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:590
 msgid "Default Sync Address:"
 msgstr "Ð?дÑ?еÑ? Ñ?инÑ?Ñ?онизаÑ?ии по Ñ?молÑ?аниÑ?:"
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1613
+#: ../addressbook/conduit/address-conduit.c:1614
 msgid "Could not load address book"
 msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1691
+#: ../addressbook/conduit/address-conduit.c:1694
 msgid "Could not read pilot's Address application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? адÑ?еÑ?ов Ð?илоÑ?а"
 
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-msgid "Autocompletion"
-msgstr "Ð?вÑ?озавеÑ?Ñ?ение"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "C_ontacts"
 msgstr "Ð?_онÑ?акÑ?Ñ?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Certificates"
 msgstr "СеÑ?Ñ?иÑ?икаÑ?Ñ?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "Ð?деÑ?Ñ? наÑ?Ñ?Ñ?аиваеÑ?Ñ?Ñ? авÑ?озавеÑ?Ñ?ение"
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Configure contacts and autocompletion here"
+msgstr "Ð?деÑ?Ñ? наÑ?Ñ?Ñ?аиваÑ?Ñ?Ñ?Ñ? конÑ?акÑ?Ñ? и авÑ?озавеÑ?Ñ?ение"
 
-#. ensure the group name is in current locale, not read from configuration
 #. Create the contacts group
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 #: ../addressbook/gui/component/addressbook-view.c:1213
-#: ../calendar/gui/calendar-component.c:316
-#: ../calendar/gui/calendar-component.c:319 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
+#: ../calendar/gui/calendar-component.c:193 ../calendar/gui/migration.c:395
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:579
 msgid "Contacts"
 msgstr "Ð?онÑ?акÑ?Ñ?"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Evolution Address Book"
 msgstr "Ð?дÑ?еÑ?наÑ? книга Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book address popup"
 msgstr "Ð?Ñ?падаÑ?Ñ?ий адÑ?еÑ? адÑ?еÑ?ной книги Evolution"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address viewer"
 msgstr "Evolution Address Book address viewer"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book card viewer"
 msgstr "Evolution Address Book card viewer"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book component"
 msgstr "Evolution Address Book component"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution S/MIME Certificate Management Control"
 msgstr "Evolution S/MIME Certificate Management Control"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution folder settings configuration control"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Manage your S/MIME certificates here"
 msgstr "Ð?деÑ?Ñ? можно Ñ?пÑ?авлÑ?Ñ?Ñ? ваÑ?ими Ñ?еÑ?Ñ?иÑ?икаÑ?ами S/MIME"
 
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
-#. create the local source group
-#. ensure the group name is in current locale, not read from configuration
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:142
-#: ../addressbook/gui/component/addressbook-component.c:146
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:243
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/memos-component.c:197 ../calendar/gui/memos-component.c:201
-#: ../calendar/gui/migration.c:475 ../calendar/gui/migration.c:577
-#: ../calendar/gui/migration.c:1091 ../calendar/gui/tasks-component.c:194
-#: ../calendar/gui/tasks-component.c:198 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2990
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1517
+#: ../addressbook/gui/component/addressbook-component.c:97
+#: ../addressbook/gui/component/addressbook-migrate.c:499
+#: ../calendar/gui/calendar-component.c:192
+#: ../calendar/gui/memos-component.c:151 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:576 ../calendar/gui/migration.c:1090
+#: ../calendar/gui/tasks-component.c:148 ../mail/em-folder-tree-model.c:191
+#: ../mail/em-folder-tree-model.c:193 ../mail/em-migrate.c:2890
+#: ../mail/mail-component.c:320 ../mail/mail-vfolder.c:217
+#: ../mail/message-list.c:1515
 msgid "On This Computer"
 msgstr "Ð?а Ñ?Ñ?ом компÑ?Ñ?Ñ?еÑ?е"
 
+#. Create the LDAP source group
+#: ../addressbook/gui/component/addressbook-component.c:98
+#: ../addressbook/gui/component/addressbook-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "Ð?а Ñ?еÑ?веÑ?аÑ? LDAP"
+
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. ensure the source name is in current locale, not read from configuration
@@ -677,144 +656,192 @@ msgstr "Ð?а Ñ?Ñ?ом компÑ?Ñ?Ñ?еÑ?е"
 #. ensure the source name is in current locale, not read from configuration
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:154
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/calendar-component.c:261
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/memos-component.c:213
-#: ../calendar/gui/migration.c:485 ../calendar/gui/migration.c:585
-#: ../calendar/gui/migration.c:1099 ../calendar/gui/tasks-component.c:206
-#: ../calendar/gui/tasks-component.c:210 ../mail/em-migrate.c:1058
-#: ../plugins/email-custom-header/email-custom-header.c:338
+#: ../addressbook/gui/component/addressbook-component.c:135
+#: ../addressbook/gui/component/addressbook-component.c:138
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../calendar/gui/calendar-component.c:232
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:189 ../calendar/gui/memos-component.c:193
+#: ../calendar/gui/migration.c:484 ../calendar/gui/migration.c:584
+#: ../calendar/gui/migration.c:1098 ../calendar/gui/tasks-component.c:186
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-migrate.c:960
+#: ../plugins/email-custom-header/email-custom-header.c:337
 msgid "Personal"
 msgstr "Ð?иÑ?ное"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:168
-#: ../addressbook/gui/component/addressbook-component.c:171
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "Ð?а Ñ?еÑ?веÑ?аÑ? LDAP"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
+#: ../addressbook/gui/component/addressbook-component.c:209
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Ð?онÑ?акÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:239
+#: ../addressbook/gui/component/addressbook-component.c:210
 msgid "Create a new contact"
 msgstr "Создание нового конÑ?акÑ?а"
 
-#: ../addressbook/gui/component/addressbook-component.c:246
+#: ../addressbook/gui/component/addressbook-component.c:217
 msgctxt "New"
 msgid "Contact _List"
 msgstr "СпиÑ?ок к_онÑ?акÑ?ов"
 
-#: ../addressbook/gui/component/addressbook-component.c:247
+#: ../addressbook/gui/component/addressbook-component.c:218
 msgid "Create a new contact list"
 msgstr "Создание нового Ñ?пиÑ?ка конÑ?акÑ?ов"
 
-#: ../addressbook/gui/component/addressbook-component.c:253
-#: ../addressbook/gui/component/addressbook-config.c:1223
+#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../addressbook/gui/component/addressbook-config.c:1245
 msgid "New Address Book"
 msgstr "Ð?оваÑ? адÑ?еÑ?наÑ? книга"
 
-#: ../addressbook/gui/component/addressbook-component.c:254
+#: ../addressbook/gui/component/addressbook-component.c:225
 msgctxt "New"
 msgid "Address _Book"
 msgstr "Ð?дÑ?еÑ?наÑ? кн_ига"
 
-#: ../addressbook/gui/component/addressbook-component.c:255
+#: ../addressbook/gui/component/addressbook-component.c:226
 msgid "Create a new address book"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
-#: ../addressbook/gui/component/addressbook-component.c:418
+#: ../addressbook/gui/component/addressbook-component.c:389
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "Ð?Ñ?ибка обновлениÑ? паÑ?амеÑ?Ñ?ов или папок Ð?дÑ?еÑ?ной книги."
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:217
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение Ñ? "
+"ваÑ?им Ñ?еÑ?веÑ?ом LDAP Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, еÑ?ли он поддеÑ?живаеÑ? SSL."
+
+#: ../addressbook/gui/component/addressbook-config.c:219
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение Ñ? "
+"ваÑ?им Ñ?еÑ?веÑ?ом LDAP Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, еÑ?ли он поддеÑ?живаеÑ? TLS."
+
+#: ../addressbook/gui/component/addressbook-config.c:221
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о ваÑ? Ñ?еÑ?веÑ? не поддеÑ?живаеÑ? ни SSL, ни TLS . "
+"ЭÑ?о ознаÑ?аеÑ?, Ñ?Ñ?о ваÑ?е Ñ?оединение Ñ? Ñ?еÑ?веÑ?ом бÑ?деÑ? Ñ?Ñ?звимÑ?м длÑ? аÑ?ак. "
+
+#: ../addressbook/gui/component/addressbook-config.c:346
 msgid "Base"
 msgstr "Base"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
+#: ../addressbook/gui/component/addressbook-config.c:547
+#: ../calendar/gui/dialogs/calendar-setup.c:169
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
+#: ../addressbook/gui/component/addressbook-config.c:648
 msgid "Copy _book content locally for offline operation"
 msgstr "СкопиÑ?оваÑ?Ñ? _книгÑ? локалÑ?но длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
+#: ../addressbook/gui/component/addressbook-config.c:759
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"Ð?оÑ?Ñ? Ñ?еÑ?веÑ?а LDAP, на коÑ?оÑ?ом Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение. "
+"СпиÑ?ок Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? поÑ?Ñ?ов Ñ?анее Ñ?же бÑ?л пÑ?едоÑ?Ñ?авлен. СпÑ?оÑ?иÑ?е ваÑ?его "
+"Ñ?иÑ?Ñ?емного админиÑ?Ñ?Ñ?аÑ?оÑ?а, какой из ниÑ? вам необÑ?одимо иÑ?полÑ?зоваÑ?Ñ?."
+
+#: ../addressbook/gui/component/addressbook-config.c:837
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"ЭÑ?о меÑ?од, иÑ?полÑ?зÑ?емÑ?й Evolution длÑ? пÑ?овеÑ?ки подлинноÑ?Ñ?и оÑ?пÑ?авиÑ?елÑ? на "
+"Ñ?еÑ?веÑ?е. УÑ?Ñ?иÑ?е, Ñ?Ñ?о Ñ?Ñ?Ñ?ановка Ñ?Ñ?ого паÑ?амеÑ?Ñ?а в \"Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?\" "
+"Ñ?Ñ?ебÑ?еÑ? иÑ?полÑ?зованиÑ? анонимного доÑ?Ñ?Ñ?па к ваÑ?емÑ? Ñ?еÑ?веÑ?Ñ? LDAP."
+
+#: ../addressbook/gui/component/addressbook-config.c:916
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"Ð?лÑ?бина поиÑ?ка опÑ?еделÑ?еÑ?, как далеко вниз по деÑ?евÑ? каÑ?алогов бÑ?деÑ? "
+"оÑ?Ñ?Ñ?еÑ?Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? поиÑ?к. Ð?лÑ?бина поиÑ?ка «sub» вклÑ?Ñ?аеÑ? вÑ?е Ñ?леменÑ?Ñ? под "
+"каÑ?алогом наÑ?ала поиÑ?ка. Ð?лÑ?бина поиÑ?ка «one» вклÑ?Ñ?аеÑ? в Ñ?ебÑ? Ñ?леменÑ?Ñ? на "
+"один Ñ?Ñ?овенÑ? ниже каÑ?алога наÑ?ала поиÑ?ка."
+
+#: ../addressbook/gui/component/addressbook-config.c:1020
+#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:95
+#: ../plugins/itip-formatter/itip-formatter.c:2558
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "Ð?бÑ?ие"
 
-#: ../addressbook/gui/component/addressbook-config.c:999
+#: ../addressbook/gui/component/addressbook-config.c:1021
 #: ../addressbook/gui/widgets/e-addressbook-view.c:554
 #: ../mail/importers/pine-importer.c:383
 msgid "Address Book"
 msgstr "Ð?дÑ?еÑ?наÑ? книга"
 
-#: ../addressbook/gui/component/addressbook-config.c:1003
+#: ../addressbook/gui/component/addressbook-config.c:1025
 msgid "Server Information"
 msgstr "СведениÑ? о Ñ?еÑ?веÑ?е"
 
-#: ../addressbook/gui/component/addressbook-config.c:1005
+#: ../addressbook/gui/component/addressbook-config.c:1027
 msgid "Authentication"
 msgstr "Ð?Ñ?овеÑ?ка подлинноÑ?Ñ?и"
 
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/addressbook-config.c:1030
+#: ../addressbook/gui/component/ldap-config.glade.h:15
 #: ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "Ð?одÑ?обноÑ?Ñ?и"
 
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:1000
+#: ../addressbook/gui/component/addressbook-config.c:1031
+#: ../mail/em-folder-browser.c:1021
 msgid "Searching"
 msgstr "Ð?оиÑ?к"
 
-#: ../addressbook/gui/component/addressbook-config.c:1011
+#: ../addressbook/gui/component/addressbook-config.c:1033
 msgid "Downloading"
 msgstr "Ð?агÑ?Ñ?зка"
 
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/addressbook-config.c:1243
+#: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "Address Book Properties"
 msgstr "СвойÑ?Ñ?ва адÑ?еÑ?ной книги"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1209
+#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1109
 msgid "Migrating..."
 msgstr "Ð?еÑ?еноÑ?..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1268
+#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1168
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Ð?Ñ?еобÑ?азование «%s»:"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:646
+#: ../addressbook/gui/component/addressbook-migrate.c:645
 msgid "LDAP Servers"
 msgstr "СеÑ?веÑ?Ñ? LDAP"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:761
+#: ../addressbook/gui/component/addressbook-migrate.c:760
 msgid "Autocompletion Settings"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка авÑ?озавеÑ?Ñ?ениÑ?"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -826,7 +853,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? пÑ?еобÑ?азование папок длÑ? новой веÑ?Ñ?ии..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -836,7 +863,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? пÑ?еобÑ?азование папок длÑ? новой веÑ?Ñ?ии..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -846,7 +873,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? пÑ?еобÑ?азование папок длÑ? новой веÑ?Ñ?ии..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -857,18 +884,18 @@ msgstr ""
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? пÑ?еобÑ?азование ваÑ?иÑ? даннÑ?Ñ? Pilot Sync..."
 
 #: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
+#: ../mail/em-folder-utils.c:453
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ð?еÑ?еименоваÑ?Ñ? папкÑ? \"%s\" в:"
 
 #: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
+#: ../mail/em-folder-utils.c:455
 msgid "Rename Folder"
 msgstr "Ð?еÑ?еименование папки"
 
 #: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
+#: ../mail/em-folder-utils.c:461
 msgid "Folder names cannot contain '/'"
 msgstr "Ð?мена папок не можеÑ? Ñ?одеÑ?жаÑ?Ñ? '/'"
 
@@ -881,19 +908,19 @@ msgid "Save As vCard..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как VCard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:678
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:501
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
+#: ../calendar/gui/calendar-component.c:628
+#: ../calendar/gui/memos-component.c:479 ../calendar/gui/tasks-component.c:472
+#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "Ð?е_Ñ?еименоваÑ?Ñ?..."
 
 #: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:681
-#: ../calendar/gui/e-calendar-table.c:1620
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:954
-#: ../calendar/gui/memos-component.c:512 ../calendar/gui/tasks-component.c:504
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1342
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../calendar/gui/calendar-component.c:631
+#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-view.c:1828 ../calendar/gui/e-memo-table.c:949
+#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
+#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
@@ -901,11 +928,10 @@ msgid "_Delete"
 msgstr "_УдалиÑ?Ñ?"
 
 #: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:686
-#: ../calendar/gui/dialogs/comp-editor.c:2092
-#: ../calendar/gui/memos-component.c:517 ../calendar/gui/tasks-component.c:509
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+#: ../calendar/gui/calendar-component.c:636
+#: ../calendar/gui/memos-component.c:487 ../calendar/gui/tasks-component.c:480
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:59
+#: ../ui/evolution-mail-list.xml.h:38
 msgid "_Properties"
 msgstr "_СвойÑ?Ñ?ва"
 
@@ -918,20 +944,20 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Ð?нонимное подклÑ?Ñ?ение к Ñ?еÑ?веÑ?Ñ? LDAP"
 
 #: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:529
 msgid "Failed to authenticate.\n"
 msgstr "Ð?Ñ?ибка пÑ?овеÑ?ки подлинноÑ?Ñ?и.\n"
 
 #: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:509
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
 
 #: ../addressbook/gui/component/addressbook.c:222
 #: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:422
-#: ../plugins/publish-calendar/publish-calendar.c:191
+#: ../plugins/google-account-setup/google-source.c:519
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Ð?ведиÑ?е паÑ?олÑ?"
@@ -981,7 +1007,7 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "URI папки, иÑ?полÑ?зовавÑ?ейÑ?Ñ? в поÑ?ледний Ñ?аз в диалоге вÑ?боÑ?а имен"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Vertical pane position"
 msgstr "Ð?озиÑ?иÑ? веÑ?Ñ?икалÑ?ной панели"
 
@@ -998,10 +1024,23 @@ msgid "Whether to show the preview pane."
 msgstr "Ð?оказÑ?ваÑ?Ñ? ли панелÑ? пÑ?едваÑ?иÑ?елÑ?ного пÑ?оÑ?моÑ?Ñ?а."
 
 #: ../addressbook/gui/component/autocompletion-config.c:175
+msgid "Autocompletion"
+msgstr "Ð?вÑ?озавеÑ?Ñ?ение"
+
+#: ../addressbook/gui/component/autocompletion-config.c:177
 msgid "Always _show address of the autocompleted contact"
 msgstr "_Ð?оказÑ?ваÑ?Ñ? адÑ?еÑ? найденного в адÑ?еÑ?ной книге конÑ?акÑ?а"
 
-#: ../addressbook/gui/component/autocompletion-config.c:180
+#: ../addressbook/gui/component/autocompletion-config.c:182
+msgid "Date/Time Format"
+msgstr "ФоÑ?маÑ? даÑ?Ñ?/вÑ?емени"
+
+#: ../addressbook/gui/component/autocompletion-config.c:185
+#: ../mail/em-mailer-prefs.c:1456
+msgid "Table column:"
+msgstr "СÑ?олбеÑ? Ñ?аблиÑ?Ñ?:"
+
+#: ../addressbook/gui/component/autocompletion-config.c:187
 msgid "Look up in address books"
 msgstr "Ð?Ñ?каÑ?Ñ? в адÑ?еÑ?нÑ?Ñ? книгаÑ?"
 
@@ -1010,21 +1049,19 @@ msgid "1"
 msgstr "1"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
+msgid ""
+"389\n"
+"636\n"
+"3268"
+msgstr ""
+"389\n"
+"636\n"
+"3268"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 msgid "<b>Authentication</b>"
 msgstr "<b>Ð?Ñ?овеÑ?ка подлинноÑ?Ñ?и</b>"
@@ -1037,144 +1074,70 @@ msgstr "<b>Ð?агÑ?Ñ?зка</b>"
 msgid "<b>Searching</b>"
 msgstr "<b>Ð?оиÑ?к</b>"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>Тип:</b>"
-
 #: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "Ð?обавиÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "Ð?Ñ?егда"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "Ð?нонимно"
+#, fuzzy
+msgid ""
+"Anonymously\n"
+"Using email address\n"
+"Using distinguished name (DN)"
+msgstr "Ð?о оÑ?лиÑ?иÑ?елÑ?номÑ? имени (DN)"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
+#: ../addressbook/gui/component/ldap-config.glade.h:14
 msgid "B_rowse this book until limit reached"
 msgstr "Ð?Ñ?_оÑ?маÑ?Ñ?иваÑ?Ñ? книгÑ? доÑ?Ñ?Ñ?пнÑ?й пÑ?омежÑ?Ñ?ок вÑ?емени"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "Ð?Ñ?новнÑ?е"
+msgid "Evolution will use this email address to authenticate you with the server."
+msgstr "ЭÑ?оÑ? адÑ?еÑ? бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? длÑ? иденÑ?иÑ?икаÑ?ии ваÑ? на Ñ?еÑ?веÑ?е."
 
 #: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "Ð?Ñ?лиÑ?иÑ?елÑ?ное имÑ? (DN)"
+msgid "Lo_gin:"
+msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "ЭлекÑ?Ñ?оннаÑ? поÑ?Ñ?а"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "ЭÑ?оÑ? адÑ?еÑ? бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? длÑ? иденÑ?иÑ?икаÑ?ии ваÑ? на Ñ?еÑ?веÑ?е."
+"One\n"
+"Sub"
+msgstr "Ð?дин Ñ?Ñ?овенÑ?"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "Ð?айÑ?и возможнÑ?е базÑ? поиÑ?ка"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
+msgid ""
+"SSL encryption\n"
+"TLS encryption\n"
+"No encryption"
+msgstr ""
+"ШиÑ?Ñ?ование SSL \n"
+"ШиÑ?Ñ?ование TLS \n"
+"Ð?ез Ñ?иÑ?Ñ?ованиÑ?"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "Ð?икогда"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "Ð?ез Ñ?иÑ?Ñ?ованиÑ?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "Ð?дин Ñ?Ñ?овенÑ?"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "ШиÑ?Ñ?ование SSL"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "ФилÑ?Ñ?Ñ? поиÑ?ка"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:25
 msgid "Search _base:"
 msgstr "_Ð?аза поиÑ?ка:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "Search _filter:"
 msgstr "_ФилÑ?Ñ?Ñ? поиÑ?ка:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "ФилÑ?Ñ?Ñ? поиÑ?ка"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
 msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
 msgstr ""
 "ФилÑ?Ñ?Ñ? поиÑ?ка - Ñ?Ñ?о Ñ?ип обÑ?екÑ?а, коÑ?оÑ?Ñ?й должен бÑ?Ñ?Ñ? найден. Ð?Ñ?ли не "
 "изменÑ?Ñ?Ñ?, по Ñ?молÑ?аниÑ? бÑ?деÑ? пÑ?оизведен поиÑ?к обÑ?екÑ?а Ñ?ипа \"person\"."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение Ñ? "
-"ваÑ?им Ñ?еÑ?веÑ?ом LDAP Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, еÑ?ли он поддеÑ?живаеÑ? SSL."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение Ñ? "
-"ваÑ?им Ñ?еÑ?веÑ?ом LDAP Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, еÑ?ли он поддеÑ?живаеÑ? TLS."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"Ð?Ñ?боÑ? Ñ?Ñ?ой опÑ?ии ознаÑ?аеÑ?, Ñ?Ñ?о ваÑ? Ñ?еÑ?веÑ? не поддеÑ?живаеÑ? ни SSL, ни TLS . "
-"ЭÑ?о ознаÑ?аеÑ?, Ñ?Ñ?о ваÑ?е Ñ?оединение Ñ? Ñ?еÑ?веÑ?ом бÑ?деÑ? Ñ?Ñ?звимÑ?м длÑ? аÑ?ак. "
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "Ð?Ñ?е нижние Ñ?Ñ?овни"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Supported Search Bases"
 msgstr "Ð?оддеÑ?живаемÑ?е базÑ? поиÑ?ка"
 
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "ШиÑ?Ñ?ование TLS"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
@@ -1184,25 +1147,13 @@ msgstr ""
 "оÑ?кÑ?да наÑ?неÑ?Ñ?Ñ? ваÑ? поиÑ?к. Ð?Ñ?ли вÑ? оÑ?Ñ?авиÑ?е Ñ?Ñ?о поле пÑ?Ñ?Ñ?Ñ?м, Ñ?о поиÑ?к "
 "наÑ?неÑ?Ñ?Ñ? Ñ? коÑ?нÑ? деÑ?ева каÑ?алогов."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"Ð?лÑ?бина поиÑ?ка опÑ?еделÑ?еÑ?, как далеко вниз по деÑ?евÑ? каÑ?алогов бÑ?деÑ? "
-"оÑ?Ñ?Ñ?еÑ?Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? поиÑ?к. Ð?лÑ?бина поиÑ?ка «sub» вклÑ?Ñ?аеÑ? вÑ?е Ñ?леменÑ?Ñ? под "
-"каÑ?алогом наÑ?ала поиÑ?ка. Ð?лÑ?бина поиÑ?ка «one» вклÑ?Ñ?аеÑ? в Ñ?ебÑ? Ñ?леменÑ?Ñ? на "
-"один Ñ?Ñ?овенÑ? ниже каÑ?алога наÑ?ала поиÑ?ка."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid ""
 "This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ð?олное имÑ? ваÑ?его Ñ?еÑ?веÑ?а LDAP. Ð?апÑ?имеÑ?, «ldap.mycompany.com»."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:42
+#: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
@@ -1210,17 +1161,7 @@ msgstr ""
 "Ð?акÑ?ималÑ?ное Ñ?иÑ?ло Ñ?леменÑ?ов длÑ? загÑ?Ñ?зки. УÑ?Ñ?ановка оÑ?енÑ? болÑ?Ñ?ого знаÑ?ениÑ? "
 "можеÑ? Ñ?еÑ?Ñ?езно замедлиÑ?Ñ? Ñ?абоÑ?Ñ? ваÑ?ей адÑ?еÑ?ной книги."
 
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"ЭÑ?о меÑ?од, иÑ?полÑ?зÑ?емÑ?й Evolution длÑ? пÑ?овеÑ?ки подлинноÑ?Ñ?и оÑ?пÑ?авиÑ?елÑ? на "
-"Ñ?еÑ?веÑ?е. УÑ?Ñ?иÑ?е, Ñ?Ñ?о Ñ?Ñ?Ñ?ановка Ñ?Ñ?ого паÑ?амеÑ?Ñ?а в \"Ð?дÑ?еÑ? Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?\" "
-"Ñ?Ñ?ебÑ?еÑ? иÑ?полÑ?зованиÑ? анонимного доÑ?Ñ?Ñ?па к ваÑ?емÑ? Ñ?еÑ?веÑ?Ñ? LDAP."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
@@ -1228,87 +1169,61 @@ msgstr ""
 "ЭÑ?о имÑ? Ñ?еÑ?веÑ?а бÑ?деÑ? поÑ?влÑ?Ñ?Ñ?Ñ?Ñ? в Ñ?пиÑ?ке каÑ?алогов Evolution. Ð?но "
 "иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? Ñ?олÑ?ко длÑ? оÑ?обÑ?ажениÑ?. "
 
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"Ð?оÑ?Ñ? Ñ?еÑ?веÑ?а LDAP, на коÑ?оÑ?ом Evolution бÑ?деÑ? Ñ?Ñ?Ñ?анавливаÑ?Ñ? Ñ?оединение. "
-"СпиÑ?ок Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? поÑ?Ñ?ов Ñ?анее Ñ?же бÑ?л пÑ?едоÑ?Ñ?авлен. СпÑ?оÑ?иÑ?е ваÑ?его "
-"Ñ?иÑ?Ñ?емного админиÑ?Ñ?Ñ?аÑ?оÑ?а, какой из ниÑ? вам необÑ?одимо иÑ?полÑ?зоваÑ?Ñ?."
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "Ð?о оÑ?лиÑ?иÑ?елÑ?номÑ? имени (DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "Ð?о поÑ?Ñ?овомÑ? адÑ?еÑ?Ñ?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "Ð?огда Ñ?Ñ?о возможно"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "_Ð?обавиÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid "_Download limit:"
 msgstr "Ð?гÑ?аниÑ?ение загÑ?Ñ?зки:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid "_Find Possible Search Bases"
 msgstr "_Ð?айÑ?и поддеÑ?живаемÑ?е базÑ? поиÑ?ка"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid "_Login method:"
 msgstr "_Ð?еÑ?од подклÑ?Ñ?ениÑ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../calendar/gui/dialogs/calendar-setup.c:226
+#: ../mail/mail-config.glade.h:175
 #: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "_Ð?мÑ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid "_Port:"
 msgstr "_Ð?оÑ?Ñ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:55
+#: ../addressbook/gui/component/ldap-config.glade.h:38
 msgid "_Search scope:"
 msgstr "_Ð?иапазон поиÑ?ка:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../mail/mail-config.glade.h:184
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
 msgid "_Server:"
 msgstr "_СеÑ?веÑ?:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:57
+#: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid "_Timeout:"
 msgstr "_Ð?адеÑ?жка:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:58
+#: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid "_Use secure connection:"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? _заÑ?иÑ?енное Ñ?оединение:"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:59
+#: ../addressbook/gui/component/ldap-config.glade.h:42
 msgid "cards"
 msgstr "каÑ?Ñ?оÑ?ек"
 
-#: ../addressbook/gui/component/ldap-config.glade.h:60
+#: ../addressbook/gui/component/ldap-config.glade.h:43
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:652
-#: ../plugins/google-account-setup/google-contacts-source.c:375
+#: ../calendar/gui/dialogs/event-page.glade.h:24
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:523
+#: ../plugins/google-account-setup/google-source.c:740
+#: ../plugins/google-account-setup/google-contacts-source.c:330
 msgid "minutes"
 msgstr "минÑ?Ñ?"
 
@@ -1333,44 +1248,42 @@ msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разное</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
+msgid "<b>Notes</b>"
+msgstr "<b>Ð?Ñ?имеÑ?аниÑ?</b>"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
 msgid "<b>Other</b>"
 msgstr "<b>Ð?Ñ?Ñ?гой</b> "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Telephone</b>"
 msgstr "<b>ТелеÑ?он</b> "
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Web Addresses</b>"
 msgstr "<b>Ð?еб-адÑ?еÑ?а</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
 msgid "<b>Work</b>"
 msgstr "<b>РабоÑ?ий</b>"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/dialogs/memo-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Ð?а_Ñ?егоÑ?ии..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Ð?онÑ?акÑ?"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:541
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2442
 msgid "Contact Editor"
 msgstr "РедакÑ?оÑ? конÑ?акÑ?ов"
 
@@ -1379,1276 +1292,259 @@ msgid "Full _Name..."
 msgstr "Ð?о_лное имÑ?..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2494
 msgid "Image"
 msgstr "Ð?зобÑ?ажение"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "Ð?оÑ?Ñ?овÑ?й адÑ?еÑ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Nic_kname:"
 msgstr "Ð?Ñ?евдон_им:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../calendar/gui/migration.c:1225
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:451
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:564
+msgid "Notes"
+msgstr "Ð?Ñ?имеÑ?аниÑ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 msgid "Personal Information"
 msgstr "Ð?иÑ?наÑ? инÑ?оÑ?маÑ?иÑ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Telephone"
 msgstr "ТелеÑ?он"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
-msgid "Work"
-msgstr "СлÑ?жебное"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "_Address:"
 msgstr "_Ð?дÑ?еÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "_Anniversary:"
 msgstr "_Ð?одовÑ?ина:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "_Assistant:"
 msgstr "Ð?омо_Ñ?ник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Birthday:"
 msgstr "_Ð?енÑ? Ñ?ождениÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 #: ../plugins/itip-formatter/itip-view.c:1910
 msgid "_Calendar:"
 msgstr "_Ð?алендаÑ?Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_City:"
 msgstr "_Ð?оÑ?од:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Company:"
 msgstr "_Ð?омпаниÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "_Country:"
 msgstr "С_Ñ?Ñ?ана:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_Department:"
 msgstr "Ð?Ñ?_дел:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_File under:"
 msgstr "_Ð?одÑ?иÑ?Ñ? как:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Free/Busy:"
 msgstr "Cво_боден/занÑ?Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Home Page:"
 msgstr "_Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Manager:"
 msgstr "_Ð?eнеджеÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Notes:"
-msgstr "Ð?_Ñ?имеÑ?аниÑ?:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "_Ð?Ñ?иÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_PO Box:"
 msgstr "Ð?б.Ñ?Ñ?ик:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Profession:"
 msgstr "_Ð?Ñ?оÑ?еÑ?Ñ?иÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Spouse:"
 msgstr "С_Ñ?пÑ?Ñ?г(а):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_State/Province:"
 msgstr "Ð?блаÑ?Ñ?Ñ?, кÑ?ай:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/fullname.glade.h:19
 msgid "_Title:"
 msgstr "_Ð?бÑ?аÑ?ение:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Video Chat:"
 msgstr "Ð?идео_Ñ?аÑ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Wants to receive HTML mail"
 msgstr "СоглаÑ?ен полÑ?Ñ?аÑ?Ñ? поÑ?Ñ?Ñ? в Ñ?оÑ?маÑ?е _HTML"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "_Web Log:"
 msgstr "Ð?еб-_жÑ?Ñ?нал:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "_Ð?де:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Zip/Postal Code:"
 msgstr "_Ð?оÑ?Ñ?овÑ?й индекÑ?:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "Ð?дÑ?еÑ?"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
+#: ../mail/em-mailer-prefs.c:473
+#: ../plugins/exchange-operations/exchange-delegates.c:951
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:697
+#: ../plugins/plugin-manager/plugin-manager.c:57
+#: ../widgets/menus/gal-define-views-dialog.c:344
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "Ð?мÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
+#: ../addressbook/gui/widgets/e-addressbook-model.c:324
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/widgets/e-minicard-view.c:544
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3685
-#: ../widgets/text/e-text.c:3686
+#: ../widgets/table/e-cell-text.c:1816 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "Ð?зменÑ?емÑ?й"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "СоединеннÑ?е ШÑ?аÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "Ð?Ñ?ганиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "Ð?лбаниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "Ð?лжиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "Ð?меÑ?иканÑ?кое Самоа"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "Ð?ндоÑ?Ñ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "Ð?нгола"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "Ð?нгилÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "Ð?нÑ?аÑ?кÑ?ика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "Ð?нÑ?игÑ?а и Ð?аÑ?бÑ?дÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "Ð?Ñ?генÑ?ина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "Ð?Ñ?мениÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "Ð?Ñ?Ñ?ба"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "Ð?вÑ?Ñ?Ñ?алиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "Ð?вÑ?Ñ?Ñ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "Ð?зеÑ?байджан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "Ð?агамÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "Ð?аÑ?Ñ?ейн"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "Ð?англадеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "Ð?аÑ?бадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "Ð?елаÑ?Ñ?Ñ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "Ð?елÑ?гиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "Ð?елиз"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "Ð?енин"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "Ð?еÑ?мÑ?дÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "Ð?Ñ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "Ð?оливиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "Ð?оÑ?ниÑ? и Ð?еÑ?Ñ?еговина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "Ð?оÑ?Ñ?вана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "Ð?Ñ?Ñ?Ñ?ов Ð?Ñ?ве"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "Ð?Ñ?азилиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "Ð?Ñ?иÑ?анÑ?каÑ? Ñ?еÑ?Ñ?иÑ?оÑ?иÑ? Ð?ндийÑ?кого океана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "Ð?Ñ?Ñ?ней"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "Ð?олгаÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "Ð?Ñ?Ñ?кина ФаÑ?о"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "Ð?Ñ?Ñ?Ñ?нди"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "Ð?амбоджа"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "Ð?амеÑ?Ñ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "Ð?анада"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "Ð?ейп Ð?еÑ?де"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "Ð?аймановÑ? оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "ЦенÑ?Ñ?алÑ?но-Ð?Ñ?Ñ?иканÑ?каÑ? РеÑ?пÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "Чад"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "Чили"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "Ð?иÑ?ай"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "Ð?Ñ?Ñ?Ñ?ов РождеÑ?Ñ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "Ð?окоÑ?овÑ?е оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "Ð?олÑ?мбиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "Ð?омоÑ?оÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "Ð?онго"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "Ð?емокÑ?аÑ?иÑ?еÑ?каÑ? Ñ?еÑ?пÑ?блика Ð?онго"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ова Ð?Ñ?ка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "Ð?оÑ?Ñ?а-Рика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "Ð?оÑ?-д-Ð?вÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "ХоÑ?ваÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "Ð?Ñ?ба"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "Ð?ипÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "ЧеÑ?Ñ?каÑ? Ñ?еÑ?пÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "Ð?аниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "Ð?жибÑ?Ñ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "Ð?оминика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "Ð?оминиканÑ?каÑ? Ñ?еÑ?пÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "ЭквадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "Ð?гипеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "СалÑ?вадоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "ЭкваÑ?оÑ?иалÑ?наÑ? Ð?винеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "ЭÑ?иÑ?Ñ?еÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "ЭÑ?Ñ?ониÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "ЭÑ?иопиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "ФолклендÑ?кие о-ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "ФаÑ?еÑ?Ñ?кие оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "Фиджи"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "ФинлÑ?ндиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "ФÑ?анÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "ФÑ?анÑ?Ñ?зÑ?каÑ? Ð?виана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "ФÑ?анÑ?Ñ?зÑ?каÑ? Ð?олинезиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "ЮжнÑ?е Ñ?Ñ?анÑ?Ñ?зÑ?кие Ñ?еÑ?Ñ?иÑ?оÑ?ии"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "Ð?абон"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "Ð?амбиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "Ð?Ñ?Ñ?зиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "Ð?еÑ?маниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "Ð?ана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "Ð?ибÑ?алÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "Ð?Ñ?еÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "Ð?Ñ?енландиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "Ð?Ñ?енада"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "Ð?ваделÑ?па"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "Ð?Ñ?ам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "Ð?ваÑ?емала"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "Guernsey"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "Ð?винеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "Ð?винеÑ? Ð?иÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "Ð?виана"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "Ð?аиÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ова Heard и Ð?акдоналÑ?д"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "Holy See"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "Ð?ондÑ?Ñ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "Ð?онконг"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "Ð?енгÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "Ð?Ñ?ландиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "Ð?ндиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "Ð?ндонезиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "Ð?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "Ð?Ñ?ак"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "Ð?Ñ?ландиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Ð?Ñ?Ñ?Ñ?ов Ð?Ñ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "Ð?зÑ?аилÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "Ð?Ñ?алиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "Ямайка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "ЯпониÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "Ð?жеÑ?Ñ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "Ð?оÑ?даниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "Ð?азаÑ?Ñ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "Ð?ениÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "Ð?иÑ?ибаÑ?и"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "Ð?оÑ?ейÑ?каÑ? Ð?аÑ?одно-Ð?емокÑ?аÑ?иÑ?еÑ?каÑ? РеÑ?пÑ?блика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "РеÑ?пÑ?блика Ð?оÑ?еÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "Ð?Ñ?вейÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "Ð?иÑ?гизÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "Ð?аоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "Ð?аÑ?виÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "Ð?иван"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "Ð?еÑ?оÑ?о"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "Ð?ибеÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "Ð?ивиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "Ð?иÑ?Ñ?енÑ?Ñ?ейн"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "Ð?иÑ?ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "Ð?Ñ?кÑ?ембÑ?Ñ?г"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "Ð?акао"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "Ð?акедониÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "Ð?адагаÑ?каÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "Ð?алави"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "Ð?алайзиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "Ð?алÑ?дивÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "Ð?али"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "Ð?алÑ?Ñ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "Ð?аÑ?Ñ?алловÑ? о-ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "Ð?аÑ?Ñ?иника"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "Ð?авÑ?иÑ?аниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "Ð?авÑ?икий"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "Ð?айоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "Ð?екÑ?ика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "Ð?икÑ?онезиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "РеÑ?пÑ?блика Ð?олдова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "Ð?онако"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "Ð?онголиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "Ð?онÑ?Ñ?еÑ?Ñ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "Ð?аÑ?окко"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "Ð?озамбик"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "Ð?Ñ?Ñ?нма"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "Ð?амибиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "Ð?аÑ?Ñ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "Ð?епал"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "Ð?идеÑ?ландÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "Ð?идеÑ?ландÑ?кие Ð?нÑ?иллÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "Ð?оваÑ? Ð?аледониÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "Ð?оваÑ? Ð?еландиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "Ð?икаÑ?агÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "Ð?игеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "Ð?игеÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "Ð?Ñ?Ñ?Ñ?ова Ð?иÑ?е"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "Ð?оÑ?Ñ?олкÑ?кие оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "СевеÑ?нÑ?е Ð?аÑ?ианÑ?кие оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "Ð?оÑ?вегиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "Ð?ман"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "Ð?акиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "Ð?алаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "Ð?алеÑ?Ñ?инÑ?кие Ñ?еÑ?Ñ?иÑ?оÑ?ии"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "Ð?анама"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "Ð?апÑ?а Ð?оваÑ? Ð?винеÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "Ð?аÑ?агвай"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "Ð?еÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "ФилиппинÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "Ð?иÑ?кеÑ?н"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "Ð?олÑ?Ñ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "Ð?оÑ?Ñ?Ñ?галиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?о-Рико"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "Ð?аÑ?аÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "РеÑ?нÑ?он"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "РÑ?мÑ?ниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "РоÑ?Ñ?ийÑ?каÑ? ФедеÑ?аÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "РÑ?анда"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "СенÑ?-Ð?иÑ?Ñ?Ñ? и Ð?евиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "СанÑ?а Ð?Ñ?Ñ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "СенÑ?-Ð?инÑ?енÑ? и Ð?Ñ?енадинÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "Самоа"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "Сан-Ð?аÑ?ино"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "Сан-Томе и Ð?Ñ?инÑ?ипи"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "СаÑ?довÑ?каÑ? Ð?Ñ?авиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "Сенегал"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "СеÑ?биÑ? и ЧеÑ?ногоÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "СейÑ?еллÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "СÑ?еÑ?Ñ?а-Ð?еоне"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "СингапÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "СловакиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "СловениÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "СоломоновÑ? о-ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "Сомали"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "ЮжнаÑ? Ð?Ñ?Ñ?ика"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "ЮжнаÑ? Ð?еоÑ?гиÑ? и ЮжнÑ?е СандвиÑ?евÑ? оÑ?Ñ?Ñ?ова"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "Ð?Ñ?паниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "ШÑ?и Ð?анка"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "Ð?Ñ?Ñ?Ñ?ов СвÑ?Ñ?ой Ð?ленÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "Сен-Ð?Ñ?еÑ? и Ð?икелон"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "СÑ?дан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "СÑ?Ñ?инам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ова СвалбаÑ?д и Ð?ан Ð?айен"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "СвазилÑ?нд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "ШвеÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "ШвейÑ?аÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "СиÑ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "ТайванÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "ТаджикиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "СоединÑ?ннаÑ? РеÑ?пÑ?блика ТанзаниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "Таиланд"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "ТимоÑ?-Ð?иÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "Того"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "ТокелаÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "Тонга"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "ТÑ?инидад и Тобаго"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "ТÑ?ниÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "ТÑ?Ñ?Ñ?иÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "ТÑ?Ñ?кмениÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ова ТеÑ?кÑ? и Ð?Ñ?йкоÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "ТÑ?валÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "Уганда"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "УкÑ?аина"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "Ð?бÑ?единÑ?ннÑ?е Ð?Ñ?абÑ?кие ЭмиÑ?аÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "СоединÑ?нное Ð?оÑ?олевÑ?Ñ?во"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "United States Minor Outlying Islands"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "УÑ?Ñ?гвай"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "УзбекиÑ?Ñ?ан"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "Ð?анÑ?аÑ?Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "Ð?енеÑ?Ñ?Ñ?ла"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "Ð?Ñ?еÑ?нам"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "Ð?Ñ?иÑ?анÑ?кие Ð?иÑ?джинÑ?кие о-ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "Ð?меÑ?иканÑ?кие Ð?иÑ?джинÑ?кие о-ва"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "Ð?Ñ?Ñ?Ñ?ова Ð?Ñ?лиÑ? и ФÑ?Ñ?Ñ?на"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "Ð?ападнаÑ? СаÑ?аÑ?а"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "Ð?емен"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "Ð?амбиÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "Ð?имбабве"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:706
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "Ð?мÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:603
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:606
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu Messenger"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:609
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:607
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:605
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:604
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-display.c:610
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "СлÑ?жба"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "Ð?дÑ?еÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "Ð?мÑ? полÑ?зоваÑ?елÑ?"
+#. red
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:57
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
+#: ../mail/em-migrate.c:959
+msgid "Work"
+msgstr "СлÑ?жебное"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "Ð?омаÑ?ний"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2297
+#: ../addressbook/gui/widgets/eab-contact-display.c:516
+#: ../calendar/gui/e-calendar-view.c:2289
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?гие"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
-msgid "MSN"
-msgstr "MSN"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
-msgid "GroupWise"
-msgstr "GroupWise"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
 msgid "Source Book"
 msgstr "Ð?нига-иÑ?Ñ?оÑ?ник"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:254
 msgid "Target Book"
 msgstr "Ð?нига назнаÑ?ениÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
 msgid "Is New Contact"
 msgstr "ЯвлÑ?еÑ?Ñ?Ñ? новÑ?м конÑ?акÑ?ом"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
 msgid "Writable Fields"
 msgstr "Ð?олÑ? длÑ? запиÑ?и"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Required Fields"
 msgstr "ТÑ?ебÑ?емÑ?е полÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Changed"
 msgstr "Ð?зменено"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2437
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "РедакÑ?оÑ? конÑ?акÑ?ов - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2832
 msgid "Please select an image for this contact"
 msgstr "Ð?Ñ?беÑ?иÑ?е изобÑ?ажение длÑ? Ñ?Ñ?ого конÑ?акÑ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2833
 msgid "_No image"
 msgstr "_Ð?еÑ? изобÑ?ажениÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2656,43 +1552,43 @@ msgstr ""
 "Ð?аннÑ?е конÑ?акÑ?а невеÑ?нÑ?:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3108
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "невеÑ?нÑ?й Ñ?оÑ?маÑ? «%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "невеÑ?нÑ?й Ñ?оÑ?маÑ? %s«%s»"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3130
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s«%s» пÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3154
 msgid "Invalid contact."
 msgstr "Ð?евеÑ?нÑ?й конÑ?акÑ?."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:323
 msgid "Contact Quick-Add"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?ое добавление конÑ?акÑ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:326
 msgid "_Edit Full"
 msgstr "_Ð?змениÑ?Ñ? вÑ?е"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:400
 msgid "_Full name"
 msgstr "_Ð?олное имÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
 msgid "E_mail"
 msgstr "_Эл. поÑ?Ñ?а"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:422
 msgid "_Select Address Book"
 msgstr "_Ð?Ñ?беÑ?иÑ?е адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
@@ -2730,111 +1626,48 @@ msgstr ""
 "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е\n"
 "Ñ?далиÑ?Ñ? Ñ?Ñ?и конÑ?акÑ?Ñ??"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "Ð?дÑ?еÑ? _2:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "_Ð?оÑ?од:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "СÑ?Ñ?ана:"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "Ð?олнÑ?й адÑ?еÑ?"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "Ð?ндекÑ?:"
-
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
-msgid "Dr."
-msgstr "Ð?Ñ?."
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Ms.\n"
+"Miss\n"
+"Dr."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
-msgid "Esq."
-msgstr "ЭÑ?кв."
+#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq."
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.glade.h:14
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "Ð?олное имÑ?"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
-msgid "I"
-msgstr "I"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
-msgid "II"
-msgstr "II"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
-msgid "III"
-msgstr "III"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
-msgid "Jr."
-msgstr "мл."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
-msgid "Miss"
-msgstr "г-жа"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
-msgid "Mr."
-msgstr "г."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
-msgid "Mrs."
-msgstr "г-жа"
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
-msgid "Ms."
-msgstr "гг."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
-msgid "Sr."
-msgstr "Ñ?Ñ?."
-
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_First:"
 msgstr "Ð?мÑ?:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Last:"
 msgstr "ФамилиÑ?:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Middle:"
 msgstr "Ð?Ñ?Ñ?еÑ?Ñ?во:"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Suffix:"
 msgstr "СÑ?Ñ?Ñ?икÑ?:"
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ? AIM"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "_УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ?:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "СлÑ?жба Ñ?ообÑ?ений:"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "_РаÑ?положение:"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 msgid "<b>Members</b>"
 msgstr "<b>Ð?олÑ?зоваÑ?ели</b>"
@@ -2845,9 +1678,9 @@ msgid "Contact List Editor"
 msgstr "РедакÑ?оÑ? Ñ?пиÑ?ка конÑ?акÑ?ов"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:212
+#: ../calendar/gui/e-day-view-time-item.c:812
+#: ../calendar/gui/e-timezone-entry.c:118
 msgid "Select..."
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ?..."
 
@@ -2861,8 +1694,7 @@ msgstr "Ð?мÑ? _Ñ?пиÑ?ка:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr ""
-"_Ð?ведиÑ?е адÑ?еÑ? поÑ?Ñ?Ñ? или пеÑ?еÑ?аÑ?иÑ?е конÑ?акÑ? в Ñ?пиÑ?ок, пÑ?иведÑ?ннÑ?й ниже:"
+msgstr "_Ð?ведиÑ?е адÑ?еÑ? поÑ?Ñ?Ñ? или пеÑ?еÑ?аÑ?иÑ?е конÑ?акÑ? в Ñ?пиÑ?ок, пÑ?иведÑ?ннÑ?й ниже:"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
 msgid "Contact List Members"
@@ -2874,11 +1706,11 @@ msgid "_Members"
 msgstr "_УÑ?аÑ?Ñ?ники"
 
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
+#: ../addressbook/gui/widgets/e-addressbook-model.c:310
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
 #: ../addressbook/gui/widgets/e-addressbook-view.c:211
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/widgets/e-minicard-view.c:530
 msgid "Book"
 msgstr "Ð?нига"
 
@@ -2924,27 +1756,27 @@ msgstr ""
 "в Ñ?Ñ?ой папке. Ð?Ñ?Ñ? Ñ?авно Ñ?оÑ?иÑ?е добавиÑ?Ñ??"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-merging.c:213
 msgid "_Merge"
 msgstr "_Ð?бÑ?единиÑ?Ñ?"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:198
 msgid "Merge Contact"
 msgstr "Ð?бÑ?единиÑ?Ñ? конÑ?акÑ?Ñ?"
 
 #: ../addressbook/gui/merging/eab-contact-merging.c:267
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:868
+#: ../plugins/groupwise-features/junk-settings.c:420 ../smime/lib/e-cert.c:808
 msgid "Email"
 msgstr "Эл. поÑ?Ñ?а"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
+#: ../calendar/gui/cal-search-bar.c:79 ../calendar/gui/caltypes.xml.h:2
 #: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
 msgid "Any field contains"
 msgstr "Ð?Ñ?бое поле Ñ?одеÑ?жиÑ?"
@@ -2958,11 +1790,11 @@ msgstr "Ð?оÑ?Ñ?овÑ?й адÑ?еÑ? наÑ?инаеÑ?Ñ?Ñ? Ñ?"
 msgid "Name contains"
 msgstr "Ð?мÑ? Ñ?одеÑ?жиÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Ð?еÑ? конÑ?акÑ?ов"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:165
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -2970,24 +1802,24 @@ msgstr[0] "%d конÑ?акÑ?"
 msgstr[1] "%d конÑ?акÑ?а"
 msgstr[2] "%d конÑ?акÑ?ов"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:410
 #: ../addressbook/gui/widgets/e-addressbook-view.c:225
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-minicard-view.c:537
 msgid "Query"
 msgstr "Ð?апÑ?оÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
+#: ../addressbook/gui/widgets/e-addressbook-model.c:460
 msgid "Error getting book view"
 msgstr "Ð?Ñ?ибка пÑ?и полÑ?Ñ?ении вида книги"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:424
+#: ../widgets/table/e-table-click-to-add.c:507
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3352
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3549
-#: ../widgets/text/e-text.c:3550
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "Ð?оделÑ?"
 
@@ -3004,105 +1836,103 @@ msgid "Source"
 msgstr "Ð?Ñ?Ñ?оÑ?ник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:564
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
 msgid "Type"
 msgstr "Тип"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1971
 msgid "Save as vCard..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2090
-#: ../calendar/gui/e-calendar-table.c:1598
-#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:937
+#: ../addressbook/gui/widgets/e-addressbook-view.c:932
+#: ../calendar/gui/e-calendar-table.c:1591
+#: ../calendar/gui/e-calendar-view.c:1806 ../calendar/gui/e-memo-table.c:932
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../addressbook/gui/widgets/e-addressbook-view.c:934
 msgid "_New Contact..."
 msgstr "Со_здаÑ?Ñ? конÑ?акÑ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
 msgid "New Contact _List..."
 msgstr "Соз_даÑ?Ñ? Ñ?пиÑ?ок конÑ?акÑ?ов..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "_Save as vCard..."
 msgstr "_СоÑ?Ñ?аниÑ?Ñ? как vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
+#: ../addressbook/gui/widgets/e-addressbook-view.c:939
 msgid "_Forward Contact"
 msgstr "_Ð?еÑ?еÑ?лаÑ?Ñ? конÑ?акÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+#: ../addressbook/gui/widgets/e-addressbook-view.c:940
 msgid "_Forward Contacts"
 msgstr "_Ð?еÑ?еÑ?лаÑ?Ñ? конÑ?акÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
 msgid "Send _Message to Contact"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? _Ñ?ообÑ?ение к конÑ?акÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "Send _Message to List"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? _Ñ?ообÑ?ение в Ñ?пиÑ?ок"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "Send _Message to Contacts"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? _Ñ?ообÑ?ение к конÑ?акÑ?ам"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_Print"
 msgstr "_Ð?еÑ?аÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "Cop_y to Address Book..."
 msgstr "Ð?оп_иÑ?оваÑ?Ñ? в адÑ?еÑ?нÑ?Ñ? книгÑ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "Mo_ve to Address Book..."
 msgstr "Ð?еÑ?е_меÑ?Ñ?иÑ?Ñ? в адÑ?еÑ?нÑ?Ñ? книгÑ?..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Cu_t"
 msgstr "_Ð?Ñ?Ñ?езаÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1606
-#: ../calendar/gui/e-calendar-view.c:1820 ../calendar/gui/e-memo-table.c:945
-#: ../composer/e-msg-composer.c:2072 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1327 ../mail/message-list.c:2105
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../calendar/gui/e-calendar-table.c:1599
+#: ../calendar/gui/e-calendar-view.c:1813 ../calendar/gui/e-memo-table.c:940
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "_Ð?опиÑ?оваÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "P_aste"
 msgstr "Ð?Ñ?Ñ?_авиÑ?Ñ?"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1528
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1534
+#: ../calendar/gui/cal-search-bar.c:624 ../calendar/gui/cal-search-bar.c:667
+#: ../calendar/gui/cal-search-bar.c:686
 msgid "Any Category"
 msgstr "Ð?Ñ?баÑ? каÑ?егоÑ?иÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1531
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1537
+#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
+#: ../calendar/gui/cal-search-bar.c:690
 msgid "Unmatched"
 msgstr "Ð?Ñ?оÑ?ее"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:624
 msgid "Assistant"
 msgstr "Ð?омоÑ?ник"
 
@@ -3131,8 +1961,8 @@ msgid "Car Phone"
 msgstr "ТелеÑ?он в маÑ?ине"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/e-cal-component-memo-preview.c:135
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3140,7 +1970,7 @@ msgid "Categories"
 msgstr "Ð?аÑ?егоÑ?ии"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Company"
 msgstr "Ð?омпаниÑ?"
 
@@ -3189,22 +2019,22 @@ msgid "Journal"
 msgstr "Ð?Ñ?Ñ?нал"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:623
 msgid "Manager"
 msgstr "Ð?eнеджеÑ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:644
 msgid "Mobile Phone"
 msgstr "Ð?обилÑ?нÑ?й Ñ?елеÑ?он"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
 msgid "Nickname"
 msgstr "Ð?Ñ?евдоним"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Note"
 msgstr "Ð?Ñ?имеÑ?ание"
 
@@ -3233,14 +2063,14 @@ msgid "Radio"
 msgstr "Радио"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:576
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:710
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:701
 msgid "Role"
 msgstr "Ð?олжноÑ?Ñ?Ñ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:648
 msgid "Spouse"
 msgstr "СÑ?пÑ?Ñ?г(а)"
 
@@ -3270,55 +2100,53 @@ msgstr "Ð?одÑ?азделение"
 msgid "Web Site"
 msgstr "Ð?еб-Ñ?айÑ?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/misc/e-reflow.c:1421 ../widgets/misc/e-reflow.c:1422
+#: ../widgets/table/e-table-click-to-add.c:521
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:997
-#: ../widgets/table/e-table-group-container.c:998
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3727 ../widgets/text/e-text.c:3728
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "ШиÑ?ина"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:990
-#: ../widgets/table/e-table-group-container.c:991
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/misc/e-reflow.c:1428 ../widgets/misc/e-reflow.c:1429
+#: ../widgets/table/e-table-click-to-add.c:528
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3735 ../widgets/text/e-text.c:3736
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Ð?Ñ?Ñ?оÑ?а"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "Ð?мееÑ? Ñ?окÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Ð?оле"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "Ð?мÑ? полÑ?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "ТекÑ?Ñ?оваÑ? моделÑ?"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "Ð?акÑ?ималÑ?наÑ? длина имени полÑ?"
 
@@ -3326,7 +2154,7 @@ msgstr "Ð?акÑ?ималÑ?наÑ? длина имени полÑ?"
 msgid "Column Width"
 msgstr "ШиÑ?ина Ñ?Ñ?олбÑ?а"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
 "\n"
@@ -3336,7 +2164,7 @@ msgstr ""
 "\n"
 "Ð?оиÑ?к конÑ?акÑ?ов..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:180
 msgid ""
 "\n"
 "\n"
@@ -3350,7 +2178,7 @@ msgstr ""
 "\n"
 "Ð?ли дваждÑ? Ñ?елкниÑ?е здеÑ?Ñ?, Ñ?Ñ?обÑ? Ñ?оздаÑ?Ñ? новÑ?й конÑ?акÑ?."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -3364,7 +2192,7 @@ msgstr ""
 "\n"
 "Ð?важдÑ? Ñ?елкниÑ?е здеÑ?Ñ?, Ñ?Ñ?обÑ? Ñ?оздаÑ?Ñ? новÑ?й конÑ?акÑ?."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:187
 msgid ""
 "\n"
 "\n"
@@ -3374,7 +2202,7 @@ msgstr ""
 "\n"
 "Ð?оиÑ?к конÑ?акÑ?а."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3384,41 +2212,41 @@ msgstr ""
 "\n"
 "Ð?еÑ? Ñ?леменÑ?ов длÑ? оÑ?обÑ?ажениÑ? в Ñ?Ñ?ом окне."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:523
 msgid "Adapter"
 msgstr "Ð?дапÑ?еÑ?"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "РабоÑ?аÑ? Ñ?л. поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "Ð?омаÑ?нÑ?Ñ? Ñ?л.поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:825
 msgid "Other Email"
 msgstr "Ð?Ñ?Ñ?гаÑ? Ñ?л.поÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "Ð?Ñ?бÑ?ано"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "Ð?мееÑ? кÑ?Ñ?Ñ?оÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:545
 msgid "_Open Link in Browser"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ? в бÑ?аÑ?зеÑ?е"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2757
+#: ../mail/em-folder-view.c:2694
 msgid "_Copy Link Location"
 msgstr "_Ð?опиÑ?оваÑ?Ñ? Ñ?Ñ?Ñ?лкÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:546
 msgid "_Send New Message To..."
 msgstr "_Ð?Ñ?пÑ?авиÑ?Ñ? новое Ñ?ообÑ?ение к..."
 
@@ -3427,96 +2255,101 @@ msgstr "_Ð?Ñ?пÑ?авиÑ?Ñ? новое Ñ?ообÑ?ение к..."
 msgid "Copy _Email Address"
 msgstr "Ð?опиÑ?оваÑ?Ñ? адÑ?еÑ? _Ñ?л.поÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:286
+#: ../addressbook/gui/widgets/eab-contact-display.c:360
+#: ../addressbook/gui/widgets/eab-contact-display.c:362
 msgid "(map)"
 msgstr "(каÑ?Ñ?а)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:380
+#: ../addressbook/gui/widgets/eab-contact-display.c:391
 msgid "map"
 msgstr "каÑ?Ñ?а"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:475
+#: ../addressbook/gui/widgets/eab-contact-display.c:835
 msgid "List Members"
 msgstr "УÑ?аÑ?Ñ?ники Ñ?пиÑ?ка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Department"
 msgstr "Ð?Ñ?дел"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:621
 msgid "Profession"
 msgstr "Ð?Ñ?оÑ?еÑ?Ñ?иÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:622
 msgid "Position"
 msgstr "Ð?олжноÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:625
 msgid "Video Chat"
 msgstr "Ð?идеоÑ?аÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2523
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
+#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../calendar/gui/calendar-commands.c:89
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/gnome-cal.c:2548
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
+#: ../plugins/hula-account-setup/camel-hula-listener.c:372
+#: ../plugins/hula-account-setup/camel-hula-listener.c:400
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "Ð?алендаÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #: ../calendar/gui/dialogs/event-editor.c:116
 msgid "Free/Busy"
 msgstr "Cвободен/занÑ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:628
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
 msgid "Phone"
 msgstr "ТелеÑ?он"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
 msgid "Fax"
 msgstr "ФакÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
+msgid "Address"
+msgstr "Ð?дÑ?еÑ?"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
 msgid "Home Page"
 msgstr "Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:641
 msgid "Web Log"
 msgstr "Ð?еб-жÑ?Ñ?нал"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2576
+#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../calendar/gui/e-calendar-view.c:2580
 msgid "Birthday"
 msgstr "Ð?енÑ? Ñ?ождениÑ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2577
+#: ../addressbook/gui/widgets/eab-contact-display.c:647
+#: ../calendar/gui/e-calendar-view.c:2581
 msgid "Anniversary"
 msgstr "Ð?одовÑ?ина"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:853
 msgid "Job Title"
 msgstr "Ð?олжноÑ?Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Home page"
 msgstr "Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?ка"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:897
 msgid "Blog"
 msgstr "Ð?лог"
 
@@ -3571,12 +2404,11 @@ msgstr "Ð?Ñ?оÑ?окол не поддеÑ?живаеÑ?Ñ?Ñ?"
 
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2564
+#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-model-tasks.c:363
+#: ../calendar/gui/e-cal-model-tasks.c:679
+#: ../calendar/gui/e-calendar-table.c:238
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2548
 msgid "Canceled"
 msgstr "Ð?Ñ?менено"
 
@@ -3587,13 +2419,13 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?мениÑ?Ñ?"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../calendar/gui/comp-editor-factory.c:432
 msgid "Authentication Failed"
 msgstr "Сбой пÑ?овеÑ?ки подлинноÑ?Ñ?и"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:426
 msgid "Authentication Required"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и"
 
@@ -3696,8 +2528,7 @@ msgstr ""
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book was unable to parse this query."
-msgstr ""
-"Ð?омпоненÑ? обÑ?абоÑ?ки Ñ?Ñ?ой адÑ?еÑ?ной книги не Ñ?мог обÑ?абоÑ?аÑ?Ñ? Ñ?екÑ?Ñ?ий запÑ?оÑ?."
+msgstr "Ð?омпоненÑ? обÑ?абоÑ?ки Ñ?Ñ?ой адÑ?еÑ?ной книги не Ñ?мог обÑ?абоÑ?аÑ?Ñ? Ñ?екÑ?Ñ?ий запÑ?оÑ?."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "The backend for this address book refused to perform this query."
@@ -3714,7 +2545,7 @@ msgid "Error adding list"
 msgstr "Ð?Ñ?ибка добавлениÑ? Ñ?пиÑ?ка"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
+#: ../addressbook/gui/widgets/eab-gui-util.c:685
 msgid "Error adding contact"
 msgstr "Ð?Ñ?ибка добавлениÑ? конÑ?акÑ?а"
 
@@ -3731,7 +2562,7 @@ msgid "Error removing list"
 msgstr "Ð?Ñ?ибка Ñ?далениÑ? Ñ?пиÑ?ка"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
+#: ../addressbook/gui/widgets/eab-gui-util.c:635
 msgid "Error removing contact"
 msgstr "Ð?Ñ?ибка Ñ?далениÑ? конÑ?акÑ?а"
 
@@ -3762,7 +2593,7 @@ msgid "Display _All Contacts"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? _вÑ?е конÑ?акÑ?Ñ?"
 
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
+#: ../addressbook/gui/widgets/eab-gui-util.c:350
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3771,15 +2602,15 @@ msgstr ""
 "%s Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?\n"
 "ХоÑ?иÑ?е пеÑ?епиÑ?аÑ?Ñ??"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
+#: ../addressbook/gui/widgets/eab-gui-util.c:354
 msgid "Overwrite"
 msgstr "Ð?еÑ?езапиÑ?аÑ?Ñ?"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:394
+#: ../addressbook/gui/widgets/eab-gui-util.c:397
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "конÑ?акÑ?"
@@ -3787,31 +2618,31 @@ msgstr[1] "конÑ?акÑ?а"
 msgstr[2] "конÑ?акÑ?ов"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:443
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:480
 msgid "Select Address Book"
 msgstr "Ð?Ñ?беÑ?иÑ?е адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
 msgid "list"
 msgstr "Ñ?пиÑ?ок"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:746
 msgid "Move contact to"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? конÑ?акÑ? в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
 msgid "Copy contact to"
 msgstr "Ð?опиÑ?оваÑ?Ñ? конÑ?акÑ? в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:751
 msgid "Move contacts to"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? конÑ?акÑ?Ñ? в"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
 msgid "Copy contacts to"
 msgstr "Ð?опиÑ?оваÑ?Ñ? конÑ?акÑ?Ñ? в"
 
@@ -3835,301 +2666,101 @@ msgstr "Ð?онÑ?акÑ?наÑ? инÑ?оÑ?маÑ?иÑ?"
 msgid "Contact information for %s"
 msgstr "Ð?онÑ?акÑ?наÑ? инÑ?оÑ?маÑ?иÑ? %s"
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
+#: ../addressbook/gui/widgets/eab-popup-control.c:291
 msgid "Querying Address Book..."
 msgstr "Ð?апÑ?аÑ?иваеÑ?Ñ?Ñ? адÑ?еÑ?наÑ? книга..."
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гой конÑ?акÑ?."
-msgstr[1] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гиÑ? конÑ?акÑ?а."
-msgstr[2] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гиÑ? конÑ?акÑ?ов."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "Ð?оказÑ?ваÑ?Ñ? вÑ?Ñ? каÑ?Ñ?оÑ?кÑ?"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "Ð?оказÑ?ваÑ?Ñ? компакÑ?нÑ?Ñ? каÑ?Ñ?оÑ?кÑ?"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? в адÑ?еÑ?ной книге"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "Ð?ид каÑ?Ñ?оÑ?ек"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:512
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:687 ../shell/shell.error.xml.h:7
 msgid "Importing..."
 msgstr "Ð?мпоÑ?Ñ?..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Ð?Ñ?огÑ?амма импоÑ?Ñ?иÑ?ованиÑ? Outlook CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Ð?Ñ?огÑ?амма импоÑ?Ñ?иÑ?ованиÑ? Mozilla CSV или Tab"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV или Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Ð?Ñ?огÑ?амма импоÑ?Ñ?иÑ?ованиÑ? Evolution CSV и Tab"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ФоÑ?маÑ? обмена даннÑ?ми LDAP"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:680
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF importer"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard Importer"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "Ð?Ñ?Ñ?Ñ?аÑ? Ñ?оÑ?ма в конÑ?е:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "Тело"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "СнизÑ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "РазмеÑ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "_ШÑ?иÑ?Ñ?..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "ШÑ?иÑ?Ñ?Ñ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "Ð?ижний колонÑ?иÑ?Ñ?л:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "ФоÑ?маÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "Ð?аголовок"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "Ð?еÑ?Ñ?ний/нижний колонÑ?иÑ?Ñ?лÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "Ð?аголовки"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "Ð?аголовки длÑ? каждой бÑ?квÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "Ð?Ñ?Ñ?оÑ?а:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "Ð?дин за дÑ?Ñ?гим"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "Ð?клÑ?Ñ?иÑ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "Ð?лÑ?бом"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "Слева:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "Ð?акладки бÑ?кв веÑ?Ñ?икалÑ?но"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "Ð?олÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "ЧиÑ?ло Ñ?Ñ?олбÑ?ов:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "Ð?Ñ?иенÑ?аÑ?иÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "СÑ?Ñ?аниÑ?а"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?Ñ?Ñ?аниÑ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "Ð?Ñ?мага"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "Ð?Ñ?Ñ?оÑ?ник бÑ?маги:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "Ð?оÑ?Ñ?Ñ?еÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "Ð?еÑ?аÑ?Ñ? Ñ? иÑ?полÑ?зованием полÑ?Ñ?онов"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "Ð?бÑ?аÑ?аÑ?Ñ? на Ñ?еÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?аÑ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "СпÑ?ава:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "РазделÑ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "С Ñ?енÑ?Ñ?"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "РазмеÑ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "Ð?аÑ?инаÑ?Ñ? Ñ? новой Ñ?Ñ?Ñ?аниÑ?Ñ?"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "Ð?азвание Ñ?Ñ?илÑ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "СвеÑ?Ñ?Ñ?:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "Тип:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "ШиÑ?ина:"
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "ШÑ?иÑ?Ñ?..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?айл"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок адÑ?еÑ?нÑ?Ñ? книг"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "не Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? книгÑ?"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "УказаÑ?Ñ? Ñ?айл вмеÑ?Ñ?о Ñ?Ñ?андаÑ?Ñ?ного вÑ?вода"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "OUTPUTFILE"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "Ð?еÑ?еÑ?иÑ?лиÑ?Ñ? папки локалÑ?ной адÑ?еÑ?ной книги"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "Ð?оказÑ?ваÑ?Ñ? каÑ?Ñ?оÑ?ки как Ñ?айлÑ? vcard или csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "ЭкÑ?поÑ?Ñ? в аÑ?инÑ?Ñ?онном Ñ?ежиме"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
@@ -4137,30 +2768,29 @@ msgstr ""
 "Ð?олиÑ?еÑ?Ñ?во каÑ?Ñ?оÑ?ек в одном Ñ?айле вÑ?вода в аÑ?инÑ?Ñ?онном Ñ?ежиме, Ñ?азмеÑ? по "
 "Ñ?молÑ?аниÑ? 100."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "NUMBER"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+#: ../addressbook/tools/evolution-addressbook-export.c:99
+msgid "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Ð?Ñ?ибка аÑ?гÑ?менÑ?ов командной Ñ?Ñ?Ñ?оки, иÑ?полÑ?зÑ?йÑ?е паÑ?амеÑ?Ñ? --help, Ñ?Ñ?обÑ? "
 "пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? доÑ?Ñ?Ñ?пнÑ?е аÑ?гÑ?менÑ?Ñ?."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "Ð?оддеÑ?живаÑ?Ñ?Ñ?Ñ? Ñ?оÑ?маÑ?Ñ? Ñ?олÑ?ко vcard или csv."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "Ð? аÑ?инÑ?Ñ?онном Ñ?ежиме вÑ?водом должен бÑ?Ñ?Ñ? Ñ?айл."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "Ð? обÑ?Ñ?ном Ñ?ежиме не нÑ?жно Ñ?казÑ?ваÑ?Ñ? Ñ?азмеÑ?."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "Ð?еобÑ?абаÑ?Ñ?ваемаÑ? оÑ?ибка"
 
@@ -4217,13 +2847,11 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "Ð?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?Ñ?иÑ? задаÑ?аÑ? бÑ?деÑ? безвозвÑ?аÑ?но Ñ?далена."
 
 #: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+msgid "All information on this appointment will be deleted and can not be restored."
 msgstr "Ð?Ñ?е Ñ?ведениÑ? об Ñ?Ñ?ой вÑ?Ñ?Ñ?еÑ?е бÑ?дÑ?Ñ? безвозвÑ?аÑ?но Ñ?даленÑ?."
 
 #: ../calendar/calendar.error.xml.h:12
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+msgid "All information on this meeting will be deleted and can not be restored."
 msgstr "Ð?Ñ?е Ñ?ведениÑ? об Ñ?Ñ?ом Ñ?обÑ?ании бÑ?дÑ?Ñ? безвозвÑ?аÑ?но Ñ?даленÑ?."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -4341,8 +2969,7 @@ msgstr ""
 "Ñ?могли пÑ?инÑ?Ñ?Ñ? Ñ?Ñ?Ñ? задаÑ?Ñ?."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid ""
-"Email invitations will be sent to all participants and allow them to reply."
+msgid "Email invitations will be sent to all participants and allow them to reply."
 msgstr ""
 "СообÑ?ениÑ? бÑ?дÑ?Ñ? Ñ?азоÑ?ланÑ? по Ñ?лекÑ?Ñ?онной поÑ?Ñ?е вÑ?ем Ñ?Ñ?аÑ?Ñ?никам, Ñ?Ñ?обÑ? даÑ?Ñ? "
 "им возможноÑ?Ñ?Ñ? оÑ?веÑ?иÑ?Ñ?."
@@ -4559,7 +3186,7 @@ msgstr "Ð?аÑ?и задаÑ?и бÑ?дÑ?Ñ? недоÑ?Ñ?Ñ?пнÑ? до пеÑ?еза
 msgid "_Discard Changes"
 msgstr "_Ð?Ñ?клониÑ?Ñ? изменениÑ?"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:343
 msgid "_Save"
 msgstr "_СоÑ?Ñ?аниÑ?Ñ?"
 
@@ -4581,56 +3208,56 @@ msgstr "_Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?ведомление"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:248
 msgid "Split Multi-Day Events:"
 msgstr "РазделиÑ?Ñ? многодневнÑ?е Ñ?обÑ?Ñ?иÑ?:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/calendar/calendar-conduit.c:1513
+#: ../calendar/conduits/calendar/calendar-conduit.c:1514
+#: ../calendar/conduits/memo/memo-conduit.c:807
+#: ../calendar/conduits/memo/memo-conduit.c:808
+#: ../calendar/conduits/todo/todo-conduit.c:1007
+#: ../calendar/conduits/todo/todo-conduit.c:1008
 msgid "Could not start evolution-data-server"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1621
+#: ../calendar/conduits/calendar/calendar-conduit.c:1624
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? календаÑ?Ñ? Ð?илоÑ?а"
 
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
+#: ../calendar/conduits/memo/memo-conduit.c:901
+#: ../calendar/conduits/memo/memo-conduit.c:904
 msgid "Could not read pilot's Memo application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? замеÑ?ок Ð?илоÑ?а"
 
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
+#: ../calendar/conduits/memo/memo-conduit.c:948
+#: ../calendar/conduits/memo/memo-conduit.c:951
 msgid "Could not write pilot's Memo application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? замеÑ?ок"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:227
 msgid "Default Priority:"
 msgstr "Ð?Ñ?иоÑ?иÑ?еÑ? по Ñ?молÑ?аниÑ?:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
-#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1091
+#: ../calendar/conduits/todo/todo-conduit.c:1094
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? заданий Ð?илоÑ?а"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
-#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1136
+#: ../calendar/conduits/todo/todo-conduit.c:1139
 msgid "Could not write pilot's ToDo application block"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? блок пÑ?иложениÑ? ToDo пилоÑ?а"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
+#: ../plugins/itip-formatter/itip-formatter.c:2549
 msgid "Calendar and Tasks"
 msgstr "Ð?алендаÑ?Ñ? и задаÑ?и"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:869
-#: ../calendar/gui/calendar-component.c:1291
+#: ../calendar/gui/calendar-component.c:819
+#: ../calendar/gui/calendar-component.c:1238
 msgid "Calendars"
 msgstr "Ð?алендаÑ?и"
 
@@ -4671,24 +3298,24 @@ msgid "Memo_s"
 msgstr "_Ð?амеÑ?ки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:594
-#: ../calendar/gui/memos-component.c:912 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/e-memo-table.c:293 ../calendar/gui/e-memos.c:1123
+#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:564
+#: ../calendar/gui/memos-component.c:882 ../calendar/gui/memos-control.c:386
+#: ../calendar/gui/memos-control.c:402
 msgid "Memos"
 msgstr "Ð?амеÑ?ки"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:586 ../calendar/gui/tasks-component.c:908
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/e-calendar-table.c:725 ../calendar/gui/e-tasks.c:1426
+#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:1973
+#: ../calendar/gui/tasks-component.c:557 ../calendar/gui/tasks-component.c:879
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 #: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
+#: ../calendar/importers/icalendar-importer.c:751
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "Ð?адаÑ?и"
@@ -4699,7 +3326,7 @@ msgstr "_Ð?алендаÑ?и"
 
 #. Tasks
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../plugins/pst-import/pst-importer.c:331 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:328 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ð?адаÑ?и"
 
@@ -4707,29 +3334,29 @@ msgstr "_Ð?адаÑ?и"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:100
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минÑ?Ñ?а"
 msgstr[1] "минÑ?Ñ?Ñ?"
 msgstr[2] "минÑ?Ñ?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:653
-#: ../plugins/google-account-setup/google-contacts-source.c:376
+#: ../calendar/gui/dialogs/event-page.glade.h:23
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:524
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/google-account-setup/google-contacts-source.c:331
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "Ñ?аÑ?"
 msgstr[1] "Ñ?аÑ?а"
 msgstr[2] "Ñ?аÑ?ов"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:293
 msgid "Start time"
 msgstr "Ð?Ñ?емÑ? наÑ?ала"
 
@@ -4744,10 +3371,10 @@ msgstr "_Ð?Ñ?мениÑ?Ñ? вÑ?е"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1616
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1021
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
+#: ../calendar/gui/e-itip-control.c:1164
+#: ../plugins/itip-formatter/itip-view.c:1023
 msgid "Location:"
 msgstr "Ð?дÑ?еÑ?:"
 
@@ -4760,11 +3387,11 @@ msgid "_Dismiss"
 msgstr "_Ð?Ñ?мениÑ?Ñ?"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
+#: ../calendar/gui/dialogs/comp-editor.c:1038
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:167
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
@@ -4780,32 +3407,32 @@ msgstr "Ð?апомниÑ?Ñ? по_зже"
 msgid "location of appointment"
 msgstr "меÑ?Ñ?о пÑ?оведениÑ? вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1444
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1566
 msgid "No summary available."
 msgstr "Сводка недоÑ?Ñ?Ñ?пна."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No description available."
 msgstr "Ð?пиÑ?ание не доÑ?Ñ?Ñ?пно."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1487
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No location information available."
 msgstr "Ð?аннÑ?е об адÑ?еÑ?е недоÑ?Ñ?Ñ?пнÑ?."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1532
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1506
 #, c-format
 msgid "You have %d alarms"
 msgstr "У ваÑ? еÑ?Ñ?Ñ? %d Ñ?игналов"
 
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1666
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1694
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1722
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warning"
 msgstr "Ð?Ñ?едÑ?пÑ?еждение"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4817,7 +3444,7 @@ msgstr ""
 "Ð?меÑ?Ñ?о Ñ?Ñ?ого Evolution оÑ?обÑ?азиÑ? ноÑ?малÑ?нÑ?й диалог\n"
 "напоминаниÑ?."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1728
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1700
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4834,7 +3461,7 @@ msgstr ""
 "\n"
 "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?Ñ?Ñ? пÑ?огÑ?аммÑ??"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1742
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1714
 msgid "Do not ask me about this program again."
 msgstr "Ð?е задаваÑ?Ñ? болÑ?Ñ?е Ñ?Ñ?оÑ? вопÑ?оÑ?."
 
@@ -4914,123 +3541,133 @@ msgid "Calendars to run alarms for"
 msgstr "Ð?алендаÑ?и длÑ? запÑ?Ñ?ка напоминаний"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Check this to use system timezone in Evolution."
+msgstr "УÑ?Ñ?ановиÑ?е, Ñ?Ñ?обÑ? иÑ?полÑ?зоваÑ?Ñ? Ñ?иÑ?Ñ?емнÑ?й Ñ?аÑ?овой поÑ?Ñ? в Evolution"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "ЦвеÑ? маÑ?кеÑ?а вÑ?емени в Ñ?аÑ?пиÑ?ании (длÑ? знаÑ?ениÑ? по Ñ?молÑ?аниÑ? оÑ?Ñ?авÑ?Ñ?е "
 "пÑ?Ñ?Ñ?Ñ?м)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ЦвеÑ? маÑ?кеÑ?а Ñ?екÑ?Ñ?его вÑ?емени в обзоÑ?е днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "УжимаÑ?Ñ? вÑ?Ñ?однÑ?е дни в обзоÑ?е меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "Ð?одÑ?веÑ?ждение оÑ?иÑ?Ñ?ки"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Ð?ни, когда должнÑ? оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? наÑ?ало и конеÑ? Ñ?абоÑ?иÑ? Ñ?аÑ?ов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Упоминание о вÑ?Ñ?Ñ?еÑ?е по Ñ?молÑ?аниÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+msgid "Default recurrence count"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "Ð?диниÑ?Ñ? напоминаниÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "Ð?наÑ?ение напоминаниÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "Ð?аÑ?алог длÑ? Ñ?оÑ?Ñ?анениÑ? звÑ?ковÑ?Ñ? Ñ?айлов бÑ?дилÑ?ника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "Ð?Ñ?адиенÑ? Ñ?обÑ?Ñ?иÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "Ð?Ñ?озÑ?аÑ?ноÑ?Ñ?Ñ? Ñ?обÑ?Ñ?иÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "URL Ñ?еÑ?веÑ?а Ñ?вободен/занÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "URL Ñ?аблона Ñ?вободен/занÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "Ð?Ñ?адиенÑ? Ñ?леменÑ?ов в видаÑ? календаÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "СкÑ?Ñ?ваÑ?Ñ? вÑ?полненнÑ?е задаÑ?и"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "СкÑ?Ñ?ваÑ?Ñ? единиÑ?Ñ? задаÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "СкÑ?Ñ?ваÑ?Ñ? знаÑ?ение задаÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "Ð?озиÑ?иÑ? гоÑ?изонÑ?алÑ?ной панели"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "ЧаÑ? оконÑ?аниÑ? Ñ?абоÑ?его днÑ?, в 24-Ñ?аÑ?овом Ñ?оÑ?маÑ?е, оÑ? 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "ЧаÑ? наÑ?ала Ñ?абоÑ?его днÑ?, в 24-Ñ?аÑ?овом Ñ?оÑ?маÑ?е, оÑ? 0 до 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Ð?нÑ?еÑ?валÑ?, оÑ?обÑ?ажаемÑ?е в Ñ?ежимаÑ? \"Ð?енÑ?\" и \"РабоÑ?аÑ? неделÑ?\", в минÑ?Ñ?аÑ?."
+msgstr "Ð?нÑ?еÑ?валÑ?, оÑ?обÑ?ажаемÑ?е в Ñ?ежимаÑ? \"Ð?енÑ?\" и \"РабоÑ?аÑ? неделÑ?\", в минÑ?Ñ?аÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Last alarm time"
 msgstr "Ð?Ñ?емÑ? поÑ?леднего Ñ?игнала"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Level beyond which the message should be logged."
 msgstr "УÑ?овенÑ?, за коÑ?оÑ?Ñ?м Ñ?ообÑ?ение должно заноÑ?иÑ?Ñ?Ñ?Ñ? в жÑ?Ñ?нал."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "List of recently used second time zones in a Day View."
 msgstr "СпиÑ?ок недавно иÑ?полÑ?зованнÑ?Ñ? вÑ?оÑ?иÑ?нÑ?Ñ? Ñ?аÑ?овÑ?Ñ? поÑ?Ñ?ов в обзоÑ?е днÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of server URLs for free/busy publishing."
 msgstr "СпиÑ?ок URL Ñ?еÑ?веÑ?ов длÑ? пÑ?бликаÑ?ии Ñ?ведений о занÑ?Ñ?оÑ?Ñ?и."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line"
 msgstr "Ð?аÑ?кеÑ? Ñ?екÑ?Ñ?его вÑ?емени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ЦвеÑ? маÑ?кеÑ?а Ñ?екÑ?Ñ?его вÑ?емени - Ð?бзоÑ? меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ЦвеÑ? маÑ?кеÑ?а Ñ?екÑ?Ñ?его вÑ?емени - полоÑ?а вÑ?емени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -5038,39 +3675,39 @@ msgstr ""
 "Ð?акÑ?ималÑ?ное колиÑ?еÑ?Ñ?во Ñ?Ñ?анимÑ?Ñ? недавниÑ? Ñ?аÑ?овÑ?Ñ? поÑ?Ñ?ов в Ñ?пиÑ?ке "
 "«day_second_zones»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Ð?акÑ?ималÑ?ное Ñ?иÑ?ло недавниÑ? Ñ?аÑ?овÑ?Ñ? поÑ?Ñ?ов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Ð?инÑ?Ñ?Ñ? завеÑ?Ñ?ениÑ? Ñ?абоÑ?его днÑ?, оÑ? 0 до 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Ð?инÑ?Ñ?Ñ? наÑ?ала Ñ?абоÑ?его днÑ?, оÑ? 0 до 59"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Month view horizontal pane position"
 msgstr "Ð?озиÑ?иÑ? гоÑ?изонÑ?алÑ?ной панели в обзоÑ?е меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view vertical pane position"
 msgstr "Ð?озиÑ?иÑ? веÑ?Ñ?икалÑ?ной панели в обзоÑ?е меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Number of units for determining a default reminder."
 msgstr "Ð?олиÑ?еÑ?Ñ?во единиÑ? длÑ? напоминаниÑ? по Ñ?молÑ?аниÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining when to hide tasks."
 msgstr "Ð?олиÑ?еÑ?Ñ?во единиÑ? длÑ? опÑ?еделениÑ? моменÑ?а, когда Ñ?кÑ?Ñ?ваÑ?Ñ? задаÑ?и."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Overdue tasks color"
 msgstr "ЦвеÑ? пÑ?оÑ?Ñ?оÑ?еннÑ?Ñ? задаÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -5078,7 +3715,7 @@ msgstr ""
 "Ð?оложение гоÑ?изонÑ?алÑ?ной панели междÑ? навигаÑ?оÑ?ом обзоÑ?а и даÑ?Ñ? и Ñ?пиÑ?ком "
 "задаÑ? когда не в Ñ?ежиме обзоÑ?а меÑ?Ñ?Ñ?а, в пикÑ?елаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5086,7 +3723,7 @@ msgstr ""
 "Ð?оложение гоÑ?изонÑ?алÑ?ной панели междÑ? навигаÑ?оÑ?ом обзоÑ?а и даÑ?Ñ? и Ñ?пиÑ?ком "
 "задаÑ? в Ñ?ежиме обзоÑ?а меÑ?Ñ?Ñ?а, в пикÑ?елаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -5094,7 +3731,7 @@ msgstr ""
 "Ð?озиÑ?иÑ? веÑ?Ñ?икалÑ?ной панели междÑ? Ñ?пиÑ?ками календаÑ?Ñ? и навигаÑ?оÑ?ом даÑ? "
 "календаÑ?Ñ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
@@ -5102,7 +3739,7 @@ msgstr ""
 "Ð?озиÑ?иÑ? веÑ?Ñ?икалÑ?ной панели междÑ? Ñ?пиÑ?ком задаÑ? и пÑ?едваÑ?иÑ?елÑ?нÑ?м пÑ?оÑ?моÑ?Ñ?ом "
 "задаÑ?и, в пикÑ?елаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -5110,7 +3747,7 @@ msgstr ""
 "Ð?оложение веÑ?Ñ?икалÑ?ной панели междÑ? навигаÑ?оÑ?ом обзоÑ?а и даÑ?Ñ? и Ñ?пиÑ?ком "
 "задаÑ? в Ñ?ежиме обзоÑ?а меÑ?Ñ?Ñ?а, в пикÑ?елаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
@@ -5118,70 +3755,85 @@ msgstr ""
 "Ð?оложение веÑ?Ñ?икалÑ?ной панели междÑ? навигаÑ?оÑ?ом обзоÑ?а и даÑ?Ñ? и Ñ?пиÑ?ком "
 "задаÑ? когда не в Ñ?ежиме обзоÑ?а меÑ?Ñ?Ñ?а, в пикÑ?елаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+msgid "Primary calendar"
+msgstr "Ð?Ñ?новной календаÑ?Ñ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Primary memo list"
+msgstr "Ð?Ñ?новной Ñ?пиÑ?ок замеÑ?ок"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Primary task list"
+msgstr "Ð?Ñ?новной Ñ?пиÑ?ок задаÑ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ð?Ñ?огÑ?аммÑ?, коÑ?оÑ?Ñ?е Ñ?азÑ?еÑ?ено иÑ?полÑ?зоваÑ?Ñ? как Ñ?аÑ?Ñ?Ñ? Ñ?игналов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Recently used second time zones in a Day View"
 msgstr "Ð?едавние вÑ?оÑ?иÑ?нÑ?е Ñ?аÑ?овÑ?е поÑ?Ñ?а в обзоÑ?е днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Save directory for alarm audio"
 msgstr "Ð?аÑ?алог длÑ? Ñ?оÑ?Ñ?анениÑ? звÑ?ковÑ?Ñ? Ñ?айлов бÑ?дилÑ?ника"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Show RSVP field in the event/task/meeting editor"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
+msgid "Scroll Month View by a week"
 msgstr ""
-"Ð?Ñ?обÑ?ажаÑ?Ñ? поле \"Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?\" в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле \"Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?\" в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле \"Ð?олжноÑ?Ñ?Ñ?\" в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Show appointment end times in week and month views"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? вÑ?емÑ? оконÑ?аниÑ? вÑ?Ñ?Ñ?еÑ? в обзоÑ?е недели и меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле каÑ?егоÑ?ий в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Show display alarms in notification tray"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? Ñ?кÑ?аннÑ?е Ñ?игналÑ? в облаÑ?Ñ?и Ñ?ведомлениÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле Ñ?оÑ?Ñ?оÑ?ниÑ? в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Show the \"Preview\" pane"
 msgstr "Ð?оказÑ?ваÑ?Ñ? панелÑ? пÑ?едваÑ?иÑ?елÑ?ного пÑ?оÑ?моÑ?Ñ?а"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Show the \"Preview\" pane."
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? панелÑ? пÑ?едваÑ?иÑ?елÑ?ного пÑ?оÑ?моÑ?Ñ?а."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле Ñ?аÑ?ового поÑ?Ñ?а в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «Ñ?ип» в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show week number in Day and Work Week View"
 msgstr "Ð?оказÑ?ваÑ?Ñ? номеÑ?а неделÑ? обзоÑ?е Ñ?абоÑ?ей недели и днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show week numbers in date navigator"
 msgstr "Ð?оказÑ?ваÑ?Ñ? номеÑ?а неделÑ? в навигаÑ?оÑ?е по даÑ?ам"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
@@ -5189,15 +3841,15 @@ msgstr ""
 "Ð?оказÑ?ваÑ?Ñ? вÑ?оÑ?иÑ?нÑ?й Ñ?аÑ?овой поÑ?Ñ? в обзоÑ?е днÑ?. СмÑ?Ñ?л знаÑ?ениÑ? Ñ?акой же, как "
 "и в клÑ?Ñ?е «timezone»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Tasks due today color"
 msgstr "ЦвеÑ? задаÑ? на Ñ?егоднÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Tasks vertical pane position"
 msgstr "Ð?озиÑ?иÑ? веÑ?Ñ?икалÑ?ной панели задаÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5206,7 +3858,7 @@ msgstr ""
 "Шаблон URL длÑ? оÑ?пÑ?авки даннÑ?Ñ? о занÑ?Ñ?оÑ?Ñ?и. %u заменÑ?еÑ?Ñ?Ñ? на левÑ?Ñ? Ñ?аÑ?Ñ?Ñ? "
 "поÑ?Ñ?ового адÑ?еÑ?а (имÑ? полÑ?зоваÑ?елÑ?), %d - домен."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5215,11 +3867,11 @@ msgstr ""
 "непеÑ?еведенного имени Olsen из базÑ? Ñ?аÑ?овÑ?Ñ? поÑ?Ñ?ов, напÑ?имеÑ? \"America/New "
 "York\"."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "The second timezone for a Day View"
 msgstr "Ð?Ñ?оÑ?иÑ?нÑ?й Ñ?аÑ?овой поÑ?Ñ? в обзоÑ?е днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
@@ -5227,20 +3879,19 @@ msgstr ""
 "У Ñ?Ñ?ого клÑ?Ñ?а можеÑ? бÑ?Ñ?Ñ? одно из Ñ?Ñ?Ñ?Ñ? знаÑ?ений: 0 â?? оÑ?ибки, 1 â?? "
 "пÑ?едÑ?пÑ?еждениÑ?; 2 â?? оÑ?ладоÑ?нÑ?е Ñ?ообÑ?ениÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Time divisions"
 msgstr "РазделиÑ?ели вÑ?емени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Time the last alarm ran, in time_t."
 msgstr "Ð?Ñ?емÑ? поÑ?леднего запÑ?Ñ?ка Ñ?игнала, в Ñ?оÑ?маÑ?е in time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Timezone"
 msgstr "ЧаÑ?овой поÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
@@ -5248,41 +3899,59 @@ msgstr ""
 "Ð?Ñ?озÑ?аÑ?ноÑ?Ñ?Ñ? Ñ?леменÑ?ов в видаÑ? календаÑ?Ñ?, знаÑ?ение междÑ? 0 (полнаÑ? "
 "пÑ?озÑ?аÑ?ноÑ?Ñ?Ñ?) и 1 (непÑ?озÑ?аÑ?ноÑ?Ñ?Ñ?)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Twenty four hour time format"
 msgstr "24-Ñ?аÑ?овой Ñ?оÑ?маÑ? вÑ?емени"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr "URI вÑ?деленного («оÑ?новного») календаÑ?Ñ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr "URI вÑ?деленного («оÑ?новного») Ñ?пиÑ?ка замеÑ?ок"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr "URI вÑ?деленного («оÑ?новного») Ñ?пиÑ?ка задаÑ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Ð?диниÑ?Ñ? напоминаниÑ? по Ñ?молÑ?аниÑ?, «minutes», «hours» или «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr ""
-"Ð?диниÑ?Ñ? длÑ? опÑ?еделениÑ? моменÑ?а Ñ?кÑ?Ñ?Ñ?иÑ? задаÑ?, «minutes», «hours» или «days»."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr "Ð?диниÑ?Ñ? длÑ? опÑ?еделениÑ? моменÑ?а Ñ?кÑ?Ñ?Ñ?иÑ? задаÑ?, «minutes», «hours» или «days»."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+msgid "Use system timezone"
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?иÑ?Ñ?емнÑ?й Ñ?аÑ?овой поÑ?Ñ?"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?иÑ?Ñ?емнÑ?й Ñ?аÑ?овой поÑ?Ñ? вмеÑ?Ñ?о Ñ?ого, коÑ?оÑ?Ñ?й Ñ?казан в Evolution."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Week start"
 msgstr "Ð?аÑ?ало недели"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ð?енÑ?, Ñ? коÑ?оÑ?ого наÑ?инаеÑ?Ñ?Ñ? неделÑ?, Ñ? воÑ?кÑ?еÑ?енÑ?Ñ? (0) до Ñ?Ñ?ббоÑ?Ñ? (6)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? или неÑ? облаÑ?Ñ?Ñ? Ñ?ведомлениÑ? длÑ? оÑ?обÑ?ажениÑ? Ñ?игналов."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Ð?апÑ?аÑ?иваÑ?Ñ? подÑ?веÑ?ждение пÑ?и Ñ?далении вÑ?Ñ?Ñ?еÑ?и или задаÑ?и."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Ð?апÑ?аÑ?иваÑ?Ñ? подÑ?веÑ?ждение пÑ?и оÑ?иÑ?Ñ?ке вÑ?Ñ?Ñ?еÑ?и или задаÑ?и."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
@@ -5290,144 +3959,141 @@ msgstr ""
 "УжимаÑ?Ñ? ли вÑ?Ñ?однÑ?е дни в обзоÑ?е меÑ?Ñ?Ñ?а (Ñ?Ñ?ббоÑ?а и воÑ?кÑ?еÑ?енÑ?е занимаÑ?Ñ? "
 "меÑ?Ñ?о одного Ñ?абоÑ?его днÑ?)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "Ð?оказÑ?ваÑ?Ñ? ли вÑ?емÑ? завеÑ?Ñ?ениÑ? Ñ?обÑ?Ñ?ий в обзоÑ?е недели и меÑ?Ñ?Ñ?а."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли маÑ?кеÑ? Ñ?екÑ?Ñ?его вÑ?емени в календаÑ?е."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "СкÑ?Ñ?ваÑ?Ñ? ли завеÑ?Ñ?еннÑ?е задаÑ?и в обзоÑ?е задаÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Whether to set a default reminder for appointments."
 msgstr "УÑ?Ñ?анавливаÑ?Ñ? ли напоминание длÑ? Ñ?обÑ?Ñ?ий по Ñ?молÑ?аниÑ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr ""
-"Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле «Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?» в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле «Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?» в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле каÑ?егоÑ?ий в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле «Ð?олжноÑ?Ñ?Ñ?» в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле Ñ?оÑ?Ñ?оÑ?ниÑ? в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Ð?оказÑ?ваÑ?Ñ? ли вÑ?емÑ? в 24-Ñ?аÑ?овом Ñ?оÑ?маÑ?е вмеÑ?Ñ?о am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле Ñ?аÑ?ового поÑ?Ñ?а в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? ли поле \"Ñ?ип\" в Ñ?едакÑ?оÑ?е Ñ?обÑ?Ñ?ий/задаÑ?/Ñ?обÑ?аний"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "Ð?Ñ?дÑ?Ñ? ли оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? номеÑ?а неделÑ? в обзоÑ?е Ñ?абоÑ?ей недели и днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to show week numbers in the date navigator."
 msgstr "Ð?оказÑ?ваÑ?Ñ? ли номеÑ?а неделÑ? в навигаÑ?оÑ?е по даÑ?ам."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? ли леÑ?нее вÑ?емÑ? пÑ?и оÑ?обÑ?ажении Ñ?обÑ?Ñ?ий."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Work days"
 msgstr "РабоÑ?ие дни"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Workday end hour"
 msgstr "ЧаÑ? завеÑ?Ñ?ениÑ? Ñ?абоÑ?его днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Workday end minute"
 msgstr "Ð?инÑ?Ñ?Ñ? завеÑ?Ñ?ениÑ? Ñ?абоÑ?его днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Workday start hour"
 msgstr "ЧаÑ? наÑ?ала Ñ?абоÑ?его днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Workday start minute"
 msgstr "Ð?инÑ?Ñ?а наÑ?ала Ñ?абоÑ?его днÑ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "леÑ?нее вÑ?емÑ?"
+#: ../calendar/gui/cal-editor-utils.c:100
+msgid "Invalid object"
+msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?й обÑ?екÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:75
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Summary contains"
 msgstr "Сводка Ñ?одеÑ?жиÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:76
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Description contains"
 msgstr "Ð?пиÑ?ание Ñ?одеÑ?жиÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:77
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Category is"
 msgstr "Ð?аÑ?егоÑ?ии "
 
-#: ../calendar/gui/cal-search-bar.c:78
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Comment contains"
 msgstr "Ð?омменÑ?аÑ?ий Ñ?одеÑ?жиÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:79
+#: ../calendar/gui/cal-search-bar.c:78
 msgid "Location contains"
 msgstr "Ð?дÑ?еÑ? Ñ?одеÑ?жиÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:640
+#: ../calendar/gui/cal-search-bar.c:636
 msgid "Next 7 Days' Tasks"
 msgstr "Ð?адаÑ?и на Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? неделÑ?"
 
-#: ../calendar/gui/cal-search-bar.c:644
+#: ../calendar/gui/cal-search-bar.c:640
 msgid "Active Tasks"
 msgstr "Ð?кÑ?ивнÑ?е задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:648
+#: ../calendar/gui/cal-search-bar.c:644
 msgid "Overdue Tasks"
 msgstr "Ð?Ñ?оÑ?Ñ?оÑ?еннÑ?е задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:652
+#: ../calendar/gui/cal-search-bar.c:648
 msgid "Completed Tasks"
 msgstr "Ð?авеÑ?Ñ?Ñ?ннÑ?е задаÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:656
+#: ../calendar/gui/cal-search-bar.c:652
 msgid "Tasks with Attachments"
 msgstr "Ð?адаÑ?и Ñ? вложениÑ?ми"
 
-#: ../calendar/gui/cal-search-bar.c:702
+#: ../calendar/gui/cal-search-bar.c:698
 msgid "Active Appointments"
 msgstr "Ð?кÑ?ивнÑ?е вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../calendar/gui/cal-search-bar.c:706
+#: ../calendar/gui/cal-search-bar.c:702
 msgid "Next 7 Days' Appointments"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?и на Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? неделÑ?"
 
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../calendar/gui/calendar-commands.c:89 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:71
 #: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Ð?еÑ?аÑ?Ñ?"
 
-#: ../calendar/gui/calendar-commands.c:315
+#: ../calendar/gui/calendar-commands.c:331
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5436,137 +4102,126 @@ msgstr ""
 "ЭÑ?о дейÑ?Ñ?вие безвозвÑ?аÑ?но Ñ?ниÑ?Ñ?ожиÑ? вÑ?е Ñ?обÑ?Ñ?иÑ? Ñ?Ñ?аÑ?Ñ?е Ñ?казанного пÑ?омежÑ?Ñ?ка "
 "вÑ?емени. Ð?Ñ?ли вÑ? пÑ?одолжиÑ?е, вÑ? не Ñ?можеÑ?е воÑ?Ñ?Ñ?ановиÑ?Ñ? Ñ?Ñ?и Ñ?обÑ?Ñ?иÑ?."
 
-#: ../calendar/gui/calendar-commands.c:321
+#: ../calendar/gui/calendar-commands.c:337
 msgid "Purge events older than"
 msgstr "Ð?Ñ?иÑ?Ñ?иÑ?Ñ? Ñ?леменÑ?Ñ? Ñ?Ñ?аÑ?Ñ?е Ñ?ем"
 
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:654
-#: ../plugins/google-account-setup/google-contacts-source.c:377
+#: ../calendar/gui/calendar-commands.c:342
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:525
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/google-account-setup/google-contacts-source.c:332
 #: ../widgets/misc/e-send-options.glade.h:39
 msgid "days"
 msgstr "дней"
 
-#. ensure the group name is in current locale, not read from configuration
-#. Create the On the web source group
-#. ensure the group name is in current locale, not read from configuration
-#. Create the source group
 #. Create the Webcal source group
-#. Create the LDAP source group
-#. ensure the group name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:287
-#: ../calendar/gui/calendar-component.c:290
-#: ../calendar/gui/memos-component.c:240 ../calendar/gui/memos-component.c:243
-#: ../calendar/gui/migration.c:505 ../calendar/gui/migration.c:604
-#: ../calendar/gui/migration.c:1118 ../calendar/gui/tasks-component.c:237
-#: ../calendar/gui/tasks-component.c:243
+#: ../calendar/gui/calendar-component.c:194
+#: ../calendar/gui/memos-component.c:152 ../calendar/gui/migration.c:504
+#: ../calendar/gui/migration.c:603 ../calendar/gui/migration.c:1117
+#: ../calendar/gui/tasks-component.c:149
 msgid "On The Web"
 msgstr "Ð? СеÑ?и"
 
-#. ensure the source name is in current locale, not read from configuration
-#: ../calendar/gui/calendar-component.c:331
-#: ../calendar/gui/calendar-component.c:333 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "Ð?ни Ñ?ождениÑ? и годовÑ?инÑ?"
-
-#. ensure the group name is in current locale, not read from configuration
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:346
-#: ../calendar/gui/calendar-component.c:349
+#: ../calendar/gui/calendar-component.c:195
 #: ../plugins/calendar-weather/calendar-weather.c:126
 msgid "Weather"
 msgstr "Ð?огода"
 
-#: ../calendar/gui/calendar-component.c:676
+#. ensure the source name is in current locale, not read from configuration
+#: ../calendar/gui/calendar-component.c:289
+#: ../calendar/gui/calendar-component.c:291 ../calendar/gui/migration.c:398
+msgid "Birthdays & Anniversaries"
+msgstr "Ð?ни Ñ?ождениÑ? и годовÑ?инÑ?"
+
+#: ../calendar/gui/calendar-component.c:626
 msgid "_New Calendar"
 msgstr "_СоздаÑ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:677
-#: ../calendar/gui/memos-component.c:508 ../calendar/gui/tasks-component.c:500
-#: ../mail/em-folder-tree.c:2124
+#: ../calendar/gui/calendar-component.c:627
+#: ../calendar/gui/memos-component.c:478 ../calendar/gui/tasks-component.c:471
+#: ../mail/em-folder-tree.c:2114
 msgid "_Copy..."
 msgstr "_Ð?опиÑ?оваÑ?Ñ?..."
 
-#: ../calendar/gui/calendar-component.c:682
-#: ../calendar/gui/memos-component.c:513 ../calendar/gui/tasks-component.c:505
+#: ../calendar/gui/calendar-component.c:632
+#: ../calendar/gui/memos-component.c:483 ../calendar/gui/tasks-component.c:476
 msgid "_Make available for offline use"
 msgstr "Сде_лаÑ?Ñ? доÑ?Ñ?Ñ?пнÑ?м авÑ?ономно"
 
-#: ../calendar/gui/calendar-component.c:683
-#: ../calendar/gui/memos-component.c:514 ../calendar/gui/tasks-component.c:506
+#: ../calendar/gui/calendar-component.c:633
+#: ../calendar/gui/memos-component.c:484 ../calendar/gui/tasks-component.c:477
 msgid "_Do not make available for offline use"
 msgstr "_Ð?е делаÑ?Ñ? доÑ?Ñ?Ñ?пнÑ?м авÑ?нономно"
 
-#: ../calendar/gui/calendar-component.c:1013
+#: ../calendar/gui/calendar-component.c:961
 msgid "Failed upgrading calendars."
 msgstr "Ð?Ñ?ибка обновлениÑ? календаÑ?ей."
 
-#: ../calendar/gui/calendar-component.c:1142
+#: ../calendar/gui/calendar-component.c:1089
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ? «%s» длÑ? Ñ?озданиÑ? Ñ?обÑ?Ñ?ий и Ñ?овеÑ?аний"
 
-#: ../calendar/gui/calendar-component.c:1158
+#: ../calendar/gui/calendar-component.c:1105
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Ð?еÑ? доÑ?Ñ?Ñ?пного календаÑ?Ñ? длÑ? Ñ?озданиÑ? Ñ?обÑ?Ñ?ий и Ñ?овеÑ?аний"
 
-#: ../calendar/gui/calendar-component.c:1271
+#: ../calendar/gui/calendar-component.c:1218
 msgid "Calendar Source Selector"
 msgstr "Ð?Ñ?боÑ? иÑ?Ñ?оÑ?ника календаÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:1487
+#: ../calendar/gui/calendar-component.c:1433
 msgid "New appointment"
 msgstr "Ð?оваÑ? вÑ?Ñ?Ñ?еÑ?а"
 
-#: ../calendar/gui/calendar-component.c:1488
+#: ../calendar/gui/calendar-component.c:1434
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Ð?Ñ?Ñ?Ñ?еÑ?а"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1435
 msgid "Create a new appointment"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? вÑ?Ñ?Ñ?еÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:1495
+#: ../calendar/gui/calendar-component.c:1441
 msgid "New meeting"
 msgstr "Ð?овое Ñ?обÑ?ание"
 
-#: ../calendar/gui/calendar-component.c:1496
+#: ../calendar/gui/calendar-component.c:1442
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_СобÑ?ание"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1443
 msgid "Create a new meeting request"
 msgstr "СоздаÑ?Ñ? новое пÑ?иглаÑ?ение на Ñ?обÑ?ание"
 
-#: ../calendar/gui/calendar-component.c:1503
+#: ../calendar/gui/calendar-component.c:1449
 msgid "New all day appointment"
 msgstr "Ð?оваÑ? вÑ?Ñ?Ñ?еÑ?а на веÑ?Ñ? денÑ?"
 
-#: ../calendar/gui/calendar-component.c:1504
+#: ../calendar/gui/calendar-component.c:1450
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "_Ð?жедневнаÑ? вÑ?Ñ?Ñ?еÑ?а"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1451
 msgid "Create a new all-day appointment"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? ежедневнÑ?Ñ? вÑ?Ñ?Ñ?еÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:1511
+#: ../calendar/gui/calendar-component.c:1457
 msgid "New calendar"
 msgstr "Ð?овÑ?й календаÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:1512
+#: ../calendar/gui/calendar-component.c:1458
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Ð?але_ндаÑ?Ñ?"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1459
 msgid "Create a new calendar"
 msgstr "СоздаÑ?Ñ? новÑ?й календаÑ?Ñ?"
 
@@ -5608,20 +4263,20 @@ msgid "Category"
 msgstr "Ð?аÑ?егоÑ?иÑ?"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "Ð?лаÑ?Ñ?иÑ?икаÑ?иÑ?"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:568
+#: ../calendar/gui/e-cal-model.c:370 ../calendar/gui/e-calendar-table.c:565
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:341
+#: ../plugins/email-custom-header/email-custom-header.c:340
 msgid "Confidential"
 msgstr "Ð?онÑ?иденÑ?иалÑ?ное"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:59
+#: ../widgets/misc/e-attachment-tree-view.c:496
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "Ð?пиÑ?ание"
@@ -5641,21 +4296,27 @@ msgstr "Ð?е Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 msgid "Exist"
 msgstr "СÑ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:722
+#: ../plugins/save-calendar/csv-format.c:371
+msgid "Location"
+msgstr "Ð?дÑ?еÑ?"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:567
+#: ../calendar/gui/e-cal-model.c:368 ../calendar/gui/e-calendar-table.c:564
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Ð?иÑ?ное"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:566 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:359 ../calendar/gui/e-cal-model.c:366
+#: ../calendar/gui/e-calendar-table.c:563 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ð?бÑ?ее"
 
@@ -5665,11 +4326,11 @@ msgid "Recurrence"
 msgstr "Ð?овÑ?оÑ?ение"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Summary"
 msgstr "Сводка"
 
@@ -5689,35 +4350,55 @@ msgid "does not contain"
 msgstr "не Ñ?одеÑ?жиÑ?"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "Ñ?влÑ?еÑ?Ñ?Ñ?"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "не Ñ?влÑ?еÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/comp-editor-factory.c:409
+#: ../calendar/gui/comp-editor-factory.c:408
 msgid "Error while opening the calendar"
 msgstr "Ð?Ñ?ибка пÑ?и оÑ?кÑ?Ñ?Ñ?ии календаÑ?Ñ?"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:414
 msgid "Method not supported when opening the calendar"
 msgstr "Ð?еÑ?од оÑ?кÑ?Ñ?Ñ?иÑ? календаÑ?Ñ? не поддеÑ?живаеÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:420
 msgid "Permission denied to open the calendar"
 msgstr "Ð?Ñ?каз в доÑ?Ñ?Ñ?пе пÑ?и оÑ?кÑ?Ñ?Ñ?ии календаÑ?Ñ?"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
+#: ../calendar/gui/comp-editor-factory.c:438 ../shell/e-shell.c:1261
 msgid "Unknown error"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:611
 msgid "Edit Alarm"
 msgstr "Ð?змениÑ?Ñ? Ñ?игнал"
 
+#: ../calendar/gui/dialogs/alarm-dialog.c:796
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "Ð?Ñ?водиÑ?Ñ? пÑ?едÑ?пÑ?еждение"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:797
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "Ð?оÑ?пÑ?оизвеÑ?Ñ?и звÑ?к"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:798
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "Ð?Ñ?полниÑ?Ñ? пÑ?огÑ?аммÑ?"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:799
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? поÑ?Ñ?Ñ?"
+
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>Сигнал</b>"
@@ -5747,83 +4428,68 @@ msgid "Mes_sage:"
 msgstr "_СообÑ?ение:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "Ð?оÑ?пÑ?оизвеÑ?Ñ?и звÑ?к"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "Ð?Ñ?водиÑ?Ñ? пÑ?едÑ?пÑ?еждение"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "Ð?Ñ?полниÑ?Ñ? пÑ?огÑ?аммÑ?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Select A File"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
 msgid "Send To:"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ?:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? поÑ?Ñ?Ñ?"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 msgid "_Arguments:"
 msgstr "_Ð?Ñ?гÑ?менÑ?Ñ?:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "_Program:"
 msgstr "_Ð?Ñ?огÑ?амма:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "_Repeat the alarm"
 msgstr "_Ð?овÑ?оÑ?иÑ?Ñ? Ñ?игнал"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Sound:"
 msgstr "_Ð?вÑ?к:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
-msgid "after"
-msgstr "поÑ?ле"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
-msgid "before"
-msgstr "до"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "day(s)"
-msgstr "дней"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
-msgid "end of appointment"
-msgstr "завеÑ?Ñ?ение вÑ?Ñ?Ñ?еÑ?и"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+msgid ""
+"before\n"
+"after"
+msgstr ""
+"до\n"
+"поÑ?ле"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "extra times every"
 msgstr "дополниÑ?елÑ?ное вÑ?емÑ? каждÑ?е"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-msgid "hour(s)"
-msgstr "Ñ?аÑ?ов"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+msgid ""
+"minute(s)\n"
+"hour(s)\n"
+"day(s)"
+msgstr ""
+"минÑ?Ñ?(Ñ?)\n"
+"Ñ?аÑ?(Ñ?)\n"
+"денÑ?(дни)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-msgid "minute(s)"
-msgstr "минÑ?Ñ?"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
+msgid ""
+"minutes\n"
+"hours\n"
+"days"
+msgstr ""
+"минÑ?Ñ?Ñ?\n"
+"Ñ?аÑ?Ñ?\n"
+"дни"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
-msgid "start of appointment"
-msgstr "наÑ?ало вÑ?Ñ?Ñ?еÑ?и"
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid ""
+"start of appointment\n"
+"end of appointment"
+msgstr ""
+"наÑ?ало вÑ?Ñ?Ñ?еÑ?и\n"
+"оконÑ?ание вÑ?Ñ?Ñ?еÑ?и"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.c:244
 msgid "Action/Trigger"
@@ -5834,47 +4500,54 @@ msgid "A_dd"
 msgstr "_Ð?обавиÑ?Ñ?"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-page.glade.h:4
 msgid "Alarms"
 msgstr "СигналÑ?"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:80
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ð?Ñ?едполагаÑ?Ñ? авÑ?омаÑ?иÑ?еÑ?кое оÑ?обÑ?ажение вложениÑ?"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:141
 msgid "Attach file(s)"
 msgstr "Ð?ложиÑ?Ñ? Ñ?айл(Ñ?)"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2955
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-day-view-time-item.c:785
+#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:946
+#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
 #: ../plugins/calendar-weather/calendar-weather.c:333
 #: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:395
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1727
+#: ../plugins/email-custom-header/email-custom-header.c:394
+#: ../plugins/exchange-operations/exchange-delegates-user.c:179
+#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
+#: ../widgets/misc/e-dateedit.c:1674
 #: ../widgets/misc/e-signature-combo-box.c:74
 msgid "None"
 msgstr "Ð?еÑ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:648
 msgid "Selected Calendars for Alarms"
 msgstr "Ð?алендаÑ?и - иÑ?Ñ?оÑ?ники Ñ?игналов"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:865
+msgid "Time and date:"
+msgstr "Ð?аÑ?а и вÑ?емÑ?:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:866
+msgid "Date only:"
+msgstr "ТолÑ?ко даÑ?а:"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "(Shown in a Day View)"
 msgstr "(показÑ?ваÑ?Ñ? пÑ?и пÑ?оÑ?моÑ?Ñ?е днÑ?)"
@@ -5895,58 +4568,66 @@ msgstr ""
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr ""
 "<i>%u и %d бÑ?дÑ?Ñ? замененÑ? на полÑ?зоваÑ?елÑ? и домен из адÑ?еÑ?а Ñ?лекÑ?Ñ?онной "
 "поÑ?Ñ?Ñ?.</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
+msgid "<span weight=\"bold\">Alarms</span>"
 msgstr "<span weight=\"bold\">СигналÑ?</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">СигналÑ?</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../mail/mail-config.glade.h:13
+msgid "<span weight=\"bold\">Date/Time Format</span>"
+msgstr "<span weight=\"bold\">ФоÑ?маÑ? даÑ?Ñ? и вÑ?емени</span>"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">СеÑ?веÑ? \"Свободен/Ð?анÑ?Ñ?\" по Ñ?молÑ?аниÑ?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #: ../mail/mail-config.glade.h:17
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Ð?бÑ?ие</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">СпиÑ?ок задаÑ?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">Ð?Ñ?емÑ?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">РабоÑ?аÑ? неделÑ?</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "Ð?е_Ñ?еÑ?Ñ?Ñ?оиÑ?Ñ? на леÑ?нее вÑ?емÑ?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Day _ends:"
 msgstr "Ð?енÑ? _заканÑ?иваеÑ?Ñ?Ñ?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Display"
 msgstr "Ð?Ñ?обÑ?ажение"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+msgid "Display alarms in _notification area only"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/e-itip-control.c:731
 msgid "Friday"
 msgstr "Ð?Ñ?Ñ?ниÑ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5956,13 +4637,13 @@ msgstr ""
 "ЧаÑ?Ñ?\n"
 "Ð?ни"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:727
 msgid "Monday"
 msgstr "Ð?онеделÑ?ник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5980,215 +4661,231 @@ msgstr ""
 "СÑ?ббоÑ?а\n"
 "Ð?оÑ?кÑ?еÑ?енÑ?е"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../mail/mail-config.glade.h:118
 msgid "Pick a color"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?веÑ?"
 
 #. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "S_un"
 msgstr "Ð?Ñ?к"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/e-itip-control.c:732
 msgid "Saturday"
 msgstr "СÑ?ббоÑ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+msgid "Sc_roll Month View by a week"
+msgstr ""
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Se_cond zone:"
 msgstr "Ð?Ñ?оÑ?ой _Ñ?аÑ?овой поÑ?Ñ?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Select the calendars for alarm notification"
 msgstr "Ð?Ñ?беÑ?иÑ?е календаÑ?и длÑ? Ñ?игналов"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Sh_ow a reminder"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _напоминание"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#. This is the first half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show a _reminder"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _напоминание"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Show week _numbers in date navigator"
 msgstr "Ð?оказÑ?ваÑ?Ñ? номеÑ?а неделÑ? в навигаÑ?оÑ?е по даÑ?ам"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _номеÑ?а неделÑ? в навигаÑ?оÑ?е по даÑ?ам"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/e-itip-control.c:726
 msgid "Sunday"
 msgstr "Ð?оÑ?кÑ?еÑ?енÑ?е"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "T_asks due today:"
 msgstr "Ð?адаÑ?и на _Ñ?егоднÑ?Ñ?ний денÑ?:"
 
 #. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "T_hu"
 msgstr "ЧÑ?в"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Template:"
 msgstr "Шаблон:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:730
 msgid "Thursday"
 msgstr "ЧеÑ?веÑ?г"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/event-page.glade.h:13
 msgid "Time _zone:"
 msgstr "ЧаÑ?овой _поÑ?Ñ?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Time format:"
 msgstr "ФоÑ?маÑ? вÑ?емени:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:728
 msgid "Tuesday"
 msgstr "Ð?Ñ?оÑ?ник"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+msgid "Use s_ystem time zone"
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?_иÑ?Ñ?емнÑ?й Ñ?аÑ?овой поÑ?Ñ?"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:729
 msgid "Wednesday"
 msgstr "СÑ?еда"
 
 #. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Wee_k starts on:"
 msgstr "Ð?еделÑ? наÑ?инаеÑ?Ñ?Ñ? Ñ?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "Work days:"
 msgstr "РабоÑ?ие дни:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "_12 hour (AM/PM)"
 msgstr "12-Ñ?аÑ?овой (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
 msgid "_24 hour"
 msgstr "24-Ñ?аÑ?овой"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Ask for confirmation when deleting items"
 msgstr "Ð?апÑ?аÑ?иваÑ?Ñ? подÑ?веÑ?ждение пÑ?и Ñ?далении Ñ?леменÑ?ов"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
 msgid "_Compress weekends in month view"
 msgstr "УжимаÑ?Ñ? вÑ?Ñ?однÑ?е дни в пÑ?едÑ?Ñ?авлении меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
 msgid "_Day begins:"
 msgstr "_Ð?енÑ? наÑ?инаеÑ?Ñ?Ñ?:"
 
 #. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
 msgid "_Fri"
 msgstr "Ð?Ñ?Ñ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
 msgid "_Hide completed tasks after"
 msgstr "СкÑ?Ñ?ваÑ?Ñ? вÑ?полненнÑ?е задаÑ?и Ñ?еÑ?ез"
 
 #. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
 msgid "_Mon"
 msgstr "Ð?он"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
 msgid "_Overdue tasks:"
 msgstr "Ð?Ñ?оÑ?Ñ?оÑ?еннÑ?е задаÑ?и:"
 
 #. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
 msgid "_Sat"
 msgstr "СÑ?б"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
 msgid "_Show appointment end times in week and month view"
 msgstr "_Ð?Ñ?обÑ?ажаÑ?Ñ? вÑ?емÑ? оконÑ?аниÑ? вÑ?Ñ?Ñ?еÑ? в обзоÑ?е недели и меÑ?Ñ?Ñ?а"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
 msgid "_Time divisions:"
 msgstr "РазделиÑ?ели вÑ?емени:"
 
 #. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
 msgid "_Tue"
 msgstr "Ð?Ñ?Ñ?"
 
 #. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
 msgid "_Wed"
 msgstr "СÑ?д"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
 msgid "before every anniversary/birthday"
 msgstr "пеÑ?ед каждÑ?м Ñ?билеем/днÑ?м Ñ?ождениÑ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#. This is the last half of a user preference.&#10;"Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
 msgid "before every appointment"
 msgstr "пеÑ?ед каждой вÑ?Ñ?Ñ?еÑ?ей"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "Ð?оп_иÑ?оваÑ?Ñ? Ñ?одеÑ?жимое календаÑ?Ñ? локалÑ?но длÑ? авÑ?ономнÑ?Ñ? опеÑ?аÑ?ий"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "Ð?оп_иÑ?оваÑ?Ñ? Ñ?одеÑ?жимое Ñ?пиÑ?ка задаÑ? локалÑ?но длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "Ð?оп_иÑ?оваÑ?Ñ? Ñ?пиÑ?ок замеÑ?ок локалÑ?но длÑ? авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "_ЦвеÑ?:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:379
 msgid "Task List"
 msgstr "СпиÑ?ок задаÑ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "СпиÑ?ок замеÑ?ок"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "СвойÑ?Ñ?ва календаÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "Ð?овÑ?й календаÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?пиÑ?ка задаÑ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "Ð?овÑ?й Ñ?пиÑ?ок задаÑ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?пиÑ?ка замеÑ?ок"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "Ð?овÑ?й Ñ?пиÑ?ок замеÑ?ок"
 
@@ -6241,301 +4938,239 @@ msgstr "%s Ð?Ñ? ниÑ?его не изменили. Ð?бновиÑ?Ñ? Ñ?едак
 msgid "Validation error: %s"
 msgstr "Ð?Ñ?ибка пÑ?овеÑ?ки: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2365
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2349
 msgid " to "
 msgstr " к "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2369
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2353
 msgid " (Completed "
 msgstr " (Ð?авеÑ?Ñ?ено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2371
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2355
 msgid "Completed "
 msgstr "Ð?авеÑ?Ñ?ено "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2376
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2360
 msgid " (Due "
 msgstr " (к даÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2378
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2362
 msgid "Due "
 msgstr "Ð? даÑ?е"
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "Ð?ложенное Ñ?ообÑ?ение - %s"
+#: ../calendar/gui/dialogs/comp-editor.c:224
+msgid "Could not save attachments"
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? вложениÑ?"
 
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1786
-#: ../composer/e-msg-composer.c:2005
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d вложенное Ñ?ообÑ?ение"
-msgstr[1] "%d вложеннÑ?Ñ? Ñ?ообÑ?ениÑ?"
-msgstr[2] "%d вложеннÑ?Ñ? Ñ?ообÑ?ений"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2073
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1188 ../mail/message-list.c:2106
-msgid "_Move"
-msgstr "Ð?еÑ?е_меÑ?Ñ?иÑ?Ñ?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2075
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2108
-msgid "Cancel _Drag"
-msgstr "Ð?Ñ?мениÑ?Ñ? _пеÑ?еноÑ?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3316 ../mail/em-utils.c:373
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "вложение"
-
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:487
 msgid "Could not update object"
 msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? обÑ?екÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:582
 msgid "Edit Appointment"
 msgstr "Ð?змениÑ?Ñ? вÑ?Ñ?Ñ?еÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:589
 #, c-format
 msgid "Meeting - %s"
 msgstr "СобÑ?ание - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:591
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?а - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:597
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Ð?азнаÑ?еннаÑ? задаÑ?а - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:599
 #, c-format
 msgid "Task - %s"
 msgstr "Ð?адаÑ?а - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:604
 #, c-format
 msgid "Memo - %s"
 msgstr "Ð?амеÑ?ка - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:620
 msgid "No Summary"
 msgstr "Ð?еÑ? Ñ?водки"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:762
 msgid "Keep original item?"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? пеÑ?вонаÑ?алÑ?ное знаÑ?ение?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:968
 msgid "Click here to close the current window"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? закÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?ее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:975
 msgid "Copy selected text to the clipboard"
 msgstr "Ð?опиÑ?оваÑ?Ñ? вÑ?деленнÑ?й Ñ?екÑ?Ñ? в бÑ?Ñ?еÑ? обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:982
 msgid "Cut selected text to the clipboard"
 msgstr "Ð?Ñ?Ñ?езаÑ?Ñ? вÑ?деленнÑ?й Ñ?екÑ?Ñ? в бÑ?Ñ?еÑ? обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:989
 msgid "Click here to view help available"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? Ñ?пÑ?авкÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:996
 msgid "Paste text from the clipboard"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? Ñ?екÑ?Ñ? из бÑ?Ñ?еÑ?а обмена"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1017
 msgid "Click here to save the current window"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? Ñ?екÑ?Ñ?ее окно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1024
 msgid "Select all text"
 msgstr "Ð?Ñ?делиÑ?Ñ? веÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1031
 msgid "_Classification"
 msgstr "_Ð?лаÑ?Ñ?иÑ?икаÑ?иÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
+#: ../calendar/gui/dialogs/comp-editor.c:1045
+#: ../mail/mail-signature-editor.c:209
 #: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
 msgid "_File"
 msgstr "_Файл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1052
 #: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution.xml.h:46
 msgid "_Help"
 msgstr "_СпÑ?авка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1059
 msgid "_Insert"
 msgstr "_Ð?Ñ?Ñ?авиÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1066
 msgid "_Options"
 msgstr "_Ð?аÑ?амеÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/dialogs/comp-editor.c:1073 ../mail/em-folder-tree.c:2106
 #: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
 #: ../ui/evolution.xml.h:55
 msgid "_View"
 msgstr "_Ð?ид"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1083
+#: ../composer/e-composer-actions.c:315
 msgid "_Attachment..."
 msgstr "_Ð?ложение..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1085
 msgid "Click here to attach a file"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? вложиÑ?Ñ? Ñ?айл"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Categories"
 msgstr "_Ð?аÑ?егоÑ?ии"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1095
 msgid "Toggles whether to display categories"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение каÑ?егоÑ?ий"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1101
 msgid "Time _Zone"
 msgstr "ЧаÑ?овой _поÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1103
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение Ñ?аÑ?ового поÑ?Ñ?а"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Pu_blic"
 msgstr "Ð?Ñ?_блиÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1114
 msgid "Classify as public"
 msgstr "Ð?лаÑ?Ñ?иÑ?иÑ?иÑ?оваÑ?Ñ? как пÑ?блиÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1119
 msgid "_Private"
 msgstr "_Ð?иÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1121
 msgid "Classify as private"
 msgstr "Ð?лаÑ?Ñ?иÑ?иÑ?иÑ?оваÑ?Ñ? как лиÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1126
 msgid "_Confidential"
 msgstr "_Ð?онÑ?иденÑ?иалÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Classify as confidential"
 msgstr "Ð?лаÑ?Ñ?иÑ?иÑ?иÑ?оваÑ?Ñ? как конÑ?иденÑ?иалÑ?ное"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "R_ole Field"
 msgstr "Ð?оле «_Ð?олжноÑ?Ñ?Ñ?»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1138
 msgid "Toggles whether the Role field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение полÑ? «Ð?олжноÑ?Ñ?Ñ?»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1144
 msgid "_RSVP"
 msgstr "Ð?_Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение полÑ? «Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1152
 msgid "_Status Field"
 msgstr "Ð?оле _Ñ?оÑ?Ñ?оÑ?ниÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1154
 msgid "Toggles whether the Status field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение полÑ? «СоÑ?Ñ?оÑ?ние»"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "_Type Field"
 msgstr "Ð?оле _Ñ?ипа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1162
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение полÑ? Ñ?ипа Ñ?Ñ?аÑ?Ñ?ников"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1828
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1186
+#: ../composer/e-composer-private.c:67
 msgid "Recent _Documents"
 msgstr "Ð?едавние _докÑ?менÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1615
+#: ../composer/e-composer-actions.c:518
 msgid "Attach"
 msgstr "Ð?ложиÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1942
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> вложение"
-msgstr[1] "<b>%d</b> вложениÑ?"
-msgstr[2] "<b>%d</b> вложений"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1974
-msgid "Hide Attachment _Bar"
-msgstr "СкÑ?Ñ?Ñ?Ñ? _панелÑ? вложений"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1977
-#: ../calendar/gui/dialogs/comp-editor.c:2280
-msgid "Show Attachment _Bar"
-msgstr "Ð?оказаÑ?Ñ? _панелÑ? вложений"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2091
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "_УдалиÑ?Ñ?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2094
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "_Ð?обавиÑ?Ñ? вложение..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2302
-#: ../mail/em-format-html-display.c:2384
-msgid "Show Attachments"
-msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? вложениÑ?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2303
-msgid "Press space key to toggle attachment bar"
-msgstr "Ð?ажмиÑ?е клавиÑ?Ñ? \"Ð?Ñ?обел\" длÑ? пеÑ?еклÑ?Ñ?ениÑ? панели вложений"
+#: ../calendar/gui/dialogs/comp-editor.c:1670
+msgid "Save"
+msgstr "СоÑ?Ñ?аниÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2448
-#: ../calendar/gui/dialogs/comp-editor.c:2496
-#: ../calendar/gui/dialogs/comp-editor.c:3349
+#: ../calendar/gui/dialogs/comp-editor.c:1924
+#: ../calendar/gui/dialogs/comp-editor.c:1973
+#: ../calendar/gui/dialogs/comp-editor.c:2833
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ð?зменениÑ? Ñ?Ñ?ого Ñ?леменÑ?а бÑ?дÑ?Ñ? оÑ?веÑ?гнÑ?Ñ?Ñ?, еÑ?ли по Ñ?лекÑ?Ñ?онной поÑ?Ñ?е пÑ?идеÑ? "
 "обновление."
 
-#: ../calendar/gui/dialogs/comp-editor.c:3378
+#: ../calendar/gui/dialogs/comp-editor.c:2801 ../mail/em-utils.c:371
+#: ../plugins/prefer-plain/prefer-plain.c:91
+msgid "attachment"
+msgstr "вложение"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2862
 msgid "Unable to use current version!"
 msgstr "Ð?е Ñ?далоÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? Ñ?екÑ?Ñ?Ñ?Ñ? веÑ?Ñ?иÑ?!"
 
@@ -6608,7 +5243,7 @@ msgid "Contacts..."
 msgstr "Ð?онÑ?акÑ?Ñ?..."
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To:"
 msgstr "Ð?оÑ?Ñ?Ñ?иÑ?Ñ?:"
 
@@ -6635,7 +5270,7 @@ msgstr "СделаÑ?Ñ? Ñ?Ñ?о Ñ?обÑ?Ñ?ие повÑ?оÑ?Ñ?Ñ?Ñ?имÑ?Ñ?"
 #: ../calendar/gui/dialogs/event-editor.c:216
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../widgets/misc/e-send-options.glade.h:18
 msgid "Send Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? оÑ?пÑ?авки"
 
@@ -6672,87 +5307,108 @@ msgstr "Ð?апÑ?оÑ?иÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и длÑ? Ñ?
 msgid "Appoint_ment"
 msgstr "Ð?Ñ?Ñ?Ñ?е_Ñ?а"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2725
+#: ../calendar/gui/dialogs/event-page.c:748
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "СобÑ?Ñ?ие нелÑ?зÑ? измениÑ?Ñ?, поÑ?омÑ? Ñ?Ñ?о вÑ?бÑ?аннÑ?й календаÑ?Ñ? доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?"
+
+#: ../calendar/gui/dialogs/event-page.c:752
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "СобÑ?Ñ?Ñ?е нелÑ?зÑ? полноÑ?Ñ?Ñ?Ñ? измениÑ?Ñ?, поÑ?колÑ?кÑ? вÑ? не Ñ?влÑ?еÑ?еÑ?Ñ? оÑ?ганизаÑ?оÑ?ом"
+
+#: ../calendar/gui/dialogs/event-page.c:764
+#: ../calendar/gui/dialogs/event-page.c:2769
 msgid "This event has alarms"
 msgstr "ЭÑ?о Ñ?обÑ?Ñ?ие имееÑ? Ñ?игналÑ?"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Or_ganizer:"
 msgstr "Ð?Ñ?_ганизаÑ?оÑ?:"
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:874
 msgid "_Delegatees"
 msgstr "_Ð?Ñ?едÑ?Ñ?авиÑ?ели"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:876
 msgid "Atte_ndees"
 msgstr "_УÑ?аÑ?Ñ?ники"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1062
 msgid "Event with no start date"
 msgstr "СобÑ?Ñ?ие без даÑ?Ñ? наÑ?ала"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1065
 msgid "Event with no end date"
 msgstr "СобÑ?Ñ?ие без даÑ?Ñ? завеÑ?Ñ?ениÑ?"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/memo-page.c:654
+#: ../calendar/gui/dialogs/task-page.c:830
 msgid "Start date is wrong"
 msgstr "Ð?аÑ?а наÑ?ала невеÑ?на"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1246
 msgid "End date is wrong"
 msgstr "Ð?евеÑ?наÑ? даÑ?а завеÑ?Ñ?ениÑ?"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1269
 msgid "Start time is wrong"
 msgstr "Ð?евеÑ?ное вÑ?емÑ? наÑ?ала"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "End time is wrong"
 msgstr "Ð?евеÑ?ное вÑ?емÑ? завеÑ?Ñ?ениÑ?"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1438
+#: ../calendar/gui/dialogs/memo-page.c:695
+#: ../calendar/gui/dialogs/task-page.c:890
 msgid "The organizer selected no longer has an account."
 msgstr "Ð?Ñ?бÑ?аннÑ?й оÑ?ганизаÑ?оÑ? болÑ?Ñ?е не имееÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и."
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1444
+#: ../calendar/gui/dialogs/memo-page.c:701
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "An organizer is required."
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? оÑ?ганизаÑ?оÑ?."
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1469
+#: ../calendar/gui/dialogs/task-page.c:920
 msgid "At least one attendee is required."
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? как минимÑ?м один Ñ?Ñ?аÑ?Ñ?ник"
 
-#: ../calendar/gui/dialogs/event-page.c:1878
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1912
+#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:21
+msgid "_Remove"
+msgstr "_УдалиÑ?Ñ?"
+
+#: ../calendar/gui/dialogs/event-page.c:1913
+#: ../calendar/gui/dialogs/task-page.c:1220
 msgid "_Add "
 msgstr "_Ð?обавиÑ?Ñ? "
 
-#: ../calendar/gui/dialogs/event-page.c:2601
+#: ../calendar/gui/dialogs/event-page.c:2639
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ? «%s»."
 
-#: ../calendar/gui/dialogs/event-page.c:2645
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1806
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2683
+#: ../calendar/gui/dialogs/memo-page.c:910
+#: ../calendar/gui/dialogs/task-page.c:1825
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Ð?Ñ? дейÑ?Ñ?вÑ?еÑ?е оÑ? лиÑ?а %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2925
+#: ../calendar/gui/dialogs/event-page.c:2967
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -6760,7 +5416,7 @@ msgstr[0] "%d денÑ? до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[1] "%d днÑ? до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[2] "%d дней до вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../calendar/gui/dialogs/event-page.c:2931
+#: ../calendar/gui/dialogs/event-page.c:2973
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -6768,7 +5424,7 @@ msgstr[0] "%d Ñ?аÑ? до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[1] "%d Ñ?аÑ?а до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[2] "%d Ñ?аÑ?ов до вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../calendar/gui/dialogs/event-page.c:2937
+#: ../calendar/gui/dialogs/event-page.c:2979
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -6776,98 +5432,103 @@ msgstr[0] "%d минÑ?Ñ?а до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[1] "%d минÑ?Ñ?Ñ? до вÑ?Ñ?Ñ?еÑ?и"
 msgstr[2] "%d минÑ?Ñ? до вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../calendar/gui/dialogs/event-page.c:2950
+#: ../calendar/gui/dialogs/event-page.c:2992
 msgid "Customize"
 msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ?"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 day before appointment"
-msgstr "1 денÑ? до вÑ?Ñ?Ñ?еÑ?и"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "1 hour before appointment"
-msgstr "1 Ñ?аÑ? до вÑ?Ñ?Ñ?еÑ?и"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "15 minutes before appointment"
-msgstr "15 минÑ?Ñ? до вÑ?Ñ?Ñ?еÑ?и"
+msgid ""
+"15 minutes before appointment\n"
+"1 hour before appointment\n"
+"1 day before appointment"
+msgstr ""
 
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "УÑ?_аÑ?Ñ?ники..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/e-meeting-list-view.c:151
+msgid "Attendees"
+msgstr "УÑ?аÑ?Ñ?ники"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:9
 msgid "Custom Alarm:"
 msgstr "Ð?Ñ?Ñ?гой Ñ?игнал:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "Ð?пиÑ?ание Ñ?обÑ?Ñ?иÑ?"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 #: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "Ð?оÑ?оÑ?ко:"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "_Сигнал"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Ð?пиÑ?ание:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:372
+#: ../plugins/exchange-operations/exchange-calendar.c:247
+#: ../plugins/exchange-operations/exchange-contacts.c:239
+msgid "_Location:"
+msgstr "_РаÑ?положение:"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:18
 msgid "_Time:"
 msgstr "_Ð?Ñ?емÑ?:"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
-msgid "for"
-msgstr "в"
+#: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:10
+#: ../mail/mail-config.glade.h:192 ../mail/mail-dialogs.glade.h:21
+#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:5
+#: ../smime/gui/smime-ui.glade.h:49
+msgid ""
+"a\n"
+"b"
+msgstr ""
+"a\n"
+"b"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
-msgid "until"
+#, fuzzy
+msgid ""
+"for\n"
+"until"
 msgstr "до"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>Ð?оÑ?_еÑ?иÑ?ели</b> "
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "Ð?_змениÑ?Ñ? оÑ?ганизаÑ?оÑ?а"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "Ð?о_нÑ?акÑ?Ñ?..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "Ð?Ñ?ганизаÑ?оÑ?:"
-
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2485
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2469
 msgid "Memo"
 msgstr "Ð?амеÑ?ка"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:347
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Ð?амеÑ?кÑ? нелÑ?зÑ? измениÑ?Ñ?, поÑ?колÑ?кÑ? вÑ?бÑ?аннÑ?й Ñ?пиÑ?ок замеÑ?ок доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?"
+
+#: ../calendar/gui/dialogs/memo-page.c:351
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Ð?амеÑ?кÑ? нелÑ?зÑ? полноÑ?Ñ?Ñ?Ñ? измениÑ?Ñ?, поÑ?колÑ?кÑ? вÑ? не Ñ?влÑ?еÑ?еÑ?Ñ? оÑ?ганизаÑ?оÑ?ом"
+
+#: ../calendar/gui/dialogs/memo-page.c:871
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? замеÑ?ки в «%s»."
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1567
-#: ../mail/em-format-html.c:1625 ../mail/em-format-html.c:1651
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:887
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1566
+#: ../mail/em-format-html.c:1624 ../mail/em-format-html.c:1649
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:925
+#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:20
 msgid "To"
 msgstr "Ð?омÑ?"
 
@@ -6881,7 +5542,7 @@ msgid "T_o:"
 msgstr "_Ð?омÑ?:"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:380
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "_Ð?Ñ?Ñ?ппа:"
@@ -6906,23 +5567,23 @@ msgstr "Ð?Ñ? изменÑ?еÑ?е повÑ?оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? задаÑ?Ñ?. ЧÑ?о
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Ð?Ñ? изменÑ?еÑ?е повÑ?оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? замеÑ?кÑ?. ЧÑ?о именно вÑ? Ñ?оÑ?иÑ?е измениÑ?Ñ??"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "ТолÑ?ко Ñ?Ñ?Ñ? запиÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "ЭÑ?Ñ? и пÑ?едÑ?дÑ?Ñ?ие запиÑ?и"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "ЭÑ?Ñ? и поÑ?ледÑ?Ñ?Ñ?ие запиÑ?и"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "Ð?Ñ?е запиÑ?и"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:563
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ЭÑ?а вÑ?Ñ?Ñ?еÑ?а имееÑ? пÑ?авила повÑ?оÑ?ениÑ?, не Ñ?едакÑ?иÑ?Ñ?емÑ?е в Evolution."
 
@@ -6944,7 +5605,7 @@ msgstr "в"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "пеÑ?вÑ?й"
 
@@ -6953,7 +5614,7 @@ msgstr "пеÑ?вÑ?й"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "вÑ?оÑ?ой"
 
@@ -6961,7 +5622,7 @@ msgstr "вÑ?оÑ?ой"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "Ñ?Ñ?еÑ?ий"
 
@@ -6969,21 +5630,29 @@ msgstr "Ñ?Ñ?еÑ?ий"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "Ñ?еÑ?веÑ?Ñ?Ñ?й"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
+msgid "fifth"
+msgstr "пÑ?Ñ?Ñ?й"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "поÑ?ледний"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Ð?Ñ?Ñ?гаÑ? даÑ?а"
 
@@ -6991,7 +5660,7 @@ msgstr "Ð?Ñ?Ñ?гаÑ? даÑ?а"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Ñ? 1-го по 10-е"
 
@@ -6999,7 +5668,7 @@ msgstr "Ñ? 1-го по 10-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "Ñ? 11-го по 20-е"
 
@@ -7007,45 +5676,45 @@ msgstr "Ñ? 11-го по 20-е"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "Ñ? 21-го по 31-е"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "денÑ?"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
 msgid "on the"
 msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1410
 msgid "occurrences"
 msgstr "Ñ?лÑ?Ñ?аи"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2105
 msgid "Add exception"
 msgstr "Ð?обавиÑ?Ñ? иÑ?клÑ?Ñ?ение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2146
 msgid "Could not get a selection to modify."
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? вÑ?деление длÑ? изменениÑ?."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2152
 msgid "Modify exception"
 msgstr "Ð?змениÑ?Ñ? иÑ?клÑ?Ñ?ение"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2196
 msgid "Could not get a selection to delete."
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? изменение длÑ? Ñ?далениÑ?."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2320
 msgid "Date/Time"
 msgstr "Ð?аÑ?а/Ð?Ñ?емÑ?"
 
@@ -7054,7 +5723,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>Ð?Ñ?клÑ?Ñ?ениÑ?</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?</b>"
 
@@ -7062,50 +5731,54 @@ msgstr "<b>Ð?Ñ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?</b>"
 msgid "<b>Recurrence</b>"
 msgstr "<b>Ð?овÑ?оÑ?ение</b>"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
 msgid "Every"
 msgstr "Ð?аждÑ?й"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "This appointment rec_urs"
 msgstr "ЭÑ?а вÑ?Ñ?Ñ?еÑ?а повÑ?оÑ?_Ñ?еÑ?Ñ?Ñ?"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-msgid "forever"
-msgstr "вÑ?егда"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
-msgid "month(s)"
-msgstr "меÑ?Ñ?Ñ?Ñ?"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid ""
+"day(s)\n"
+"week(s)\n"
+"month(s)\n"
+"year(s)"
+msgstr ""
+"дней\n"
+"неделÑ?\n"
+"меÑ?Ñ?Ñ?ев\n"
+"леÑ?"
 
 #. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
-msgid "week(s)"
-msgstr "неделÑ?"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
-msgid "year(s)"
-msgstr "год(леÑ?)"
+#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:17
+msgid ""
+"for\n"
+"until\n"
+"forever"
+msgstr ""
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
 msgstr "Ð?оÑ?лаÑ?Ñ? мои Ñ?игналÑ? вмеÑ?Ñ?е Ñ? Ñ?обÑ?Ñ?ием"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/send-comp.c:162
+#, fuzzy
+msgid "Notify new attendees _only"
+msgstr "Ð?пове_Ñ?аÑ?Ñ? о новÑ?Ñ? Ñ?ообÑ?ениÑ?Ñ? Ñ?олÑ?ко во «Ð?Ñ?одÑ?Ñ?иÑ?»"
+
+#: ../calendar/gui/dialogs/task-details-page.c:376
+#: ../calendar/gui/dialogs/task-details-page.c:396
 msgid "Completed date is wrong"
 msgstr "Ð?аÑ?а вÑ?полнениÑ? некоÑ?Ñ?екÑ?на"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:481
 msgid "Web Page"
 msgstr "Ð?еб-Ñ?Ñ?Ñ?аниÑ?а"
 
@@ -7117,74 +5790,34 @@ msgstr "<span weight=\"bold\">Разное</span>"
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">СоÑ?Ñ?оÑ?ние</span>"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2561 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
-msgid "Completed"
-msgstr "Ð?авеÑ?Ñ?ена"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1065
-msgid "High"
-msgstr "Ð?Ñ?Ñ?окий"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2558
-msgid "In Progress"
-msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ?"
+#: ../calendar/gui/dialogs/task-details-page.glade.h:3
+msgid ""
+"High\n"
+"Normal\n"
+"Low\n"
+"Undefined"
+msgstr ""
+"Ð?Ñ?Ñ?окий\n"
+"Ð?оÑ?малÑ?нÑ?й\n"
+"Ð?изкий\n"
+"Ð?еопÑ?еделÑ?ннÑ?й"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:590 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1063
-msgid "Low"
-msgstr "Ð?изкий"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1007 ../calendar/gui/e-calendar-table.c:589
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1064
-msgid "Normal"
-msgstr "Ð?оÑ?малÑ?нÑ?й"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2555
-#: ../calendar/gui/tasktypes.xml.h:18
-msgid "Not Started"
-msgstr "Ð?е наÑ?алаÑ?Ñ?"
+msgid ""
+"Not Started\n"
+"In Progress\n"
+"Completed\n"
+"Canceled"
+msgstr ""
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "P_ercent complete:"
 msgstr "Ð?Ñ?полн_ено (%):"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
 msgid "Stat_us:"
 msgstr "СоÑ?Ñ?_оÑ?ние:"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:591 ../calendar/gui/tasktypes.xml.h:24
-msgid "Undefined"
-msgstr "Ð?е опÑ?еделено"
-
 #: ../calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Date completed:"
 msgstr "_Ð?аÑ?а вÑ?полнениÑ?:"
@@ -7207,7 +5840,7 @@ msgid "Click to change or view the status details of the task"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? измениÑ?Ñ? или пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? деÑ?али задаÑ?и"
 
 #: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../composer/e-composer-actions.c:371
 msgid "_Send Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? _оÑ?пÑ?авки"
 
@@ -7219,16 +5852,24 @@ msgstr "_Ð?адаÑ?а"
 msgid "Task Details"
 msgstr "Ð?пиÑ?ание задаÑ?и"
 
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Ð?адаÑ?Ñ? нелÑ?зÑ? измениÑ?Ñ?, поÑ?колÑ?кÑ? вÑ?бÑ?аннÑ?й Ñ?пиÑ?ок задаÑ? доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Ð?адаÑ?Ñ? нелÑ?зÑ? измениÑ?Ñ?, поÑ?колÑ?кÑ? вÑ? не Ñ?влÑ?еÑ?еÑ?Ñ? оÑ?ганизаÑ?оÑ?ом"
+
+#: ../calendar/gui/dialogs/task-page.c:388
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Organi_zer:"
 msgstr "Ð?Ñ?гани_заÑ?оÑ?:"
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:803
 msgid "Due date is wrong"
 msgstr "Ð?аÑ?а вÑ?полнениÑ? некоÑ?Ñ?екÑ?на"
 
-#: ../calendar/gui/dialogs/task-page.c:1763
+#: ../calendar/gui/dialogs/task-page.c:1782
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? задаÑ?и в «%s»."
@@ -7327,80 +5968,161 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s длÑ? неизвеÑ?Ñ?ного Ñ?ипа пеÑ?еклÑ?Ñ?аÑ?елÑ?"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3273
+#: ../calendar/gui/e-attachment-handler-calendar.c:258
+msgid "I_mport"
+msgstr "_Ð?мпоÑ?Ñ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:340
+msgid "Select a Calendar"
+msgstr "Ð?Ñ?боÑ? календаÑ?Ñ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:367
+msgid "Select a Task List"
+msgstr "Ð?Ñ?боÑ? Ñ?пиÑ?ка задаÑ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:377
+msgid "I_mport to Calendar"
+msgstr "_Ð?мпоÑ?Ñ?иÑ?оваÑ?Ñ? в календаÑ?Ñ?"
+
+#: ../calendar/gui/e-attachment-handler-calendar.c:384
+msgid "I_mport to Tasks"
+msgstr "_Ð?мпоÑ?Ñ?иÑ?оваÑ?Ñ? в задаÑ?и"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:68
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3210
 #, c-format
 msgid "Click to open %s"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? оÑ?кÑ?Ñ?Ñ?Ñ? %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-memo-preview.c:127
+#: ../calendar/gui/e-cal-component-preview.c:170 ../filter/filter-rule.c:863
 msgid "Untitled"
 msgstr "Ð?еозаглавленное"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
+#: ../calendar/gui/e-cal-component-memo-preview.c:178
+#: ../calendar/gui/e-cal-component-preview.c:209
+#: ../calendar/gui/e-cal-component-preview.c:220
 msgid "Start Date:"
 msgstr "Ð?аÑ?а наÑ?ала:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
+#: ../calendar/gui/e-cal-component-memo-preview.c:191
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:75
 msgid "Description:"
 msgstr "Ð?пиÑ?ание:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
+#: ../calendar/gui/e-cal-component-memo-preview.c:215
 #: ../calendar/gui/e-cal-component-preview.c:309
 msgid "Web Page:"
 msgstr "Ð?еб-Ñ?Ñ?Ñ?аниÑ?а:"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
+#: ../calendar/gui/e-cal-component-preview.c:202
+#: ../calendar/gui/e-itip-control.c:1154
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "Сводка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:231
 msgid "Due Date:"
 msgstr "Ð?аÑ?а вÑ?полнениÑ?:"
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1052
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-itip-control.c:1178
+#: ../plugins/exchange-operations/exchange-account-setup.c:283
+#: ../plugins/itip-formatter/itip-view.c:1054
 msgid "Status:"
 msgstr "СоÑ?Ñ?оÑ?ние:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:242
+#: ../calendar/gui/e-cal-model-tasks.c:359
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-cal-model-tasks.c:752
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:659 ../calendar/gui/print.c:2542
+msgid "In Progress"
+msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ?"
+
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
+#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-model-tasks.c:361
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:660 ../calendar/gui/e-itip-control.c:939
+#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
+#: ../calendar/gui/print.c:2545 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:361
+msgid "Completed"
+msgstr "Ð?авеÑ?Ñ?ена"
+
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model-tasks.c:357
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:658 ../calendar/gui/print.c:2539
+#: ../calendar/gui/tasktypes.xml.h:18
+msgid "Not Started"
+msgstr "Ð?е наÑ?алаÑ?Ñ?"
+
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Priority:"
 msgstr "Ð?Ñ?иоÑ?иÑ?еÑ?:"
 
+#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-calendar-table.c:585 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1064
+msgid "High"
+msgstr "Ð?Ñ?Ñ?окий"
+
+#: ../calendar/gui/e-cal-component-preview.c:266
+#: ../calendar/gui/e-cal-model.c:1076 ../calendar/gui/e-calendar-table.c:586
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+msgid "Normal"
+msgstr "Ð?оÑ?малÑ?нÑ?й"
+
+#: ../calendar/gui/e-cal-component-preview.c:268
+#: ../calendar/gui/e-calendar-table.c:587 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1062
+msgid "Low"
+msgstr "Ð?изкий"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:362
+msgid "Created"
+msgstr "Создано"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "Ð?аÑ?а завеÑ?Ñ?ениÑ?"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "Ð?оÑ?леднее изменение"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Ð?аÑ?а наÑ?ала"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:640
+#: ../calendar/gui/e-calendar-table.c:637
 msgid "Free"
 msgstr "Свободен"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:641
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:391
 msgid "Busy"
 msgstr "Ð?анÑ?Ñ?"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:625
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7410,225 +6132,200 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/e-meeting-store.c:742
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ð?а"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1013
+#: ../calendar/gui/e-cal-model-tasks.c:1027 ../calendar/gui/e-cal-model.c:1082
 #: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-meeting-store.c:163
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "Ð?еÑ?"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-cal-model.c:372 ../calendar/gui/e-itip-control.c:1195
+#: ../calendar/gui/e-itip-control.c:1333
 #: ../calendar/gui/e-meeting-list-view.c:166
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1342
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
+#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1339
+#: ../plugins/itip-formatter/itip-formatter.c:449
+#: ../plugins/itip-formatter/itip-formatter.c:2233
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
 #: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "Ð?еизвеÑ?Ñ?но"
 
-#: ../calendar/gui/e-cal-model.c:1009
+#: ../calendar/gui/e-cal-model.c:1078
 msgid "Recurring"
 msgstr "Ð?овÑ?оÑ?ение"
 
-#: ../calendar/gui/e-cal-model.c:1011
+#: ../calendar/gui/e-cal-model.c:1080
 msgid "Assigned"
 msgstr "Ð?азнаÑ?ено"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2217
-msgid "Select folder to save selected attachments..."
-msgstr "Ð?Ñ?беÑ?иÑ?е папкÑ? длÑ? Ñ?оÑ?Ñ?анениÑ? вÑ?деленнÑ?Ñ? вложений..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1600
-#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:939
-#: ../mail/em-folder-view.c:1338 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "Со_Ñ?Ñ?аниÑ?Ñ? как..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "УÑ?Ñ?ановиÑ?Ñ? как _Ñ?он"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "_СоÑ?Ñ?аниÑ?Ñ? вÑ?деленное"
-
-#: ../calendar/gui/e-cal-popup.c:431 ../mail/em-popup.c:827
-#, c-format
-msgid "Open in %s..."
-msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? в пÑ?огÑ?амме %s..."
-
-#: ../calendar/gui/e-calendar-table.c:336
+#: ../calendar/gui/e-calendar-table.c:335
 msgid "* No Summary *"
 msgstr "* Ð?еÑ? кÑ?аÑ?кого опиÑ?аниÑ? *"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:372
-#: ../calendar/gui/e-calendar-view.c:2437
+#: ../calendar/gui/e-calendar-table.c:371
+#: ../calendar/gui/e-calendar-view.c:2429
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?: %s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:375
-#: ../calendar/gui/e-calendar-view.c:2441
+#: ../calendar/gui/e-calendar-table.c:374
+#: ../calendar/gui/e-calendar-view.c:2433
 #, c-format
 msgid "Organizer: %s"
 msgstr "Ð?Ñ?ганизаÑ?оÑ?: %s"
 
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:405
 msgid "Start: "
 msgstr "Ð?аÑ?ало: "
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:417
 msgid "Due: "
 msgstr "Ð?авеÑ?Ñ?ение: "
 
-#: ../calendar/gui/e-calendar-table.c:610
+#: ../calendar/gui/e-calendar-table.c:588 ../calendar/gui/tasktypes.xml.h:24
+msgid "Undefined"
+msgstr "Ð?е опÑ?еделено"
+
+#: ../calendar/gui/e-calendar-table.c:607
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:611
+#: ../calendar/gui/e-calendar-table.c:608
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:612
+#: ../calendar/gui/e-calendar-table.c:609
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:613
+#: ../calendar/gui/e-calendar-table.c:610
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:614
+#: ../calendar/gui/e-calendar-table.c:611
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:615
+#: ../calendar/gui/e-calendar-table.c:612
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:616
+#: ../calendar/gui/e-calendar-table.c:613
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:617
+#: ../calendar/gui/e-calendar-table.c:614
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:618
+#: ../calendar/gui/e-calendar-table.c:615
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:619
+#: ../calendar/gui/e-calendar-table.c:616
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:620
+#: ../calendar/gui/e-calendar-table.c:617
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-table.c:897
+#: ../calendar/gui/e-calendar-view.c:659 ../calendar/gui/e-memo-table.c:449
 msgid "Deleting selected objects"
 msgstr "Удаление вÑ?деленнÑ?Ñ? обÑ?екÑ?ов"
 
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-memo-table.c:654
 msgid "Updating objects"
 msgstr "Ð?бновление обÑ?екÑ?ов"
 
-#: ../calendar/gui/e-calendar-table.c:1371
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:833
-#: ../composer/e-composer-actions.c:275
+#: ../calendar/gui/e-calendar-table.c:1364
+#: ../calendar/gui/e-calendar-view.c:1333 ../calendar/gui/e-memo-table.c:828
+#: ../composer/e-composer-actions.c:219
 msgid "Save as..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
 
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1796
+#: ../calendar/gui/e-calendar-table.c:1588
+#: ../calendar/gui/e-calendar-view.c:1789
 msgid "New _Task"
 msgstr "Ð?оваÑ? _задаÑ?а"
 
-#: ../calendar/gui/e-calendar-table.c:1599 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-table.c:1592 ../calendar/gui/e-memo-table.c:933
 msgid "Open _Web Page"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? _веб-Ñ?Ñ?Ñ?аниÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1799 ../calendar/gui/e-memo-table.c:940
+#: ../calendar/gui/e-calendar-table.c:1593
+#: ../calendar/gui/e-calendar-view.c:1807 ../calendar/gui/e-memo-table.c:934
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+msgid "_Save As..."
+msgstr "Со_Ñ?Ñ?аниÑ?Ñ? как..."
+
+#: ../calendar/gui/e-calendar-table.c:1594
+#: ../calendar/gui/e-calendar-view.c:1792 ../calendar/gui/e-memo-table.c:935
 msgid "P_rint..."
 msgstr "_Ð?еÑ?аÑ?Ñ?..."
 
-#: ../calendar/gui/e-calendar-table.c:1605
-#: ../calendar/gui/e-calendar-view.c:1819 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-table.c:1598
+#: ../calendar/gui/e-calendar-view.c:1812 ../calendar/gui/e-memo-table.c:939
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ð?Ñ?Ñ?езаÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1607
-#: ../calendar/gui/e-calendar-view.c:1802
-#: ../calendar/gui/e-calendar-view.c:1821 ../calendar/gui/e-memo-table.c:946
+#: ../calendar/gui/e-calendar-table.c:1600
+#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1814 ../calendar/gui/e-memo-table.c:941
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "Ð?Ñ?Ñ?_авиÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1611 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1604 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "_Ð?азнаÑ?иÑ?Ñ? задаÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1612 ../calendar/gui/e-memo-table.c:950
+#: ../calendar/gui/e-calendar-table.c:1605 ../calendar/gui/e-memo-table.c:945
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "_Ð?еÑ?еÑ?лаÑ?Ñ? как iCalendar"
 
-#: ../calendar/gui/e-calendar-table.c:1613
+#: ../calendar/gui/e-calendar-table.c:1606
 msgid "_Mark as Complete"
 msgstr "Ð?о_меÑ?иÑ?Ñ? как вÑ?полненное"
 
-#: ../calendar/gui/e-calendar-table.c:1614
+#: ../calendar/gui/e-calendar-table.c:1607
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ð?о_меÑ?иÑ?Ñ? вÑ?бÑ?аннÑ?Ñ? задаÑ?Ñ? как вÑ?полненнÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-table.c:1615
+#: ../calendar/gui/e-calendar-table.c:1608
 msgid "_Mark as Incomplete"
 msgstr "Ð?о_меÑ?иÑ?Ñ? как невÑ?полненнÑ?е"
 
-#: ../calendar/gui/e-calendar-table.c:1616
+#: ../calendar/gui/e-calendar-table.c:1609
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "Ð?о_меÑ?иÑ?Ñ? вÑ?бÑ?аннÑ?е задаÑ?и как вÑ?полненнÑ?е"
 
-#: ../calendar/gui/e-calendar-table.c:1621
+#: ../calendar/gui/e-calendar-table.c:1614
 msgid "_Delete Selected Tasks"
 msgstr "У_далиÑ?Ñ? вÑ?деленнÑ?е задаÑ?и"
 
-#: ../calendar/gui/e-calendar-table.c:1858
+#: ../calendar/gui/e-calendar-table.c:1849
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? добавиÑ?Ñ? задаÑ?Ñ?"
@@ -7646,167 +6343,167 @@ msgstr "Ð?авеÑ?Ñ?ена"
 msgid "Completion date"
 msgstr "Ð?аÑ?а вÑ?полнениÑ?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "СÑ?ок вÑ?полнениÑ?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Priority"
 msgstr "Ð?Ñ?иоÑ?иÑ?еÑ?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "Ð?аÑ?а наÑ?ала"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2345
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:2337
+#: ../calendar/gui/e-meeting-list-view.c:601
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "СоÑ?Ñ?оÑ?ние"
 
-#: ../calendar/gui/e-calendar-view.c:1482
+#: ../calendar/gui/e-calendar-view.c:1478
 msgid "Moving items"
 msgstr "Ð?еÑ?емеÑ?ение Ñ?леменÑ?ов"
 
-#: ../calendar/gui/e-calendar-view.c:1484
+#: ../calendar/gui/e-calendar-view.c:1480
 msgid "Copying items"
 msgstr "Ð?опиÑ?ование Ñ?леменÑ?ов"
 
-#: ../calendar/gui/e-calendar-view.c:1793
+#: ../calendar/gui/e-calendar-view.c:1786
 msgid "New _Appointment..."
 msgstr "Ð?оваÑ? _вÑ?Ñ?Ñ?еÑ?а..."
 
-#: ../calendar/gui/e-calendar-view.c:1794
+#: ../calendar/gui/e-calendar-view.c:1787
 msgid "New All Day _Event"
 msgstr "Ð?овое ежедневное Ñ?обÑ?Ñ?ие"
 
-#: ../calendar/gui/e-calendar-view.c:1795
+#: ../calendar/gui/e-calendar-view.c:1788
 msgid "New _Meeting"
 msgstr "Ð?овое _Ñ?обÑ?ание"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1806
+#: ../calendar/gui/e-calendar-view.c:1799
 msgid "_Current View"
 msgstr "_ТекÑ?Ñ?ий вид"
 
-#: ../calendar/gui/e-calendar-view.c:1808
+#: ../calendar/gui/e-calendar-view.c:1801
 msgid "Select T_oday"
 msgstr "Ð?Ñ?делиÑ?Ñ? _Ñ?егоднÑ?Ñ?ний денÑ?"
 
-#: ../calendar/gui/e-calendar-view.c:1809
+#: ../calendar/gui/e-calendar-view.c:1802
 msgid "_Select Date..."
 msgstr "Ð?Ñ?делиÑ?Ñ? _даÑ?Ñ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1815
+#: ../calendar/gui/e-calendar-view.c:1808
 msgid "Pri_nt..."
 msgstr "_Ð?еÑ?аÑ?Ñ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1818
 msgid "Cop_y to Calendar..."
 msgstr "Ð?оп_иÑ?оваÑ?Ñ? в календаÑ?Ñ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1819
 msgid "Mo_ve to Calendar..."
 msgstr "Ð?еÑ?е_меÑ?Ñ?иÑ?Ñ? в календаÑ?Ñ?..."
 
-#: ../calendar/gui/e-calendar-view.c:1827
+#: ../calendar/gui/e-calendar-view.c:1820
 msgid "_Delegate Meeting..."
 msgstr "_Ð?оÑ?Ñ?Ñ?иÑ?Ñ? Ñ?обÑ?ание..."
 
-#: ../calendar/gui/e-calendar-view.c:1828
+#: ../calendar/gui/e-calendar-view.c:1821
 msgid "_Schedule Meeting..."
 msgstr "_Ð?азнаÑ?иÑ?Ñ? Ñ?обÑ?ание..."
 
-#: ../calendar/gui/e-calendar-view.c:1829
+#: ../calendar/gui/e-calendar-view.c:1822
 msgid "_Forward as iCalendar..."
 msgstr "_Ð?еÑ?еÑ?лаÑ?Ñ? как iCalendar..."
 
-#: ../calendar/gui/e-calendar-view.c:1830
+#: ../calendar/gui/e-calendar-view.c:1823
 msgid "_Reply"
 msgstr "_Ð?Ñ?веÑ?иÑ?Ñ?"
 
-#: ../calendar/gui/e-calendar-view.c:1831 ../mail/em-folder-view.c:1332
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1824
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:78
 msgid "Reply to _All"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ? _вÑ?ем"
 
-#: ../calendar/gui/e-calendar-view.c:1836
+#: ../calendar/gui/e-calendar-view.c:1829
 msgid "Make this Occurrence _Movable"
 msgstr "СделаÑ?Ñ? Ñ?Ñ?о вÑ?ождение пеÑ?е_меÑ?аемÑ?м"
 
-#: ../calendar/gui/e-calendar-view.c:1837 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1830 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "УдалиÑ?Ñ? Ñ?Ñ?о вÑ?ождение"
 
-#: ../calendar/gui/e-calendar-view.c:1838
+#: ../calendar/gui/e-calendar-view.c:1831
 msgid "Delete _All Occurrences"
 msgstr "УдалиÑ?Ñ? вÑ?е вÑ?ождениÑ?"
 
-#: ../calendar/gui/e-calendar-view.c:2292
-#: ../calendar/gui/e-itip-control.c:1186
+#: ../calendar/gui/e-calendar-view.c:2284
+#: ../calendar/gui/e-itip-control.c:1183
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
+#: ../plugins/itip-formatter/itip-formatter.c:2221
 msgid "Accepted"
 msgstr "Ð?Ñ?инÑ?Ñ?о"
 
-#: ../calendar/gui/e-calendar-view.c:2293
-#: ../calendar/gui/e-itip-control.c:1194
+#: ../calendar/gui/e-calendar-view.c:2285
+#: ../calendar/gui/e-itip-control.c:1191
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
+#: ../plugins/itip-formatter/itip-formatter.c:2227
 msgid "Declined"
 msgstr "Ð?Ñ?клонено"
 
-#: ../calendar/gui/e-calendar-view.c:2294
+#: ../calendar/gui/e-calendar-view.c:2286
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
+#: ../calendar/gui/e-meeting-time-sel.c:390
 msgid "Tentative"
 msgstr "ЭкÑ?пеÑ?именÑ?алÑ?нÑ?й"
 
-#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2287
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
+#: ../plugins/itip-formatter/itip-formatter.c:2230
 msgid "Delegated"
 msgstr "Ð?оÑ?Ñ?Ñ?ено"
 
-#: ../calendar/gui/e-calendar-view.c:2296
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Needs action"
 msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? дейÑ?Ñ?вие"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2457 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-calendar-view.c:2449 ../calendar/gui/print.c:2501
 #, c-format
 msgid "Location: %s"
 msgstr "Ð?дÑ?еÑ?: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2491
+#: ../calendar/gui/e-calendar-view.c:2480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ð?Ñ?емÑ?: %s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:102
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:105
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:113
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7819,12 +6516,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:747
 #, c-format
 msgid "%02i minute divisions"
 msgstr "Ð?елениÑ? Ñ?еÑ?ез %02i минÑ?Ñ?"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:768
 msgid "Show the second time zone"
 msgstr "Ð?оказÑ?ваÑ?Ñ? вÑ?оÑ?ой Ñ?аÑ?овой поÑ?Ñ?"
 
@@ -7834,34 +6531,34 @@ msgstr "Ð?оказÑ?ваÑ?Ñ? вÑ?оÑ?ой Ñ?аÑ?овой поÑ?Ñ?"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:851 ../calendar/gui/e-day-view.c:1582
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1666
 msgid "%A %d %B"
 msgstr "%A, %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/print.c:825
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/print.c:827
 msgid "pm"
 msgstr "pm"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2321
+#: ../calendar/gui/e-day-view.c:2309
 #, c-format
 msgid "Week %d"
 msgstr "Ð?еделÑ?: %d"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:758
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ð?а. (Сложное повÑ?оÑ?ение)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7869,7 +6566,7 @@ msgstr[0] "Ð?аждÑ?й %d денÑ?"
 msgstr[1] "Ð?аждÑ?е %d днÑ?"
 msgstr[2] "Ð?аждÑ?е %d дней"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:788
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7877,7 +6574,7 @@ msgstr[0] "Ð?аждÑ?Ñ? %d неделÑ?"
 msgstr[1] "Ð?аждÑ?е %d недели"
 msgstr[2] "Ð?аждÑ?е %d неделÑ?"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7886,21 +6583,21 @@ msgstr[1] "Ð?аждÑ?е %d недели в "
 msgstr[2] "Ð?аждÑ?е %d неделÑ? в "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:806
 msgid " and "
 msgstr " и "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:815
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:842
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7908,7 +6605,7 @@ msgstr[0] "каждÑ?й %d меÑ?Ñ?Ñ?"
 msgstr[1] "каждÑ?е %d меÑ?Ñ?Ñ?а"
 msgstr[2] "каждÑ?е %d меÑ?Ñ?Ñ?ев"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:854
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7916,7 +6613,7 @@ msgstr[0] "Ð?аждÑ?й %d год"
 msgstr[1] "Ð?аждÑ?е %d года"
 msgstr[2] "Ð?аждÑ?е %d леÑ?"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:867
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
@@ -7925,36 +6622,36 @@ msgstr[1] "вÑ?его %d Ñ?аза"
 msgstr[2] "вÑ?его %d Ñ?аз"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:878
 msgid ", ending on "
 msgstr ", заканÑ?иваеÑ?Ñ?Ñ? на"
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:900
 msgid "Starts"
 msgstr "Ð?аÑ?инаеÑ?Ñ?Ñ?"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:914
 msgid "Ends"
 msgstr "Ð?аканÑ?иваеÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:954
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "Due"
 msgstr "СÑ?ок завеÑ?Ñ?ениÑ?"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:995 ../calendar/gui/e-itip-control.c:1052
 msgid "iCalendar Information"
 msgstr "СведениÑ? iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1012
 msgid "iCalendar Error"
 msgstr "Ð?Ñ?ибка iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
+#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
+#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
 #: ../plugins/itip-formatter/itip-view.c:346
 #: ../plugins/itip-formatter/itip-view.c:347
 #: ../plugins/itip-formatter/itip-view.c:434
@@ -7965,7 +6662,7 @@ msgid "An unknown person"
 msgstr "Ð?еизвеÑ?Ñ?ное лиÑ?о"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1135
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7973,284 +6670,279 @@ msgstr ""
 "<b> Ð?еÑ?еÑ?моÑ?Ñ?иÑ?е Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? инÑ?оÑ?маÑ?иÑ? и вÑ?беÑ?иÑ?е дейÑ?Ñ?вие из Ñ?аÑ?положенного "
 "ниже менÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2224
 msgid "Tentatively Accepted"
 msgstr "ЭкÑ?пеÑ?именÑ?алÑ?но пÑ?инÑ?Ñ?Ñ?й"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1274
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
-msgstr ""
-"СобÑ?ание бÑ?ло оÑ?менено, но оно не можеÑ? бÑ?Ñ?Ñ? найдено в ваÑ?иÑ? календаÑ?Ñ?Ñ?"
+msgstr "СобÑ?ание бÑ?ло оÑ?менено, но оно не можеÑ? бÑ?Ñ?Ñ? найдено в ваÑ?иÑ? календаÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:1280
-msgid ""
-"The task has been canceled, however it could not be found in your task lists"
-msgstr ""
-"Ð?адаÑ?а бÑ?ла оÑ?менена, но она не можеÑ? бÑ?Ñ?Ñ? найдена в ваÑ?иÑ? Ñ?пиÑ?каÑ? задаÑ?"
+#: ../calendar/gui/e-itip-control.c:1276
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Ð?адаÑ?а бÑ?ла оÑ?менена, но она не можеÑ? бÑ?Ñ?Ñ? найдена в ваÑ?иÑ? Ñ?пиÑ?каÑ? задаÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опÑ?бликовал поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?обÑ?ании."
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1354
 msgid "Meeting Information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о Ñ?обÑ?ании"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1360
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запÑ?аÑ?иваеÑ? пÑ?иÑ?Ñ?Ñ?Ñ?Ñ?вие %s на Ñ?обÑ?ании."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запÑ?аÑ?иваеÑ? ваÑ?е пÑ?иÑ?Ñ?Ñ?Ñ?Ñ?вие на Ñ?обÑ?ании."
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Proposal"
 msgstr "Ð?Ñ?едложение Ñ?обÑ?аниÑ?"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1369
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> Ñ?оÑ?еÑ? бÑ?Ñ?Ñ? добавленнÑ?м к Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?емÑ? Ñ?обÑ?аниÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Update"
 msgstr "Ð?бновление Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1374
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желаеÑ? полÑ?Ñ?иÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?обÑ?ании."
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1375
 msgid "Meeting Update Request"
 msgstr "Ð?апÑ?оÑ? обновлениÑ? Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1382
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> оÑ?веÑ?ил на пÑ?иглаÑ?ение на Ñ?обÑ?ание."
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1383
 msgid "Meeting Reply"
 msgstr "Ð?Ñ?веÑ? Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1390
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> оÑ?менил Ñ?обÑ?ание."
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Cancelation"
 msgstr "Ð?Ñ?мена Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1401 ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1518
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> оÑ?пÑ?авил невÑ?азÑ?миÑ?елÑ?ное Ñ?ообÑ?ение."
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1402
 msgid "Bad Meeting Message"
 msgstr "Ð?евеÑ?ное Ñ?ообÑ?ение Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1429
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опÑ?бликовал инÑ?оÑ?маÑ?иÑ? о задаÑ?е"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1430
 msgid "Task Information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о задаÑ?е"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1437
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запÑ?аÑ?иваеÑ? %s длÑ? вÑ?полнениÑ? задаÑ?и."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запÑ?аÑ?иваеÑ?, Ñ?Ñ?обÑ? вÑ? вÑ?полнили задаÑ?Ñ?."
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Proposal"
 msgstr "Ð?Ñ?едложение задаÑ?и"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1446
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> Ñ?оÑ?еÑ? бÑ?Ñ?Ñ? добавленнÑ?м к Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ей задаÑ?е."
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1447
 msgid "Task Update"
 msgstr "Ð?бновление задаÑ?и"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1451
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желаеÑ? полÑ?Ñ?иÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о задаÑ?е."
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1452
 msgid "Task Update Request"
 msgstr "Ð?апÑ?оÑ? обновлениÑ? задаÑ?и"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1459
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> оÑ?веÑ?ил на назнаÑ?ение задаÑ?и."
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1460
 msgid "Task Reply"
 msgstr "Ð?Ñ?веÑ? Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1467
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> оÑ?менил Ñ?обÑ?ание."
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Cancelation"
 msgstr "Ð?Ñ?мена Ñ?обÑ?аниÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1479
 msgid "Bad Task Message"
 msgstr "СообÑ?ение календаÑ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1503
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опÑ?бликовал инÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и."
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1504
 msgid "Free/Busy Information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1508
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запÑ?аÑ?иваеÑ? инÑ?оÑ?маÑ?иÑ? о ваÑ?ей занÑ?Ñ?оÑ?Ñ?и."
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1509
 msgid "Free/Busy Request"
 msgstr "Ð?апÑ?оÑ? инÑ?оÑ?маÑ?ии о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1513
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> оÑ?веÑ?ил на запÑ?оÑ? инÑ?оÑ?маÑ?ии о занÑ?Ñ?оÑ?Ñ?и."
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1514
 msgid "Free/Busy Reply"
 msgstr "Ð?Ñ?веÑ? занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1519
 msgid "Bad Free/Busy Message"
 msgstr "Ð?евеÑ?ное Ñ?ообÑ?ение о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1595
 msgid "The message does not appear to be properly formed"
 msgstr "Ð?оÑ?оже Ñ?Ñ?о Ñ?ообÑ?ение не бÑ?ло пÑ?авилÑ?но Ñ?Ñ?оÑ?миÑ?овано"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1654
 msgid "The message contains only unsupported requests."
 msgstr "ЭÑ?о Ñ?ообÑ?ение Ñ?одеÑ?жиÑ? Ñ?олÑ?ко неподдеÑ?живаемÑ?е запÑ?оÑ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1687
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Ð?ложение не Ñ?одеÑ?жиÑ? пÑ?авилÑ?ного Ñ?ообÑ?ениÑ? календаÑ?Ñ?."
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1725
 msgid "The attachment has no viewable calendar items"
 msgstr "Ð?ложение не Ñ?одеÑ?жиÑ? пÑ?игоднÑ?Ñ? длÑ? пÑ?оÑ?моÑ?Ñ?а Ñ?леменÑ?ов календаÑ?Ñ?."
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1967
 msgid "Update complete\n"
 msgstr "Ð?бновление законÑ?ено\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Ð?бÑ?екÑ? некоÑ?Ñ?екÑ?ен и не можеÑ? бÑ?Ñ?Ñ? обновлен\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2018
 msgid "This response is not from a current attendee.  Add as an attendee?"
-msgstr ""
-"ЭÑ?оÑ? оÑ?веÑ? пÑ?иÑ?ел не оÑ? Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?ника.  Ð?обавиÑ?Ñ? его, как Ñ?Ñ?аÑ?Ñ?ника?"
+msgstr "ЭÑ?оÑ? оÑ?веÑ? пÑ?иÑ?ел не оÑ? Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?ника.  Ð?обавиÑ?Ñ? его, как Ñ?Ñ?аÑ?Ñ?ника?"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2036
 msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника не можеÑ? бÑ?Ñ?Ñ? обновлÑ?н из-за невеÑ?ного Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?Ñ?а!\n"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника не можеÑ? бÑ?Ñ?Ñ? обновлÑ?н из-за невеÑ?ного Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?Ñ?а!\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2060
 msgid "Attendee status updated\n"
 msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника обновлÑ?н!\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2067
+#: ../plugins/itip-formatter/itip-formatter.c:1385
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника не можеÑ? бÑ?Ñ?Ñ? обновлÑ?н, поÑ?омÑ? Ñ?Ñ?о Ñ?леменÑ? болÑ?Ñ?е не "
 "Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2098 ../calendar/gui/e-itip-control.c:2155
 msgid "Item sent!\n"
 msgstr "ЭлеменÑ? оÑ?пÑ?авлен!\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2104 ../calendar/gui/e-itip-control.c:2163
 msgid "The item could not be sent!\n"
 msgstr "ЭлеменÑ? не можеÑ? бÑ?Ñ?Ñ? поÑ?лан!\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2281
 msgid "Choose an action:"
 msgstr "Ð?Ñ?беÑ?иÑ?е дейÑ?Ñ?вие:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2310
+#: ../calendar/gui/e-meeting-list-view.c:589
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Ð?Ñ?оÑ?Ñ?ба оÑ?веÑ?иÑ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2350
 msgid "Update"
 msgstr "Ð?бновиÑ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2374
+#: ../plugins/groupwise-features/process-meeting.c:52
 msgid "Accept"
 msgstr "Ð?Ñ?инÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2375
 msgid "Tentatively accept"
 msgstr "Ð?Ñ?инÑ?Ñ?Ñ? Ñ?кÑ?пеÑ?именÑ?алÑ?но"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2376
+#: ../plugins/groupwise-features/process-meeting.c:54
 msgid "Decline"
 msgstr "Ð?Ñ?клониÑ?Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2401
 msgid "Send Free/Busy Information"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2425
 msgid "Update respondent status"
 msgstr "Ð?бновиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2449
 msgid "Send Latest Information"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ?"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2473 ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ð?Ñ?мениÑ?Ñ?"
 
@@ -8274,6 +6966,10 @@ msgstr "Ð?агÑ?Ñ?зка календаÑ?Ñ?"
 msgid "Loading calendar..."
 msgstr "Ð?агÑ?Ñ?зка календаÑ?Ñ?..."
 
+#: ../calendar/gui/e-itip-control.glade.h:7
+msgid "Organizer:"
+msgstr "Ð?Ñ?ганизаÑ?оÑ?:"
+
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "СообÑ?ение Ñ?еÑ?веÑ?а:"
@@ -8294,77 +6990,73 @@ msgstr "Ð?ополниÑ?елÑ?нÑ?е Ñ?Ñ?аÑ?Ñ?ники"
 msgid "Resources"
 msgstr "РеÑ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "УÑ?аÑ?Ñ?ники"
-
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-store.c:84 ../calendar/gui/e-meeting-store.c:101
+#: ../calendar/gui/e-meeting-store.c:736 ../calendar/gui/print.c:974
 msgid "Individual"
 msgstr "Ð?ндивидÑ?алÑ?но"
 
 #: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-store.c:86 ../calendar/gui/e-meeting-store.c:103
+#: ../calendar/gui/print.c:975 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "Ð?Ñ?Ñ?ппа"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-store.c:88 ../calendar/gui/e-meeting-store.c:105
+#: ../calendar/gui/print.c:976
 msgid "Resource"
 msgstr "Ð?Ñ?Ñ?оÑ?ник"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-store.c:90 ../calendar/gui/e-meeting-store.c:107
+#: ../calendar/gui/print.c:977
 msgid "Room"
 msgstr "Ð?омнаÑ?а"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:991
 msgid "Chair"
 msgstr "Ð?Ñ?едÑ?едаÑ?елÑ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-store.c:121 ../calendar/gui/e-meeting-store.c:138
+#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:992
 msgid "Required Participant"
 msgstr "ТÑ?ебÑ?емÑ?е Ñ?Ñ?аÑ?Ñ?ники"
 
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-store.c:123 ../calendar/gui/e-meeting-store.c:140
+#: ../calendar/gui/print.c:993
 msgid "Optional Participant"
 msgstr "Ð?ополниÑ?елÑ?нÑ?е Ñ?Ñ?аÑ?Ñ?ники"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:142
+#: ../calendar/gui/print.c:994
 msgid "Non-Participant"
 msgstr "Ð?е Ñ?Ñ?аÑ?Ñ?вÑ?еÑ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:192
+#: ../calendar/gui/e-meeting-store.c:749
 msgid "Needs Action"
 msgstr "Ð?еобÑ?одимое дейÑ?Ñ?вие"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:544
 msgid "Attendee                          "
 msgstr "УÑ?аÑ?Ñ?ник                          "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:204
 msgid "In Process"
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2127
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2083
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -8372,78 +7064,78 @@ msgstr "%A, %d %B %Y"
 #. name, %m = month number, %d = month day, %Y = full year.
 #. 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:471
-#: ../calendar/gui/e-meeting-time-sel.c:2158
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2114
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:392
 msgid "Out of Office"
 msgstr "Ð?е на Ñ?абоÑ?е"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:393
 msgid "No Information"
 msgstr "Ð?еÑ? инÑ?оÑ?маÑ?ии"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:408
 msgid "A_ttendees..."
 msgstr "_УÑ?аÑ?Ñ?ники..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:429
 msgid "O_ptions"
 msgstr "_Ð?аÑ?амеÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:446
 msgid "Show _only working hours"
 msgstr "Ð?оказÑ?ваÑ?Ñ? _Ñ?олÑ?ко Ñ?абоÑ?ие Ñ?аÑ?Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:456
 msgid "Show _zoomed out"
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?менÑ?Ñ?еннÑ?й"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:471
 msgid "_Update free/busy"
 msgstr "_Ð?бновиÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:486
 msgid "_<<"
 msgstr "<_<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:504
 msgid "_Autopick"
 msgstr "Ð?вÑ?овÑ?боÑ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:519
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:536
 msgid "_All people and resources"
 msgstr "_Ð?Ñ?е лÑ?ди и Ñ?еÑ?Ñ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "All _people and one resource"
 msgstr "Ð?Ñ?е _лÑ?ди и один Ñ?еÑ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:554
 msgid "_Required people"
 msgstr "_ТÑ?ебÑ?емÑ?е лÑ?ди"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Required people and _one resource"
 msgstr "ТÑ?ебÑ?емÑ?е лÑ?ди и _один Ñ?еÑ?Ñ?Ñ?Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "_Start time:"
 msgstr "Ð?аÑ?а_ло:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_End time:"
 msgstr "Ð?оне_Ñ?:"
 
@@ -8471,15 +7163,15 @@ msgstr "ЯзÑ?к"
 msgid "Member"
 msgstr "УÑ?аÑ?Ñ?ник"
 
-#: ../calendar/gui/e-memo-table.c:955
+#: ../calendar/gui/e-memo-table.c:950
 msgid "_Delete Selected Memos"
 msgstr "_УдалиÑ?Ñ? вÑ?деленнÑ?е замеÑ?ки"
 
-#: ../calendar/gui/e-memo-table.c:1106 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1099 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? добавиÑ?Ñ? замеÑ?кÑ?"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-memos.c:754 ../calendar/gui/e-tasks.c:902
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -8488,165 +7180,145 @@ msgstr ""
 "Ð?Ñ?ибка в \"%s\":\n"
 "%s"
 
-#: ../calendar/gui/e-memos.c:812
+#: ../calendar/gui/e-memos.c:806
 msgid "Loading memos"
 msgstr "Ð?агÑ?Ñ?зка замеÑ?ок"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/e-memos.c:897
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ð?Ñ?кÑ?Ñ?ваÑ?Ñ?Ñ?Ñ? замеÑ?ки в %s"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
+#: ../calendar/gui/e-memos.c:1066 ../calendar/gui/e-tasks.c:1318
 msgid "Deleting selected objects..."
 msgstr "Удаление вÑ?деленнÑ?Ñ? обÑ?екÑ?ов..."
 
-#: ../calendar/gui/e-tasks.c:963
+#: ../calendar/gui/e-tasks.c:955
 msgid "Loading tasks"
 msgstr "Ð?агÑ?Ñ?зка задаÑ?"
 
-#: ../calendar/gui/e-tasks.c:1061
+#: ../calendar/gui/e-tasks.c:1052
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?ие задаÑ? %s"
 
-#: ../calendar/gui/e-tasks.c:1306
+#: ../calendar/gui/e-tasks.c:1295
 msgid "Completing tasks..."
 msgstr "Ð?авеÑ?Ñ?ение вÑ?полнениÑ? задаÑ?..."
 
-#: ../calendar/gui/e-tasks.c:1356
+#: ../calendar/gui/e-tasks.c:1345
 msgid "Expunging"
 msgstr "Ð?Ñ?иÑ?Ñ?ка папки"
 
-#: ../calendar/gui/e-timezone-entry.c:127
+#: ../calendar/gui/e-timezone-entry.c:124
 msgid "Select Timezone"
 msgstr "Ð?Ñ?боÑ? Ñ?аÑ?ового поÑ?Ñ?а"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:343 ../calendar/gui/print.c:1659
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1647
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2648
+#: ../calendar/gui/gnome-cal.c:2673
 msgid "_Custom View"
 msgstr "_Ð?олÑ?зоваÑ?елÑ?Ñ?кий вид"
 
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2674
 msgid "_Save Custom View"
 msgstr "_СоÑ?Ñ?аниÑ?Ñ? изменÑ?ннÑ?й вид"
 
-#: ../calendar/gui/gnome-cal.c:2654
+#: ../calendar/gui/gnome-cal.c:2679
 msgid "_Define Views..."
 msgstr "_Ð?пÑ?еделиÑ?Ñ? видÑ?..."
 
-#: ../calendar/gui/gnome-cal.c:2891
+#: ../calendar/gui/gnome-cal.c:2916
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ð?агÑ?Ñ?зка вÑ?Ñ?Ñ?еÑ? на %s"
 
-#: ../calendar/gui/gnome-cal.c:2906
+#: ../calendar/gui/gnome-cal.c:2931
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ð?агÑ?Ñ?зка задаÑ? на %s"
 
-#: ../calendar/gui/gnome-cal.c:2915
+#: ../calendar/gui/gnome-cal.c:2940
 #, c-format
 msgid "Loading memos at %s"
 msgstr "Ð?агÑ?Ñ?зка замеÑ?ок из %s"
 
-#: ../calendar/gui/gnome-cal.c:3027
+#: ../calendar/gui/gnome-cal.c:3052
 #, c-format
 msgid "Opening %s"
 msgstr "Ð?Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? %s"
 
-#: ../calendar/gui/gnome-cal.c:3995
+#: ../calendar/gui/gnome-cal.c:4018
 msgid "Purging"
 msgstr "Ð?Ñ?иÑ?Ñ?ка"
 
 #: ../calendar/gui/goto-dialog.glade.h:1
-msgid "April"
-msgstr "Ð?пÑ?елÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:2
-msgid "August"
-msgstr "Ð?вгÑ?Ñ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:3
-msgid "December"
-msgstr "Ð?екабÑ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:4
-msgid "February"
-msgstr "ФевÑ?алÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:5
-msgid "January"
-msgstr "ЯнваÑ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:6
-msgid "July"
-msgstr "Ð?Ñ?лÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:7
-msgid "June"
-msgstr "Ð?Ñ?нÑ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:8
-msgid "March"
-msgstr "Ð?аÑ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:9
-msgid "May"
-msgstr "Ð?ай"
-
-#: ../calendar/gui/goto-dialog.glade.h:10
-msgid "November"
-msgstr "Ð?оÑ?бÑ?Ñ?"
-
-#: ../calendar/gui/goto-dialog.glade.h:11
-msgid "October"
-msgstr "Ð?кÑ?Ñ?бÑ?Ñ?"
+msgid ""
+"January\n"
+"February\n"
+"March\n"
+"April\n"
+"May\n"
+"June\n"
+"July\n"
+"August\n"
+"September\n"
+"October\n"
+"November\n"
+"December"
+msgstr ""
+"ЯнваÑ?Ñ?\n"
+"ФевÑ?алÑ?\n"
+"Ð?аÑ?Ñ?\n"
+"Ð?пÑ?елÑ?\n"
+"Ð?ай\n"
+"Ð?Ñ?нÑ?\n"
+"Ð?Ñ?лÑ?\n"
+"Ð?вгÑ?Ñ?Ñ?\n"
+"СенÑ?Ñ?бÑ?Ñ?\n"
+"Ð?кÑ?Ñ?бÑ?Ñ?\n"
+"Ð?оÑ?бÑ?Ñ?\n"
+"Ð?екабÑ?Ñ?"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.glade.h:13
 msgid "Select Date"
 msgstr "Ð?Ñ?делиÑ?Ñ? даÑ?Ñ?"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
-msgid "September"
-msgstr "СенÑ?Ñ?бÑ?Ñ?"
-
 #: ../calendar/gui/goto-dialog.glade.h:14
 msgid "_Select Today"
 msgstr "_Ð?Ñ?делиÑ?Ñ? Ñ?егоднÑ?Ñ?ний денÑ?"
 
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:462
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:553
 msgid "An organizer must be set."
 msgstr "Ð?Ñ?ганизаÑ?оÑ? должен бÑ?Ñ?Ñ? назнаÑ?ен."
 
-#: ../calendar/gui/itip-utils.c:454
+#: ../calendar/gui/itip-utils.c:453
 msgid "At least one attendee is necessary"
 msgstr "Ð?еобÑ?одим как минимÑ?м один Ñ?Ñ?аÑ?Ñ?ник"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
 msgid "Event information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о Ñ?обÑ?Ñ?ии"
 
-#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
 msgid "Task information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о задаÑ?е"
 
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
 msgid "Memo information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о замеÑ?ке"
 
-#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
 msgid "Free/Busy information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и"
 
-#: ../calendar/gui/itip-utils.c:640
+#: ../calendar/gui/itip-utils.c:643
 msgid "Calendar information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? календаÑ?Ñ?"
 
@@ -8654,7 +7326,7 @@ msgstr "Ð?нÑ?оÑ?маÑ?иÑ? календаÑ?Ñ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:674
+#: ../calendar/gui/itip-utils.c:677
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Ð?Ñ?инÑ?Ñ?о"
@@ -8663,7 +7335,7 @@ msgstr "Ð?Ñ?инÑ?Ñ?о"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:681
+#: ../calendar/gui/itip-utils.c:684
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ЭкÑ?пеÑ?именÑ?алÑ?но пÑ?инÑ?Ñ?о"
@@ -8675,7 +7347,7 @@ msgstr "ЭкÑ?пеÑ?именÑ?алÑ?но пÑ?инÑ?Ñ?о"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:688 ../calendar/gui/itip-utils.c:736
+#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Ð?Ñ?клонено"
@@ -8684,7 +7356,7 @@ msgstr "Ð?Ñ?клонено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Ð?оÑ?Ñ?Ñ?ено"
@@ -8692,7 +7364,7 @@ msgstr "Ð?оÑ?Ñ?Ñ?ено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:711
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ð?бновлено"
@@ -8700,7 +7372,7 @@ msgstr "Ð?бновлено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:715
+#: ../calendar/gui/itip-utils.c:718
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Ð?Ñ?мена"
@@ -8708,7 +7380,7 @@ msgstr "Ð?Ñ?мена"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:722
+#: ../calendar/gui/itip-utils.c:725
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Ð?бновление"
@@ -8716,29 +7388,29 @@ msgstr "Ð?бновление"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:729
+#: ../calendar/gui/itip-utils.c:732
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Ð?онÑ?Ñ?-пÑ?едложение"
 
-#: ../calendar/gui/itip-utils.c:799
+#: ../calendar/gui/itip-utils.c:802
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о занÑ?Ñ?оÑ?Ñ?и (%s в %s)"
 
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:810
 msgid "iCalendar information"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? iCalendar"
 
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:981
 msgid "You must be an attendee of the event."
 msgstr "Ð?Ñ? должнÑ? бÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ником Ñ?обÑ?Ñ?иÑ?."
 
-#: ../calendar/gui/memos-component.c:507
+#: ../calendar/gui/memos-component.c:477
 msgid "_New Memo List"
 msgstr "_Ð?овÑ?й Ñ?пиÑ?ок замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:590
+#: ../calendar/gui/memos-component.c:560
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -8746,7 +7418,7 @@ msgstr[0] "%d замеÑ?ка"
 msgstr[1] "%d замеÑ?ки"
 msgstr[2] "%d замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:592 ../calendar/gui/tasks-component.c:584
+#: ../calendar/gui/memos-component.c:562 ../calendar/gui/tasks-component.c:555
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8754,63 +7426,63 @@ msgstr[0] ", вÑ?делено %d"
 msgstr[1] ", вÑ?делено %d"
 msgstr[2] ", вÑ?делено %d"
 
-#: ../calendar/gui/memos-component.c:639
+#: ../calendar/gui/memos-component.c:609
 msgid "Failed upgrading memos."
 msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? замеÑ?ки."
 
-#: ../calendar/gui/memos-component.c:769
+#: ../calendar/gui/memos-component.c:739
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?пиÑ?ок замеÑ?ок «%s» длÑ? Ñ?озданиÑ? Ñ?обÑ?Ñ?ий и Ñ?обÑ?аний"
 
-#: ../calendar/gui/memos-component.c:782
+#: ../calendar/gui/memos-component.c:752
 msgid "There is no calendar available for creating memos"
 msgstr "Ð?еÑ? календаÑ?Ñ?, доÑ?Ñ?Ñ?пного длÑ? Ñ?озданиÑ? замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:862
 msgid "Memo Source Selector"
 msgstr "Ð?Ñ?боÑ? иÑ?Ñ?оÑ?ника замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:1071
+#: ../calendar/gui/memos-component.c:1041
 msgid "New memo"
 msgstr "Ð?оваÑ? замеÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1072
+#: ../calendar/gui/memos-component.c:1042
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Ð?а_меÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1073
+#: ../calendar/gui/memos-component.c:1043
 msgid "Create a new memo"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? замеÑ?кÑ?"
 
-#: ../calendar/gui/memos-component.c:1079
+#: ../calendar/gui/memos-component.c:1049
 msgid "New shared memo"
 msgstr "Ð?оваÑ? обÑ?аÑ? замеÑ?ка"
 
-#: ../calendar/gui/memos-component.c:1080
+#: ../calendar/gui/memos-component.c:1050
 msgctxt "New"
 msgid "_Shared memo"
 msgstr "Ð?бÑ?аÑ? заме_Ñ?ка"
 
-#: ../calendar/gui/memos-component.c:1081
+#: ../calendar/gui/memos-component.c:1051
 msgid "Create a shared new memo"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? обÑ?Ñ?Ñ? замеÑ?кÑ?"
 
-#: ../calendar/gui/memos-component.c:1087
+#: ../calendar/gui/memos-component.c:1057
 msgid "New memo list"
 msgstr "Ð?овÑ?й Ñ?пиÑ?ок замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:1088
+#: ../calendar/gui/memos-component.c:1058
 msgctxt "New"
 msgid "Memo li_st"
 msgstr "СпиÑ?ок _замеÑ?ок"
 
-#: ../calendar/gui/memos-component.c:1089
+#: ../calendar/gui/memos-component.c:1059
 msgid "Create a new memo list"
 msgstr "СоздаÑ?Ñ? новÑ?й Ñ?пиÑ?ок замеÑ?ок"
 
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
+#: ../calendar/gui/memos-control.c:386 ../calendar/gui/memos-control.c:402
 msgid "Print Memos"
 msgstr "Ð?апеÑ?аÑ?аÑ?Ñ? замеÑ?ки"
 
@@ -8839,234 +7511,226 @@ msgstr ""
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? пÑ?еобÑ?азование папок длÑ? новой веÑ?Ñ?ии..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
+#: ../calendar/gui/migration.c:774 ../calendar/gui/migration.c:942
 #, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?еобÑ?азоваÑ?Ñ? Ñ?Ñ?аÑ?Ñ?е паÑ?амеÑ?Ñ?Ñ? из evolution/config.xmldb"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
+#: ../calendar/gui/migration.c:803
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? пÑ?еобÑ?азоваÑ?Ñ? календаÑ?Ñ? «%s»"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
+#: ../calendar/gui/migration.c:971
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? задаÑ?и в «%s»"
 
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "Ð?Ñ?имеÑ?аниÑ?"
-
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "1st"
 msgstr "1-ое"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "2nd"
 msgstr "2-ое"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "3rd"
 msgstr "3-Ñ?е"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "4th"
 msgstr "4-ое"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:511
 msgid "5th"
 msgstr "5-ое"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "6th"
 msgstr "6-ое"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "7th"
 msgstr "7-ое"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "8th"
 msgstr "8-ое"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "9th"
 msgstr "9-ое"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:512
 msgid "10th"
 msgstr "10-ое"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "11th"
 msgstr "11-ое"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "12th"
 msgstr "12-ое"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "13th"
 msgstr "13-ое"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "14th"
 msgstr "14-ое"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:513
 msgid "15th"
 msgstr "15-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "16th"
 msgstr "16-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "17th"
 msgstr "17-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "18th"
 msgstr "18-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "19th"
 msgstr "19-ое"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:514
 msgid "20th"
 msgstr "20-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "21st"
 msgstr "21-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "22nd"
 msgstr "22-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "23rd"
 msgstr "23-Ñ?е"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "24th"
 msgstr "24-ое"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:515
 msgid "25th"
 msgstr "25-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "26th"
 msgstr "26-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "27th"
 msgstr "27-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "28th"
 msgstr "28-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "29th"
 msgstr "29-ое"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:516
 msgid "30th"
 msgstr "30-ое"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:517
 msgid "31st"
 msgstr "31-ое"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Su"
 msgstr "Ð?Ñ?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Mo"
 msgstr "Ð?н"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "Tu"
 msgstr "Ð?Ñ?"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:593
 msgid "We"
 msgstr "СÑ?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Th"
 msgstr "ЧÑ?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Fr"
 msgstr "Ð?Ñ?"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:594
 msgid "Sa"
 msgstr "Cб"
 
-#: ../calendar/gui/print.c:2481
+#: ../calendar/gui/print.c:2465
 msgid "Appointment"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?а"
 
-#: ../calendar/gui/print.c:2483
+#: ../calendar/gui/print.c:2467
 msgid "Task"
 msgstr "Ð?адание"
 
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2492
 #, c-format
 msgid "Summary: %s"
 msgstr "Сводка: %s"
 
-#: ../calendar/gui/print.c:2531
+#: ../calendar/gui/print.c:2515
 msgid "Attendees: "
 msgstr "УÑ?аÑ?Ñ?ники: "
 
-#: ../calendar/gui/print.c:2571
+#: ../calendar/gui/print.c:2555
 #, c-format
 msgid "Status: %s"
 msgstr "СоÑ?Ñ?оÑ?ние: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "Priority: %s"
 msgstr "Ð?Ñ?иоÑ?иÑ?еÑ?: %s"
 
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/print.c:2584
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Ð?авеÑ?Ñ?ено пÑ?оÑ?енÑ?ов: %i"
 
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2595
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:2625
+#: ../calendar/gui/print.c:2608
 #, c-format
 msgid "Categories: %s"
 msgstr "Ð?аÑ?егоÑ?ии: %s"
 
-#: ../calendar/gui/print.c:2636
+#: ../calendar/gui/print.c:2619
 msgid "Contacts: "
 msgstr "Ð?онÑ?акÑ?Ñ?: "
 
-#: ../calendar/gui/tasks-component.c:499
+#: ../calendar/gui/tasks-component.c:470
 msgid "_New Task List"
 msgstr "_Ð?овÑ?й Ñ?пиÑ?ок задаÑ?"
 
-#: ../calendar/gui/tasks-component.c:582
+#: ../calendar/gui/tasks-component.c:553
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -9074,63 +7738,63 @@ msgstr[0] "%d задаÑ?а"
 msgstr[1] "%d задаÑ?и"
 msgstr[2] "%d задаÑ?"
 
-#: ../calendar/gui/tasks-component.c:631
+#: ../calendar/gui/tasks-component.c:602
 msgid "Failed upgrading tasks."
 msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? задаÑ?и."
 
-#: ../calendar/gui/tasks-component.c:764
+#: ../calendar/gui/tasks-component.c:735
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?пиÑ?ок задаÑ? «%s» длÑ? Ñ?озданиÑ? Ñ?обÑ?Ñ?ий и Ñ?обÑ?аний"
 
-#: ../calendar/gui/tasks-component.c:777
+#: ../calendar/gui/tasks-component.c:748
 msgid "There is no calendar available for creating tasks"
 msgstr "Ð?еÑ? календаÑ?Ñ?, доÑ?Ñ?Ñ?пного длÑ? Ñ?озданиÑ? задаÑ?"
 
-#: ../calendar/gui/tasks-component.c:888
+#: ../calendar/gui/tasks-component.c:859
 msgid "Task Source Selector"
 msgstr "Ð?Ñ?боÑ? иÑ?Ñ?оÑ?ника задаÑ?"
 
-#: ../calendar/gui/tasks-component.c:1142
+#: ../calendar/gui/tasks-component.c:1113
 msgid "New task"
 msgstr "Ð?оваÑ? задаÑ?а"
 
-#: ../calendar/gui/tasks-component.c:1143
+#: ../calendar/gui/tasks-component.c:1114
 msgctxt "New"
 msgid "_Task"
 msgstr "Ð?_адаÑ?а"
 
-#: ../calendar/gui/tasks-component.c:1144
+#: ../calendar/gui/tasks-component.c:1115
 msgid "Create a new task"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? задаÑ?Ñ?"
 
-#: ../calendar/gui/tasks-component.c:1150
+#: ../calendar/gui/tasks-component.c:1121
 msgid "New assigned task"
 msgstr "Ð?оваÑ? назнаÑ?еннаÑ? задаÑ?а"
 
-#: ../calendar/gui/tasks-component.c:1151
+#: ../calendar/gui/tasks-component.c:1122
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Ð?аз_наÑ?еннаÑ? задаÑ?а"
 
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1123
 msgid "Create a new assigned task"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? назнаÑ?еннÑ?Ñ? задаÑ?Ñ?"
 
-#: ../calendar/gui/tasks-component.c:1158
+#: ../calendar/gui/tasks-component.c:1129
 msgid "New task list"
 msgstr "Ð?овÑ?й Ñ?пиÑ?ок задаÑ?"
 
-#: ../calendar/gui/tasks-component.c:1159
+#: ../calendar/gui/tasks-component.c:1130
 msgctxt "New"
 msgid "Tas_k list"
 msgstr "СпиÑ?ок за_даÑ?"
 
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1131
 msgid "Create a new task list"
 msgstr "СоздаÑ?Ñ? новÑ?й Ñ?пиÑ?ок задаÑ?"
 
-#: ../calendar/gui/tasks-control.c:442
+#: ../calendar/gui/tasks-control.c:484
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -9142,11 +7806,11 @@ msgstr ""
 "\n"
 "Ð?ейÑ?Ñ?виÑ?елÑ?но Ñ?ниÑ?Ñ?ожиÑ?Ñ? Ñ?Ñ?и заданиÑ??"
 
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1128
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
 msgid "Do not ask me again."
 msgstr "Ð?е задаваÑ?Ñ? болÑ?Ñ?е Ñ?Ñ?оÑ? вопÑ?оÑ?."
 
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
+#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
 msgid "Print Tasks"
 msgstr "Ð?апеÑ?аÑ?аÑ?Ñ? задаÑ?и"
 
@@ -9163,11 +7827,11 @@ msgstr "Ð?Ñ?менено"
 msgid "In progress"
 msgstr "Ð?Ñ?полнÑ?еÑ?Ñ?Ñ?"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "болÑ?Ñ?е Ñ?ем"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "менÑ?Ñ?е Ñ?ем"
 
@@ -9175,37 +7839,37 @@ msgstr "менÑ?Ñ?е Ñ?ем"
 msgid "Appointments and Meetings"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?и и Ñ?обÑ?аниÑ?"
 
-#: ../calendar/importers/icalendar-importer.c:333
-#: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../calendar/importers/icalendar-importer.c:335
+#: ../calendar/importers/icalendar-importer.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:1728
 msgid "Opening calendar"
 msgstr "Ð?Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? календаÑ?Ñ?"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "ФайлÑ? iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "Ð?апоминание!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "ФайлÑ? vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar importer"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:746
 msgid "Calendar Events"
 msgstr "СобÑ?Ñ?иÑ? календаÑ?Ñ?"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:783
 msgid "Evolution Calendar intelligent importer"
 msgstr "Ð?нÑ?еллекÑ?Ñ?алÑ?нÑ?й импоÑ?Ñ?еÑ? календаÑ?Ñ? Evolution"
 
@@ -10758,219 +9422,188 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "ТиÑ?ий океан/о-в Яп"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?еÑ?ки Ñ?оÑ?Ñ?анÑ?емÑ?й Ñ?айл"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение из Ñ?едакÑ?оÑ?а"
-
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? вложение"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "Ð?_ложиÑ?Ñ?"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:84
 msgid "Untitled Message"
 msgstr "Ð?еозаглавленное Ñ?ообÑ?ение"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:317
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "Ð?ложиÑ?Ñ? Ñ?айл"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
+#: ../composer/e-composer-actions.c:322 ../mail/mail-signature-editor.c:195
 #: ../ui/evolution-mail-messagedisplay.xml.h:4
 msgid "_Close"
 msgstr "_Ð?акÑ?Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:324
 msgid "Close the current file"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ñ?екÑ?Ñ?ий Ñ?айл"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1339
+#: ../composer/e-composer-actions.c:329 ../mail/em-folder-view.c:1337
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "_Ð?еÑ?аÑ?Ñ?..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
+#: ../composer/e-composer-actions.c:336 ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:72
 #: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Ð?Ñ?ед_ваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ?"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:345
 msgid "Save the current file"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?екÑ?Ñ?ий Ñ?айл"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:350
 msgid "Save _As..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:352
 msgid "Save the current file with a different name"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?екÑ?Ñ?ий Ñ?айл под дÑ?Ñ?гим именем"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:357
 msgid "Save as _Draft"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как _Ñ?еÑ?новик"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:359
 msgid "Save as draft"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как Ñ?еÑ?новик"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:364 ../composer/e-composer-private.c:191
 msgid "S_end"
 msgstr "Ð?Ñ?пÑ?_авиÑ?Ñ?"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:366
 msgid "Send this message"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение"
 
-#: ../composer/e-composer-actions.c:527
+#: ../composer/e-composer-actions.c:373
 msgid "Insert Send options"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? оÑ?пÑ?авки"
 
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:378
 msgid "New _Message"
 msgstr "_Ð?овое Ñ?ообÑ?ение"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:380
 msgid "Open New Message window"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? окно Ñ?озданиÑ? нового Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:387
 msgid "Character _Encoding"
 msgstr "Ð?одиÑ?овка _Ñ?имволов"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:394
 msgid "_Security"
 msgstr "_Ð?езопаÑ?ноÑ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "Ð?а_Ñ?иÑ?Ñ?оваÑ?Ñ? Ñ? помоÑ?Ñ?Ñ? PGP"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Ð?аÑ?иÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение Ñ? помоÑ?Ñ?Ñ? PGP"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "Ð?одпи_Ñ?аÑ?Ñ? Ñ? помоÑ?Ñ?Ñ? PGP"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Ð?одпиÑ?аÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение ваÑ?им PGP-клÑ?Ñ?ом"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:420
 msgid "_Prioritize Message"
 msgstr "Ð?змениÑ?Ñ? _пÑ?иоÑ?иÑ?еÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:422
 msgid "Set the message priority to high"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? вÑ?Ñ?окий пÑ?иоÑ?иÑ?еÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:428
 msgid "Re_quest Read Receipt"
 msgstr "Ð?апÑ?оÑ?иÑ?Ñ? Ñ?ведомление о пÑ?оÑ?Ñ?_ении"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:430
 msgid "Get delivery notification when your message is read"
 msgstr ""
 "УÑ?Ñ?ановиÑ?е, Ñ?Ñ?обÑ? полÑ?Ñ?иÑ?Ñ? Ñ?ведомление о доÑ?Ñ?авке по пÑ?оÑ?Ñ?ении ваÑ?его "
 "Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:436
 msgid "S/MIME En_crypt"
 msgstr "Ð?аÑ?иÑ?Ñ?оваÑ?Ñ? Ñ? _помоÑ?Ñ?Ñ? S/MIME"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:438
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Ð?аÑ?иÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение ваÑ?им Ñ?еÑ?Ñ?иÑ?икаÑ?ом Ñ?иÑ?Ñ?ованиÑ? S/MIME"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:444
 msgid "S/MIME Sig_n"
 msgstr "Ð?одпиÑ?аÑ?Ñ? Ñ? по_моÑ?Ñ?Ñ? S/MIME"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:446
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Ð?одпиÑ?аÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение ваÑ?им Ñ?еÑ?Ñ?иÑ?икаÑ?ом Ñ?иÑ?Ñ?ованиÑ? S/MIME"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:452
 msgid "_Bcc Field"
 msgstr "Ð?оле Ñ?кÑ?Ñ?Ñ?ой копии"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:454
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение полÑ? Ñ?кÑ?Ñ?Ñ?ой копии"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:460
 msgid "_Cc Field"
 msgstr "Ð?оле копии"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:462
 msgid "Toggles whether the CC field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение полÑ? копии"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:468
 msgid "_From Field"
 msgstr "Ð?оле \"Ð?Ñ?\""
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:470
 msgid "Toggles whether the From chooser is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение вÑ?боÑ?а длÑ? полÑ? \"Ð?Ñ?\""
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "Ð?оле \"Post-To\""
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение полÑ? \"Post-To\""
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:476
 msgid "_Reply-To Field"
 msgstr "Ð?оле \"Ð?б_Ñ?аÑ?нÑ?й адÑ?еÑ?\""
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:478
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение полÑ? \"Ð?бÑ?аÑ?нÑ?й адÑ?еÑ?\""
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "Ð?оле _Ñ?емÑ?"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "Ð?еÑ?еклÑ?Ñ?аеÑ? оÑ?обÑ?ажение полÑ? \"ТемÑ?\""
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "Ð?оле \"_Ð?омÑ?\""
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? оÑ?обÑ?ажение полÑ? \"Ð?омÑ?\""
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:521
 msgid "Save Draft"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?еÑ?новик"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header.c:120
+msgid "Show"
+msgstr "Ð?оказаÑ?Ñ?"
+
+#: ../composer/e-composer-header.c:123
+msgid "Hide"
+msgstr "СкÑ?Ñ?Ñ?Ñ?"
+
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Ð?еÑ?еÑ?иÑ?лиÑ?е полÑ?Ñ?аÑ?елей Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ð?ведиÑ?е адÑ?еÑ?а, полÑ?Ñ?аÑ?Ñ?ие копиÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -10978,39 +9611,53 @@ msgstr ""
 "Ð?ведиÑ?е адÑ?еÑ?аÑ?ов, коÑ?оÑ?Ñ?е полÑ?Ñ?аÑ? копиÑ? Ñ?ообÑ?ениÑ?, не попав в Ñ?пиÑ?ок "
 "полÑ?Ñ?аÑ?елей."
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:945
 msgid "Fr_om:"
 msgstr "_Ð?Ñ? кого:"
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:945 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:923 ../mail/em-mailer-prefs.c:76
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:296
+msgid "From"
+msgstr "Ð?Ñ?"
+
+#: ../composer/e-composer-header-table.c:954
 msgid "_Reply-To:"
 msgstr "Ð?б_Ñ?аÑ?нÑ?й адÑ?еÑ?:"
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:959
 msgid "_To:"
 msgstr "_Ð?омÑ?:"
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:965
 msgid "_Cc:"
 msgstr "Ð?о_пиÑ?:"
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:965 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../composer/e-composer-header-table.c:971
 msgid "_Bcc:"
 msgstr "_СкÑ?.копиÑ?:"
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:971 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
+#: ../composer/e-composer-header-table.c:976
 msgid "_Post To:"
 msgstr "Ð?о_меÑ?Ñ?иÑ?Ñ? в:"
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:980
 msgid "S_ubject:"
 msgstr "_Тема:"
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:989
 msgid "Si_gnature:"
 msgstr "Ð?о_дпиÑ?Ñ?:"
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:116
 msgid "Click here for the address book"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? Ñ?оздаÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
@@ -11026,18 +9673,17 @@ msgstr "Ð?Ñ?беÑ?иÑ?е папки длÑ? помеÑ?ениÑ? в ниÑ? Ñ?ооб
 msgid "Click here to select folders to post to"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? вÑ?бÑ?аÑ?Ñ? папки длÑ? помеÑ?ениÑ? в ниÑ? Ñ?ообÑ?ений"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1573
-msgid "Show _Attachment Bar"
-msgstr "Ð?оказаÑ?Ñ? панелÑ? _вложений"
+#: ../composer/e-composer-private.c:208
+msgid "Save draft"
+msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?еÑ?новик"
 
-#: ../composer/e-msg-composer.c:866
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer.c:808
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? подпиÑ?аÑ?Ñ? иÑ?Ñ?одÑ?Ñ?ее Ñ?ообÑ?ение: неÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а подпиÑ?и длÑ? Ñ?Ñ?ой "
 "Ñ?Ñ?Ñ?Ñ?ной запиÑ?и"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:815
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11045,24 +9691,15 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? заÑ?иÑ?Ñ?оваÑ?Ñ? иÑ?Ñ?одÑ?Ñ?ее Ñ?ообÑ?ение: неÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?иÑ?Ñ?ованиÑ? длÑ? "
 "Ñ?Ñ?ой Ñ?Ñ?Ñ?Ñ?ной запиÑ?и"
 
-#: ../composer/e-msg-composer.c:1515 ../mail/em-format-html-display.c:1952
-#: ../mail/em-format-html-display.c:2600 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Ð?ложение"
-msgstr[1] "Ð?ложениÑ?"
-msgstr[2] "Ð?ложений"
-
-#: ../composer/e-msg-composer.c:1571
-msgid "Hide _Attachment Bar"
-msgstr "СкÑ?Ñ?Ñ?Ñ? панелÑ? _вложений"
+#: ../composer/e-msg-composer.c:1293
+msgid "Unable to retrieve message from editor"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение из Ñ?едакÑ?оÑ?а"
 
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2813
+#: ../composer/e-msg-composer.c:1367 ../composer/e-msg-composer.c:2206
 msgid "Compose Message"
 msgstr "Ð?овое Ñ?ообÑ?ение"
 
-#: ../composer/e-msg-composer.c:4114
+#: ../composer/e-msg-composer.c:3364
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -11167,8 +9804,7 @@ msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? оÑ?пÑ?авки недоÑ?Ñ?Ñ?пнÑ?."
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Файл `{0}' не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом и не можеÑ? бÑ?Ñ?Ñ? оÑ?пÑ?авлен в Ñ?ообÑ?ении."
+msgstr "Файл `{0}' не Ñ?влÑ?еÑ?Ñ?Ñ? обÑ?Ñ?нÑ?м Ñ?айлом и не можеÑ? бÑ?Ñ?Ñ? оÑ?пÑ?авлен в Ñ?ообÑ?ении."
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid ""
@@ -11228,14 +9864,20 @@ msgid "_Save Draft"
 msgstr "_СоÑ?Ñ?аниÑ?Ñ? Ñ?еÑ?новик"
 
 #: ../data/evolution.desktop.in.in.h:1
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:627
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "ЭлекÑ?Ñ?оннаÑ? поÑ?Ñ?а и календаÑ?Ñ? Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-commands.c:1035
 msgid "Groupware Suite"
 msgstr "Ð?акеÑ? длÑ? гÑ?Ñ?пповой Ñ?абоÑ?Ñ?"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Ð?аÑ?а Ñ?лекÑ?Ñ?оннаÑ? поÑ?Ñ?а, конÑ?акÑ?Ñ? и Ñ?аÑ?пиÑ?ание"
 
@@ -11247,6 +9889,40 @@ msgstr "визиÑ?наÑ? каÑ?Ñ?оÑ?ка"
 msgid "calendar information"
 msgstr "инÑ?оÑ?маÑ?иÑ? календаÑ?Ñ?"
 
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
+#: ../ui/evolution-calendar.xml.h:34 ../widgets/misc/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "СегоднÑ?"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+msgid "Tomorrow"
+msgstr "Ð?авÑ?Ñ?а"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "Ð?Ñ?еÑ?а"
+
+#: ../e-util/e-datetime-format.c:207
+#, c-format
+msgid "%d days from now"
+msgstr ""
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+msgid "%d days ago"
+msgstr "%d дней назад"
+
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+msgid "Use locale default"
+msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? локалÑ? по Ñ?молÑ?аниÑ?"
+
+#: ../e-util/e-datetime-format.c:496
+msgid "Format:"
+msgstr "ФоÑ?маÑ?:"
+
 #: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
 msgid "Evolution Error"
 msgstr "Ð?Ñ?ибка Evolution"
@@ -11264,7 +9940,7 @@ msgid "Evolution Query"
 msgstr "Ð?апÑ?оÑ? Evolution"
 
 #. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-error.c:448
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Ð?нÑ?Ñ?Ñ?еннÑ?Ñ? оÑ?ибка, запÑ?оÑ?ена неизвеÑ?Ñ?наÑ? оÑ?ибка «%s»"
@@ -11277,67 +9953,67 @@ msgstr "Ð?омпоненÑ?"
 msgid "Name of the component being logged"
 msgstr "Ð?азвание компоненÑ?а длÑ? жÑ?Ñ?нала"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "Ð?Ñ?Ñ?налÑ? оÑ?ладки"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "Ð?оказÑ?ваÑ?Ñ? о_Ñ?ибки в Ñ?Ñ?Ñ?оке Ñ?оÑ?Ñ?оÑ?ниÑ? длÑ?"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "Ñ?екÑ?нд."
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "СообÑ?ениÑ? жÑ?Ñ?нала:"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "УÑ?овенÑ? жÑ?Ñ?налиÑ?ованиÑ?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:380
 msgid "Time"
 msgstr "Ð?Ñ?емÑ?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2523
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2527
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "СообÑ?ениÑ?"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
+#: ../e-util/e-non-intrusive-error-dialog.c:301
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "Ð?акÑ?Ñ?Ñ?Ñ? Ñ?Ñ?о окно"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Error"
 msgstr "Ð?Ñ?ибка"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Errors"
 msgstr "Ð?Ñ?ибки"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Warnings and Errors"
 msgstr "Ð?Ñ?едÑ?пÑ?еждениÑ? и оÑ?ибки"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Debug"
 msgstr "Ð?Ñ?ладка"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:41
 msgid "Error, Warnings and Debug messages"
 msgstr "Ð?Ñ?ибки, пÑ?едÑ?пÑ?еждениÑ? и оÑ?ладоÑ?нÑ?е Ñ?ообÑ?ениÑ?"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
+#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:798
+#: ../mail/em-account-prefs.c:477 ../mail/em-composer-prefs.c:957
 #: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../plugins/publish-calendar/publish-calendar.c:718
 msgid "Enabled"
 msgstr "Ð?клÑ?Ñ?ено"
 
@@ -11354,10 +10030,13 @@ msgid "The printing system reported the following details about the error:"
 msgstr "Ð?Ñ? Ñ?иÑ?Ñ?емÑ? пеÑ?аÑ?и полÑ?Ñ?енÑ? Ñ?ледÑ?Ñ?Ñ?ие деÑ?али:"
 
 #: ../e-util/e-print.c:173
-msgid ""
-"The printing system did not report any additional details about the error."
+msgid "The printing system did not report any additional details about the error."
 msgstr "СиÑ?Ñ?ема пеÑ?аÑ?и не пÑ?едоÑ?Ñ?авила подÑ?обноÑ?Ñ?ей о пÑ?иÑ?ине оÑ?ибки."
 
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "Создана авÑ?омаÑ?иÑ?еÑ?ки"
+
 #: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
 msgid "Because \"{1}\"."
 msgstr "Ð?оÑ?омÑ? Ñ?Ñ?о «{1}»."
@@ -11386,55 +10065,55 @@ msgstr "Ð?еÑ?езапиÑ?аÑ?Ñ? Ñ?айл?"
 msgid "_Overwrite"
 msgstr "_Ð?еÑ?езапиÑ?аÑ?Ñ?"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:133
 msgid "Could not open the link."
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?лкÑ?."
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:183
 msgid "Could not display help for Evolution."
 msgstr "Ð?е Ñ?далоÑ?Ñ? показаÑ?Ñ? Ñ?пÑ?авкÑ? по Evolution."
 
-#: ../e-util/e-util-labels.c:39
+#: ../e-util/e-util-labels.c:45
 msgid "I_mportant"
 msgstr "_Ð?ажное"
 
 #. red
-#: ../e-util/e-util-labels.c:40
+#: ../e-util/e-util-labels.c:46
 msgid "_Work"
 msgstr "_СлÑ?жебное"
 
 #. orange
-#: ../e-util/e-util-labels.c:41
+#: ../e-util/e-util-labels.c:47
 msgid "_Personal"
 msgstr "_Ð?иÑ?ное"
 
 #. green
-#: ../e-util/e-util-labels.c:42
+#: ../e-util/e-util-labels.c:48
 msgid "_To Do"
 msgstr "Ð?_Ñ?полниÑ?Ñ?"
 
 #. blue
-#: ../e-util/e-util-labels.c:43
+#: ../e-util/e-util-labels.c:49
 msgid "_Later"
 msgstr "_Ð?озже"
 
-#: ../e-util/e-util-labels.c:315
+#: ../e-util/e-util-labels.c:320
 msgid "Label _Name:"
 msgstr "_Ð?мÑ? Ñ?Ñ?лÑ?ка:"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Edit Label"
 msgstr "Ð?змениÑ?Ñ? Ñ?Ñ?лÑ?к"
 
-#: ../e-util/e-util-labels.c:338
+#: ../e-util/e-util-labels.c:343
 msgid "Add Label"
 msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?лÑ?к"
 
-#: ../e-util/e-util-labels.c:357
+#: ../e-util/e-util-labels.c:362
 msgid "Label name cannot be empty."
 msgstr "Ð?мÑ? Ñ?Ñ?лÑ?ка не можеÑ? бÑ?Ñ?Ñ? пÑ?Ñ?Ñ?Ñ?м"
 
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:367
 msgid ""
 "A label having the same tag already exists on the server. Please rename your "
 "label."
@@ -11442,16 +10121,16 @@ msgstr ""
 "ЯÑ?лÑ?к Ñ? Ñ?акой меÑ?кой Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ? на Ñ?еÑ?веÑ?е. Ð?еÑ?еименÑ?йÑ?е, пожалÑ?йÑ?Ñ?а, "
 "ваÑ? Ñ?Ñ?лÑ?к."
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../e-util/gconf-bridge.c:1222
 #, c-format
 msgid "GConf error: %s"
 msgstr "Ð?Ñ?ибка GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1231
+#: ../e-util/gconf-bridge.c:1233
 msgid "All further errors shown only on terminal."
 msgstr "Ð?алÑ?нейÑ?ие оÑ?ибки бÑ?дÑ?Ñ? вÑ?веденÑ? на Ñ?еÑ?минал."
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:73
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -11459,7 +10138,7 @@ msgstr[0] "%d Ñ?екÑ?ндÑ? назад"
 msgstr[1] "%d Ñ?екÑ?ндÑ? назад"
 msgstr[2] "%d Ñ?екÑ?нд назад"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -11467,7 +10146,7 @@ msgstr[0] "%d Ñ?екÑ?нда в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d Ñ?екÑ?ндÑ? в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d Ñ?екÑ?нд в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -11475,7 +10154,7 @@ msgstr[0] "%d минÑ?Ñ?Ñ? назад"
 msgstr[1] "%d минÑ?Ñ?Ñ? назад"
 msgstr[2] "%d минÑ?Ñ? назад"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:76
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -11483,7 +10162,7 @@ msgstr[0] "%d минÑ?Ñ?а в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d минÑ?Ñ?Ñ? в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d минÑ?Ñ?Ñ? в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:77
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -11491,7 +10170,7 @@ msgstr[0] "%d Ñ?аÑ? назад"
 msgstr[1] "%d Ñ?аÑ?а назад"
 msgstr[2] "%d Ñ?аÑ?ов назад"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -11499,7 +10178,7 @@ msgstr[0] "%d Ñ?аÑ? в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d Ñ?аÑ?а в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d Ñ?аÑ?а в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -11507,7 +10186,7 @@ msgstr[0] "%d денÑ? назад"
 msgstr[1] "%d днÑ? назад"
 msgstr[2] "%d дней назад"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -11515,7 +10194,7 @@ msgstr[0] "%d денÑ? в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d днÑ? в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d дней в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -11523,7 +10202,7 @@ msgstr[0] "%d неделÑ? назад"
 msgstr[1] "%d недели назад"
 msgstr[2] "%d неделÑ? назад"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -11531,7 +10210,7 @@ msgstr[0] "%d неделÑ? в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d недели в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d неделÑ? в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -11539,7 +10218,7 @@ msgstr[0] "%d меÑ?Ñ?Ñ? назад"
 msgstr[1] "%d меÑ?Ñ?Ñ?а назад"
 msgstr[2] "%d меÑ?Ñ?Ñ?ев назад"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -11547,7 +10226,7 @@ msgstr[0] "%d меÑ?Ñ?Ñ? в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d меÑ?Ñ?Ñ?а в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d меÑ?Ñ?Ñ?ев в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -11555,7 +10234,7 @@ msgstr[0] "%d год назад"
 msgstr[1] "%d года назад"
 msgstr[2] "%d леÑ? назад"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -11563,83 +10242,83 @@ msgstr[0] "%d год в бÑ?дÑ?Ñ?ем"
 msgstr[1] "%d года в бÑ?дÑ?Ñ?ем"
 msgstr[2] "%d леÑ? в бÑ?дÑ?Ñ?ем"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/filter-datespec.c:294
 msgid "<click here to select a date>"
 msgstr "<нажмиÑ?е, Ñ?Ñ?обÑ? вÑ?бÑ?аÑ?Ñ? даÑ?Ñ?>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/filter-datespec.c:297 ../filter/filter-datespec.c:308
+#: ../filter/filter-datespec.c:319
 msgid "now"
 msgstr "Ñ?ейÑ?аÑ?"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/filter-datespec.c:304
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/filter-datespec.c:447
 msgid "Select a time to compare against"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? вÑ?емÑ? длÑ? Ñ?Ñ?авнениÑ?"
 
-#: ../filter/filter-file.c:284
+#: ../filter/filter-file.c:281
 msgid "Choose a file"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл"
 
-#: ../filter/filter-part.c:532
+#: ../filter/filter-part.c:528
 #: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Ð?Ñ?овеÑ?ка"
 
-#: ../filter/filter-rule.c:853
+#: ../filter/filter-rule.c:858
 msgid "R_ule name:"
 msgstr "_Ð?мÑ? пÑ?авила:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:886
 msgid "Find items that meet the following conditions"
 msgstr "Ð?айÑ?и Ñ?леменÑ?Ñ?, коÑ?оÑ?Ñ?е Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ? Ñ?ледÑ?Ñ?Ñ?им кÑ?иÑ?еÑ?иÑ?м"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/filter-rule.c:920
 msgid "A_dd Condition"
 msgstr "Ð?обавиÑ?Ñ? _кÑ?иÑ?еÑ?ий"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If all conditions are met"
 msgstr "Ð?Ñ?ли Ñ?довлеÑ?воÑ?Ñ?еÑ? вÑ?ем кÑ?иÑ?еÑ?иÑ?м"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/filter-rule.c:926
 msgid "If any conditions are met"
 msgstr "Ð?Ñ?ли Ñ?довлеÑ?воÑ?Ñ?еÑ? лÑ?бомÑ? из кÑ?иÑ?еÑ?иев"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/filter-rule.c:928
 msgid "_Find items:"
 msgstr "_Ð?айÑ?и Ñ?леменÑ?Ñ?:"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "All related"
 msgstr "Ð?Ñ?Ñ? Ñ?вÑ?занное"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies"
 msgstr "Ð?Ñ?веÑ?Ñ?"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "Replies and parents"
 msgstr "Ð?Ñ?веÑ?Ñ? и Ñ?одиÑ?елÑ?Ñ?кие"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/filter-rule.c:946
 msgid "No reply or parent"
 msgstr "Ð?е Ñ?влÑ?еÑ?Ñ?Ñ? оÑ?веÑ?ом или Ñ?одиÑ?елÑ?Ñ?ким"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/filter-rule.c:948
 msgid "I_nclude threads"
 msgstr "Ð?клÑ?Ñ?_аÑ? подÑ?ивки"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:310
+#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "Ð?Ñ?одÑ?Ñ?ие"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "Ð?Ñ?Ñ?одÑ?Ñ?ие"
 
@@ -11724,54 +10403,41 @@ msgstr ""
 "Ñ?екÑ?Ñ?его вÑ?емени запÑ?Ñ?ка Ñ?илÑ?Ñ?Ñ?а."
 
 #: ../filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "вÑ?емÑ? оÑ?ноÑ?иÑ?елÑ?но Ñ?екÑ?Ñ?его"
-
-#: ../filter/filter.glade.h:13
-msgid "ago"
-msgstr "назад"
-
-#: ../filter/filter.glade.h:16
-msgid "in the future"
-msgstr "в бÑ?дÑ?Ñ?ем"
-
-#: ../filter/filter.glade.h:18
-msgid "months"
-msgstr "меÑ?Ñ?Ñ?Ñ?"
-
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
-msgid "seconds"
-msgstr "Ñ?екÑ?нд"
+msgid ""
+"ago\n"
+"in the future"
+msgstr ""
 
-#: ../filter/filter.glade.h:20
-msgid "the current time"
-msgstr "Ñ?екÑ?Ñ?ее вÑ?емÑ?"
+#: ../filter/filter.glade.h:14
+msgid ""
+"seconds\n"
+"minutes\n"
+"hours\n"
+"days\n"
+"weeks\n"
+"months\n"
+"years"
+msgstr ""
 
 #: ../filter/filter.glade.h:21
-msgid "the time you specify"
-msgstr "Ñ?казанное вами вÑ?емÑ?"
-
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:655
-#: ../plugins/google-account-setup/google-contacts-source.c:378
-msgid "weeks"
-msgstr "недели"
-
-#: ../filter/filter.glade.h:23
-msgid "years"
-msgstr "годÑ?"
+msgid ""
+"the current time\n"
+"the time you specify\n"
+"a time relative to the current time"
+msgstr ""
+"Ñ?екÑ?Ñ?ее вÑ?емÑ?\n"
+"Ñ?казанное вами вÑ?емÑ?\n"
+"вÑ?емÑ? оÑ?ноÑ?иÑ?елÑ?но Ñ?екÑ?Ñ?его вÑ?емени"
 
-#: ../filter/rule-editor.c:382
+#: ../filter/rule-editor.c:381
 msgid "Add Rule"
 msgstr "Ð?обавиÑ?Ñ? пÑ?авило"
 
-#: ../filter/rule-editor.c:463
+#: ../filter/rule-editor.c:462
 msgid "Edit Rule"
 msgstr "Ð?змениÑ?Ñ? пÑ?авило"
 
-#: ../filter/rule-editor.c:809
+#: ../filter/rule-editor.c:808
 msgid "Rule name"
 msgstr "Ð?мÑ? пÑ?авила"
 
@@ -11780,8 +10446,7 @@ msgid "Composer Preferences"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?едакÑ?оÑ?а"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
 msgstr ""
 "ТÑ?Ñ? наÑ?Ñ?Ñ?аиваÑ?Ñ?Ñ?Ñ? паÑ?амеÑ?Ñ?Ñ? поÑ?Ñ?Ñ?, вклÑ?Ñ?аÑ? безопаÑ?ноÑ?Ñ?Ñ? и оÑ?обÑ?ажение "
 "Ñ?ообÑ?ений"
@@ -11826,21 +10491,21 @@ msgstr "Ð?аÑ?Ñ?Ñ?ойка паÑ?амеÑ?Ñ?ов поÑ?Ñ?Ñ? Evolution"
 msgid "Evolution Network configuration control"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка паÑ?амеÑ?Ñ?ов Ñ?еÑ?и Evolution"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:604
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
 #: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:620 ../mail/mail-component.c:621
+#: ../mail/mail-component.c:793
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "Ð?оÑ?Ñ?а"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
+#: ../mail/em-account-prefs.c:490
 msgid "Mail Accounts"
 msgstr "УÑ?Ñ?Ñ?нÑ?е запиÑ?и"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:108
 msgid "Mail Preferences"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка поÑ?Ñ?Ñ?"
 
@@ -11849,16 +10514,115 @@ msgid "Network Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Ñ?еÑ?и"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-#: ../plugins/pst-import/pst-importer.c:300
+#: ../plugins/pst-import/pst-importer.c:297
 msgid "_Mail"
 msgstr "_Ð?оÑ?Ñ?а"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:105
+msgid "_Forward"
+msgstr "Ð?е_Ñ?еÑ?лаÑ?Ñ?"
+
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../ui/evolution-mail-message.xml.h:123
+msgid "_Reply to Sender"
+msgstr "Ð?_Ñ?веÑ?иÑ?Ñ? оÑ?пÑ?авиÑ?елÑ?"
+
+#. Translators: This is only for multiple messages.
+#: ../mail/e-attachment-handler-mail.c:334
+#, c-format
+msgid "%d attached messages"
+msgstr "%d вложенное Ñ?ообÑ?ение"
+
+#: ../mail/e-mail-attachment-bar.c:122 ../mail/em-format-html-display.c:1642
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Ð?ложение"
+msgstr[1] "Ð?ложениÑ?"
+msgstr[2] "Ð?ложений"
+
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "Ð? виде знаÑ?ков"
+
+#: ../mail/e-mail-attachment-bar.c:616
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "Ð? виде Ñ?пиÑ?ка"
+
+#: ../mail/e-mail-search-bar.c:76
+#, c-format
+msgid "Matches: %d"
+msgstr "СовпадениÑ?: %d"
+
+#: ../mail/e-mail-search-bar.c:520
+msgid "Close the find bar"
+msgstr "Ð?акÑ?Ñ?Ñ?Ñ? панелÑ? поиÑ?ка"
+
+#: ../mail/e-mail-search-bar.c:528
+msgid "Fin_d:"
+msgstr "_Ð?айÑ?и:"
+
+#: ../mail/e-mail-search-bar.c:540
+msgid "Clear the search"
+msgstr "Ð?Ñ?иÑ?Ñ?иÑ?Ñ? поиÑ?к"
+
+#: ../mail/e-mail-search-bar.c:559
+msgid "_Previous"
+msgstr "_Ð?Ñ?едÑ?дÑ?Ñ?ее"
+
+#: ../mail/e-mail-search-bar.c:565
+msgid "Find the previous occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:573
+msgid "_Next"
+msgstr "_СледÑ?Ñ?Ñ?ее"
+
+#: ../mail/e-mail-search-bar.c:579
+msgid "Find the next occurrence of the phrase"
+msgstr ""
+
+#: ../mail/e-mail-search-bar.c:587
+msgid "Mat_ch case"
+msgstr "_УÑ?иÑ?Ñ?ваÑ?Ñ? Ñ?егиÑ?Ñ?Ñ?"
+
+#: ../mail/e-mail-search-bar.c:615
+msgid "Reached bottom of page, continued from top"
+msgstr "Ð?оÑ?Ñ?игнÑ?Ñ? конеÑ? Ñ?Ñ?Ñ?аниÑ?Ñ?, пÑ?одолжено Ñ? наÑ?ала"
+
+#: ../mail/e-mail-search-bar.c:637
+msgid "Reached top of page, continued from bottom"
+msgstr "Ð?оÑ?Ñ?игнÑ?Ñ? веÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ?, пÑ?одолжено Ñ?низÑ?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:309
+msgid "No encryption"
+msgstr "Ð?ез Ñ?иÑ?Ñ?ованиÑ?"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:313
+msgid "TLS encryption"
+msgstr "ШиÑ?Ñ?ование TLS"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:317
+msgid "SSL encryption"
+msgstr "ШиÑ?Ñ?ование SSL"
+
+#: ../mail/em-account-editor.c:408
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Ð?иÑ?ензионное Ñ?оглаÑ?ение"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:415
 #, c-format
 msgid ""
 "\n"
@@ -11871,107 +10635,110 @@ msgstr ""
 "длÑ? %s, пÑ?иведенное ниже\n"
 "и Ñ?Ñ?Ñ?ановиÑ?е Ñ?лажок, Ñ?Ñ?обÑ? пÑ?инÑ?Ñ?Ñ? его\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
 #: ../mail/em-vfolder-rule.c:513
 msgid "Select Folder"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? папкÑ?"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "Создана авÑ?омаÑ?иÑ?еÑ?ки"
+#: ../mail/em-account-editor.c:797
+msgid "Never"
+msgstr "Ð?икогда"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:798
+msgid "Always"
+msgstr "Ð?Ñ?егда"
+
+#: ../mail/em-account-editor.c:799
 msgid "Ask for each message"
 msgstr "Ð?апÑ?аÑ?иваÑ?Ñ? длÑ? каждого Ñ?ообÑ?ениÑ?"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:100
 msgid "Identity"
 msgstr "Ð?одлинноÑ?Ñ?Ñ?"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:127
 msgid "Receiving Email"
 msgstr "Ð?олÑ?Ñ?ение поÑ?Ñ?Ñ?"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2216
 msgid "Check for _new messages every"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? _новÑ?Ñ? поÑ?Ñ?Ñ? каждÑ?е"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2224
 msgid "minu_tes"
 msgstr "минÑ?_Ñ?"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
+#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:138
 msgid "Sending Email"
 msgstr "Ð?Ñ?пÑ?авка Ñ?л.поÑ?Ñ?Ñ?"
 
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:73
 msgid "Defaults"
 msgstr "Ð?о Ñ?молÑ?аниÑ?"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:133
+#: ../plugins/exchange-operations/exchange-account-setup.c:329
 msgid "Security"
 msgstr "Ð?езопаÑ?ноÑ?Ñ?Ñ?"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
 msgid "Receiving Options"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? полÑ?Ñ?ениÑ?"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
 msgid "Checking for New Messages"
 msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "РедакÑ?оÑ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?ей"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3145 ../mail/mail-config.glade.h:89
 msgid "Evolution Account Assistant"
 msgstr "Ð?омоÑ?ник по Ñ?Ñ?Ñ?Ñ?нÑ?м запиÑ?Ñ?м Evolution"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
+#: ../mail/em-account-prefs.c:426
 msgid "[Default]"
 msgstr "[Ð?о Ñ?молÑ?аниÑ?]"
 
-#: ../mail/em-account-prefs.c:488
+#: ../mail/em-account-prefs.c:483
 msgid "Account name"
 msgstr "Ð?мÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и"
 
-#: ../mail/em-account-prefs.c:490
+#: ../mail/em-account-prefs.c:485
 msgid "Protocol"
 msgstr "Ð?Ñ?оÑ?окол"
 
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
+#: ../mail/em-composer-prefs.c:318 ../mail/em-composer-prefs.c:452
+#: ../mail/mail-config.c:1160 ../mail/mail-signature-editor.c:481
 msgid "Unnamed"
 msgstr "Ð?ез названиÑ?"
 
-#: ../mail/em-composer-prefs.c:970
+#: ../mail/em-composer-prefs.c:961
 msgid "Language(s)"
 msgstr "ЯзÑ?к(и)"
 
-#: ../mail/em-composer-prefs.c:1019
+#: ../mail/em-composer-prefs.c:994
 msgid "Add signature script"
 msgstr "Ð?обавиÑ?Ñ? Ñ?кÑ?ипÑ? подпиÑ?и"
 
-#: ../mail/em-composer-prefs.c:1061
+#: ../mail/em-composer-prefs.c:1036
 msgid "Signature(s)"
 msgstr "Ð?одпиÑ?Ñ?(и)"
 
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
+#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Ð?еÑ?еÑ?ланное Ñ?ообÑ?ение --------"
 
-#: ../mail/em-composer-utils.c:1602
-msgid ""
-"No destination address provided, forward of the message has been cancelled."
+#: ../mail/em-composer-utils.c:1585
+msgid "No destination address provided, forward of the message has been cancelled."
 msgstr "Ð?е задан адÑ?еÑ? полÑ?Ñ?аÑ?елÑ?, пеÑ?еÑ?Ñ?лка Ñ?ообÑ?ениÑ? оÑ?менена."
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1591
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Ð?е найдено Ñ?Ñ?Ñ?Ñ?ной запиÑ?и, пеÑ?еÑ?Ñ?лка Ñ?ообÑ?ениÑ? оÑ?менена."
 
@@ -11994,7 +10761,7 @@ msgstr ""
 msgid "-----Original Message-----"
 msgstr "-------- Ð?Ñ?Ñ?одное Ñ?ообÑ?ение --------"
 
-#: ../mail/em-filter-editor.c:156
+#: ../mail/em-filter-editor.c:172
 msgid "_Filter Rules"
 msgstr "_Ð?Ñ?авила Ñ?илÑ?Ñ?Ñ?а"
 
@@ -12011,18 +10778,10 @@ msgstr "Ð?азнаÑ?иÑ?Ñ? Ñ?веÑ?"
 msgid "Assign Score"
 msgstr "Ð?азнаÑ?иÑ?Ñ? веÑ?"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Сигнал"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Ð?авеÑ?Ñ?ено в"
@@ -12040,7 +10799,7 @@ msgid "Date sent"
 msgstr "Ð?Ñ?пÑ?авлена даÑ?а"
 
 #: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
+#: ../plugins/groupwise-features/share-folder.c:765
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
@@ -12091,228 +10850,236 @@ msgstr "Ð?Ñ?Ñ?ажение"
 msgid "Follow Up"
 msgstr "Ð? иÑ?полнениÑ?"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "Ð?еÑ?еÑ?лаÑ?Ñ? к"
+
+#: ../mail/em-filter-i18n.h:30 ../mail/em-migrate.c:958
 msgid "Important"
 msgstr "Ð?ажное"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "поÑ?ле"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "до"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "Ð?Ñ?меÑ?ено"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "не оÑ?меÑ?ено"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "не Ñ?Ñ?Ñ?ановлено"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "Ñ?Ñ?Ñ?ановлено"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:102
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "ТеÑ?Ñ? на Ñ?пам"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "Ð?еÑ?ка"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "СпиÑ?ок Ñ?аÑ?Ñ?Ñ?лки"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "СооÑ?веÑ?Ñ?Ñ?вÑ?еÑ? вÑ?ем"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "Тело Ñ?ообÑ?ениÑ?"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "Ð?аголовок Ñ?ообÑ?ениÑ?"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "СообÑ?ение Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?памом"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "СообÑ?ение не Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?памом"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "Ð?еÑ?Ñ?оположение Ñ?ообÑ?ениÑ?"
+
+#: ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? в папкÑ?"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "Ð?еÑ?едаÑ?Ñ? пÑ?огÑ?амме Ñ?еÑ?ез канал"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "Ð?оÑ?пÑ?оизвеÑ?Ñ?и звÑ?к"
 
 #. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#: ../mail/em-filter-i18n.h:54 ../mail/message-tag-followup.c:61
 msgid "Read"
 msgstr "Ð?Ñ?оÑ?иÑ?анное"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Ð?олÑ?Ñ?аÑ?ели"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "СооÑ?веÑ?Ñ?Ñ?вÑ?еÑ? Ñ?ег. вÑ?Ñ?ажениÑ?"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "Ð?Ñ?веÑ? на"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "возвÑ?аÑ?аеÑ?"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "возвÑ?аÑ?аеÑ? болÑ?Ñ?е Ñ?ем"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "возвÑ?аÑ?аеÑ? менÑ?Ñ?е Ñ?ем"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "Ð?апÑ?Ñ?Ñ?иÑ?Ñ? пÑ?огÑ?аммÑ?"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Ð?еÑ?"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Ð?Ñ?пÑ?авиÑ?елÑ?"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "Ð?Ñ?пÑ?авиÑ?елÑ? или полÑ?Ñ?аÑ?ели"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? Ñ?Ñ?лÑ?к"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "РазмеÑ? (кÐ?)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "вÑ?глÑ?диÑ? как"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? - иÑ?Ñ?оÑ?ник"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "УказаннÑ?й заголовок"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "наÑ?инаеÑ?Ñ?Ñ? Ñ?"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "Ð?Ñ?Ñ?ановиÑ?Ñ? обÑ?абоÑ?кÑ?"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
+#: ../mail/em-filter-i18n.h:74 ../mail/em-format-quote.c:341
+#: ../mail/em-format.c:928 ../mail/em-mailer-prefs.c:81
+#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:300
 #: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
+#: ../smime/lib/e-cert.c:1112
 msgid "Subject"
 msgstr "Тема"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "СбÑ?оÑ?иÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "Ð?аÑ?ем"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "Ð?обавиÑ?Ñ? д_ейÑ?Ñ?вие"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:194
 msgid "C_reate Search Folder From Search..."
 msgstr "Со_здаÑ?Ñ? папкÑ? по Ñ?езÑ?лÑ?Ñ?аÑ?ам поиÑ?ка..."
 
 # This translation and all below should be short
 # to fit window on 800 x 600
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:219
 msgid "All Messages"
 msgstr "Ð?Ñ?е Ñ?ообÑ?ениÑ?"
 
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:220
 msgid "Unread Messages"
 msgstr "Ð?епÑ?оÑ?иÑ?аннÑ?е"
 
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:222
 msgid "No Label"
 msgstr "Ð?ез меÑ?ки"
 
-#: ../mail/em-folder-browser.c:228
+#: ../mail/em-folder-browser.c:229
 msgid "Read Messages"
 msgstr "Ð?Ñ?оÑ?иÑ?аннÑ?е"
 
-#: ../mail/em-folder-browser.c:229
+#: ../mail/em-folder-browser.c:230
 msgid "Recent Messages"
 msgstr "Ð?едавние"
 
-#: ../mail/em-folder-browser.c:230
+#: ../mail/em-folder-browser.c:231
 msgid "Last 5 Days' Messages"
 msgstr "Ð?а поÑ?ледние 5 дней"
 
-#: ../mail/em-folder-browser.c:231
+#: ../mail/em-folder-browser.c:232
 msgid "Messages with Attachments"
 msgstr "С вложениÑ?ми"
 
-#: ../mail/em-folder-browser.c:232
+#: ../mail/em-folder-browser.c:233
 msgid "Important Messages"
 msgstr "Ð?ажнÑ?е"
 
-#: ../mail/em-folder-browser.c:233
+#: ../mail/em-folder-browser.c:234
 msgid "Messages Not Junk"
 msgstr "Ð?е Ñ?пам"
 
-#: ../mail/em-folder-browser.c:1188
+#: ../mail/em-folder-browser.c:1194
 msgid "Account Search"
 msgstr "ТекÑ?Ñ?аÑ? Ñ?Ñ?Ñ?Ñ?наÑ? запиÑ?Ñ?"
 
-#: ../mail/em-folder-browser.c:1241
+#: ../mail/em-folder-browser.c:1256
 msgid "All Account Search"
 msgstr "Ð?Ñ?е Ñ?Ñ?Ñ?Ñ?нÑ?е запиÑ?и"
 
@@ -12344,11 +11111,11 @@ msgid "Quota usage"
 msgstr "Ð?воÑ?а"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
+#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
+#: ../mail/em-folder-tree.c:2602 ../mail/mail-component.c:168
+#: ../mail/mail-component.c:608
+#: ../plugins/exchange-operations/exchange-delegates-user.c:75
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "Ð?Ñ?одÑ?Ñ?ие"
 
@@ -12361,379 +11128,348 @@ msgstr "СвойÑ?Ñ?ва папки"
 msgid "<click here to select a folder>"
 msgstr "<нажмиÑ?е, Ñ?Ñ?обÑ? вÑ?бÑ?аÑ?Ñ? папкÑ?>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:249
 msgid "C_reate"
 msgstr "С_оздаÑ?Ñ?"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:253
 msgid "Folder _name:"
 msgstr "_Ð?мÑ? папки:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:195 ../mail/em-folder-tree-model.c:197
+#: ../mail/mail-vfolder.c:960 ../mail/mail-vfolder.c:1028
 msgid "Search Folders"
 msgstr "Ð?апки поиÑ?ка"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
 msgid "UNMATCHED"
 msgstr "UNMATCHED"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
+#: ../mail/em-folder-tree-model.c:510 ../mail/mail-component.c:169
 msgid "Drafts"
 msgstr "ЧеÑ?новики"
 
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree-model.c:513 ../mail/mail-component.c:172
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid "Templates"
 msgstr "ШаблонÑ?"
 
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
+#: ../mail/em-folder-tree-model.c:520 ../mail/mail-component.c:170
 msgid "Outbox"
 msgstr "Ð?Ñ?Ñ?одÑ?Ñ?ие"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
+#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
 msgid "Sent"
 msgstr "Ð?Ñ?пÑ?авленнÑ?е"
 
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:580 ../mail/em-folder-tree-model.c:889
 msgid "Loading..."
 msgstr "Ð?агÑ?Ñ?зка..."
 
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
 #. * formatting codes to take care of the cases the folder
 #. * name appears in either direction.
-#. *
-#. * Do not translate the "folder-display|" part. Remove it
-#. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
+#: ../mail/em-folder-tree.c:318
 #, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
-msgstr "%s (%u)"
+msgid "%s (%u%s)"
+msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:727
 msgid "Mail Folder Tree"
 msgstr "Ð?еÑ?ево поÑ?Ñ?овÑ?Ñ? папок"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:886
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ð?еÑ?емеÑ?ение папки %s"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:888
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ð?опиÑ?ование папки %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2014
+#: ../mail/em-folder-tree.c:895 ../mail/message-list.c:2018
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Ð?еÑ?емеÑ?ение Ñ?ообÑ?ений в папкÑ? %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2016
+#: ../mail/em-folder-tree.c:897 ../mail/message-list.c:2020
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Ð?опиÑ?ование Ñ?ообÑ?ений в папкÑ? %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:912
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ð?елÑ?зÑ? пеÑ?еÑ?аÑ?иÑ?Ñ? Ñ?ообÑ?ение в Ñ?Ñ?анилиÑ?е веÑ?Ñ?него Ñ?Ñ?овнÑ?"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
+#: ../mail/em-folder-tree.c:989 ../ui/evolution-mail-message.xml.h:100
 msgid "_Copy to Folder"
 msgstr "_Ð?опиÑ?оваÑ?Ñ? в папкÑ?"
 
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
+#: ../mail/em-folder-tree.c:990 ../ui/evolution-mail-message.xml.h:113
 msgid "_Move to Folder"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? в папкÑ?"
 
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
+#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+msgid "_Move"
+msgstr "Ð?еÑ?е_меÑ?Ñ?иÑ?Ñ?"
+
+#: ../mail/em-folder-tree.c:994 ../mail/message-list.c:2112
+msgid "Cancel _Drag"
+msgstr "Ð?Ñ?мениÑ?Ñ? _пеÑ?еноÑ?"
+
+#: ../mail/em-folder-tree.c:1702 ../mail/mail-ops.c:1063
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "СканиÑ?ование папок на «%s»"
 
-#: ../mail/em-folder-tree.c:2117
+#: ../mail/em-folder-tree.c:2107
 msgid "Open in _New Window"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? в _новом окне"
 
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
+#: ../mail/em-folder-tree.c:2112
 msgid "_New Folder..."
 msgstr "_СоздаÑ?Ñ? папкÑ?..."
 
-#: ../mail/em-folder-tree.c:2125
+#: ../mail/em-folder-tree.c:2115
 msgid "_Move..."
 msgstr "Ð?еÑ?е_меÑ?Ñ?иÑ?Ñ?..."
 
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
+#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:21
 msgid "Re_fresh"
 msgstr "Ð?бнов_иÑ?Ñ?"
 
-#: ../mail/em-folder-tree.c:2134
+#: ../mail/em-folder-tree.c:2124
 msgid "Fl_ush Outbox"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? иÑ?Ñ?од_Ñ?Ñ?ие"
 
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ? коÑ?зинÑ?"
 
-#: ../mail/em-folder-tree.c:2243
+#: ../mail/em-folder-tree.c:2232
 msgid "_Unread Search Folder"
 msgstr "Ð?Ñ?мениÑ?Ñ? пÑ?оÑ?_иÑ?аннÑ?е в папке поиÑ?ка"
 
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:99
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "Ð?опиÑ?ование «%s» в «%s»"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1188
-#: ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
+#: ../mail/em-folder-view.c:1201
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? папкÑ?"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1203
+#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
 msgid "C_opy"
 msgstr "_Ð?опиÑ?оваÑ?Ñ?"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:537
+#: ../plugins/groupwise-features/share-folder-common.c:144
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Создание папки «%s»"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? папкÑ?"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:695
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "УкажиÑ?е, где Ñ?оздаÑ?Ñ? папкÑ?:"
 
-#: ../mail/em-folder-view.c:1091 ../mail/mail.error.xml.h:70
+#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "Сбой Ñ?далениÑ? поÑ?Ñ?Ñ?"
 
-#: ../mail/em-folder-view.c:1092 ../mail/mail.error.xml.h:126
+#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "У ваÑ? недоÑ?Ñ?аÑ?оÑ?но пÑ?ав длÑ? Ñ?далениÑ? Ñ?Ñ?ого Ñ?ообÑ?ениÑ?."
 
-#: ../mail/em-folder-view.c:1331 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "Ð?_Ñ?веÑ?иÑ?Ñ? оÑ?пÑ?авиÑ?елÑ?"
-
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "Ð?е_Ñ?еÑ?лаÑ?Ñ?"
-
 #. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1337 ../ui/evolution-mail-message.xml.h:106
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:102
 msgid "_Edit as New Message..."
 msgstr "_Ð?Ñ?авиÑ?Ñ? как новое Ñ?ообÑ?ение..."
 
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1341
 msgid "U_ndelete"
 msgstr "Ð?_оÑ?Ñ?Ñ?ановиÑ?Ñ?"
 
-#: ../mail/em-folder-view.c:1344
+#: ../mail/em-folder-view.c:1342
 msgid "_Move to Folder..."
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? в папкÑ?..."
 
-#: ../mail/em-folder-view.c:1345
+#: ../mail/em-folder-view.c:1343
 msgid "_Copy to Folder..."
 msgstr "_Ð?опиÑ?оваÑ?Ñ? в папкÑ?..."
 
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1346
 msgid "Mar_k as Read"
 msgstr "Ð?о_меÑ?иÑ?Ñ? как пÑ?оÑ?иÑ?аннÑ?е"
 
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1347
 msgid "Mark as _Unread"
 msgstr "Ð?омеÑ?иÑ?Ñ? как _непÑ?оÑ?Ñ?еннÑ?е"
 
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1348
 msgid "Mark as _Important"
 msgstr "Ð?омеÑ?иÑ?Ñ? как _важное"
 
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1349
 msgid "Mark as Un_important"
 msgstr "Ð?омеÑ?иÑ?Ñ? как нева_жное"
 
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1350
 msgid "Mark as _Junk"
 msgstr "Ð?омеÑ?иÑ?Ñ? как _Ñ?пам"
 
-#: ../mail/em-folder-view.c:1353
+#: ../mail/em-folder-view.c:1351
 msgid "Mark as _Not Junk"
 msgstr "Ð?омеÑ?иÑ?Ñ? как _не Ñ?пам"
 
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1352
 msgid "Mark for Follo_w Up..."
 msgstr "Ð?омеÑ?иÑ?Ñ? к _иÑ?полнениÑ?..."
 
-#: ../mail/em-folder-view.c:1356
+#: ../mail/em-folder-view.c:1354
 msgid "_Label"
 msgstr "_Ð?еÑ?ка"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1357 ../widgets/misc/e-dateedit.c:478
+#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
 msgid "_None"
 msgstr "_Ð?еÑ?"
 
-#: ../mail/em-folder-view.c:1360
+#: ../mail/em-folder-view.c:1358
 msgid "_New Label"
 msgstr "_Ð?овÑ?й Ñ?Ñ?лÑ?к"
 
-#: ../mail/em-folder-view.c:1364
+#: ../mail/em-folder-view.c:1362
 msgid "Fla_g Completed"
 msgstr "Ð?Ñ?меÑ?ка «_Ð?авеÑ?Ñ?ено»"
 
-#: ../mail/em-folder-view.c:1365
+#: ../mail/em-folder-view.c:1363
 msgid "Cl_ear Flag"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ? оÑ?меÑ?кÑ?"
 
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1366
 msgid "Crea_te Rule From Message"
 msgstr "Созда_Ñ?Ñ? пÑ?авило из Ñ?ообÑ?ениÑ?"
 
 #. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1368
 msgid "Search Folder based on _Subject"
 msgstr "Ð?апка поиÑ?ка по _Ñ?еме"
 
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1369
 msgid "Search Folder based on Se_nder"
 msgstr "Ð?апка поиÑ?ка по _оÑ?пÑ?авиÑ?елÑ?"
 
-#: ../mail/em-folder-view.c:1372
+#: ../mail/em-folder-view.c:1370
 msgid "Search Folder based on _Recipients"
 msgstr "Ð?апка поиÑ?ка по _полÑ?Ñ?аÑ?елÑ?"
 
-#: ../mail/em-folder-view.c:1373
+#: ../mail/em-folder-view.c:1371
 msgid "Search Folder based on Mailing _List"
 msgstr "Ð?апка поиÑ?ка по Ñ?пиÑ?кÑ? _Ñ?аÑ?Ñ?Ñ?лки"
 
 #. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1376
 msgid "Filter based on Sub_ject"
 msgstr "ФилÑ?Ñ?Ñ? по _Ñ?еме"
 
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1377
 msgid "Filter based on Sen_der"
 msgstr "ФилÑ?Ñ?Ñ? по _оÑ?пÑ?авиÑ?елÑ?"
 
-#: ../mail/em-folder-view.c:1380
+#: ../mail/em-folder-view.c:1378
 msgid "Filter based on Re_cipients"
 msgstr "ФилÑ?Ñ?Ñ? по _полÑ?Ñ?аÑ?елÑ?м"
 
-#: ../mail/em-folder-view.c:1381
+#: ../mail/em-folder-view.c:1379
 msgid "Filter based on _Mailing List"
 msgstr "ФилÑ?Ñ?Ñ? по Ñ?пиÑ?кÑ? _Ñ?аÑ?Ñ?Ñ?лки"
 
 #. default charset used in mail view
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2257 ../mail/em-folder-view.c:2300
-#: ../plugins/google-account-setup/google-source.c:232
-#: ../plugins/google-account-setup/google-source.c:510
-#: ../plugins/google-account-setup/google-source.c:708
+#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../plugins/google-account-setup/google-source.c:304
+#: ../plugins/google-account-setup/google-source.c:613
+#: ../plugins/google-account-setup/google-source.c:784
 msgid "Default"
 msgstr "Ð?о Ñ?молÑ?аниÑ?"
 
-#: ../mail/em-folder-view.c:2518
+#: ../mail/em-folder-view.c:2493
 msgid "Unable to retrieve message"
 msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение"
 
-#: ../mail/em-folder-view.c:2537
-msgid "Retrieving Message..."
-msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ?..."
-
-#: ../mail/em-folder-view.c:2756
-msgid "C_all To..."
-msgstr "Ð?озвон_иÑ?Ñ?..."
-
-#: ../mail/em-folder-view.c:2759
+#: ../mail/em-folder-view.c:2696
 msgid "Create _Search Folder"
 msgstr "СоздаÑ?Ñ? папкÑ? поиÑ?ка"
 
-#: ../mail/em-folder-view.c:2760
+#: ../mail/em-folder-view.c:2697
 msgid "_From this Address"
 msgstr "_ Ñ?Ñ?ого адÑ?еÑ?а"
 
-#: ../mail/em-folder-view.c:2761
+#: ../mail/em-folder-view.c:2698
 msgid "_To this Address"
 msgstr "_Ð?о Ñ?Ñ?омÑ? адÑ?еÑ?Ñ?"
 
-#: ../mail/em-folder-view.c:3254
+#: ../mail/em-folder-view.c:3191
 #, c-format
 msgid "Click to mail %s"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? напиÑ?аÑ?Ñ? пиÑ?Ñ?мо %s"
 
-#: ../mail/em-folder-view.c:3266
+#: ../mail/em-folder-view.c:3203
 #, c-format
 msgid "Click to call %s"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? позвониÑ?Ñ? %s"
 
-#: ../mail/em-folder-view.c:3271
+#: ../mail/em-folder-view.c:3208
 msgid "Click to hide/unhide addresses"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? показаÑ?Ñ?/Ñ?кÑ?Ñ?Ñ?Ñ? адÑ?еÑ?а"
 
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "СовпадениÑ?: %d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "_Ð?айÑ?и:"
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "_Ð?Ñ?едÑ?дÑ?Ñ?ее"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "_СледÑ?Ñ?Ñ?ее"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "_УÑ?иÑ?Ñ?ваÑ?Ñ? Ñ?егиÑ?Ñ?Ñ?"
-
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:655
+#: ../mail/em-format-html-display.c:560 ../mail/em-format-html.c:654
 msgid "Unsigned"
 msgstr "Ð?е подпиÑ?ано"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:560
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "ЭÑ?о Ñ?ообÑ?ение не подпиÑ?ано. Ð?одлинноÑ?Ñ?Ñ? оÑ?пÑ?авиÑ?елÑ? не пÑ?овеÑ?ена."
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:656
+#: ../mail/em-format-html-display.c:561 ../mail/em-format-html.c:655
 msgid "Valid signature"
 msgstr "Ð?одпиÑ?Ñ? дейÑ?Ñ?виÑ?елÑ?на"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:561
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12741,11 +11477,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение подпиÑ?ано дейÑ?Ñ?виÑ?елÑ?ной подпиÑ?Ñ?Ñ?, Ñ?Ñ?о Ñ?доÑ?Ñ?овеÑ?Ñ?еÑ? "
 "подлинноÑ?Ñ?Ñ? оÑ?пÑ?авиÑ?елÑ?."
 
-#: ../mail/em-format-html-display.c:953 ../mail/em-format-html.c:657
+#: ../mail/em-format-html-display.c:562 ../mail/em-format-html.c:656
 msgid "Invalid signature"
 msgstr "Ð?одпиÑ?Ñ? недейÑ?Ñ?виÑ?елÑ?на"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:562
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12753,11 +11489,11 @@ msgstr ""
 "Ð?одпиÑ?Ñ? Ñ?Ñ?ого Ñ?ообÑ?ениÑ? не можеÑ? бÑ?Ñ?Ñ? пÑ?овеÑ?ена. Ð?озможно, Ñ?ообÑ?ение бÑ?ло "
 "изменено по доÑ?оге."
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:658
+#: ../mail/em-format-html-display.c:563 ../mail/em-format-html.c:657
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ð?одпиÑ?Ñ? дейÑ?Ñ?виÑ?елÑ?на, но пÑ?овеÑ?иÑ?Ñ? оÑ?пÑ?авиÑ?елÑ? не Ñ?далоÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:563
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12765,11 +11501,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение подпиÑ?ано дейÑ?Ñ?виÑ?елÑ?ной подпиÑ?Ñ?Ñ?, но оÑ?пÑ?авиÑ?елÑ? Ñ?ообÑ?ениÑ? не "
 "можеÑ? бÑ?Ñ?Ñ? пÑ?овеÑ?ен."
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:659
+#: ../mail/em-format-html-display.c:564 ../mail/em-format-html.c:658
 msgid "Signature exists, but need public key"
 msgstr "Ð?одпиÑ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?, но Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? пÑ?блиÑ?нÑ?й клÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:564
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12777,11 +11513,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение подпиÑ?ано дейÑ?Ñ?виÑ?елÑ?ной подпиÑ?Ñ?Ñ?, не не Ñ?далоÑ?Ñ? найÑ?и "
 "Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ?ий пÑ?блиÑ?нÑ?й клÑ?Ñ?."
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:665
+#: ../mail/em-format-html-display.c:571 ../mail/em-format-html.c:664
 msgid "Unencrypted"
 msgstr "Ð?е заÑ?иÑ?Ñ?овано"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:571
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12789,11 +11525,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение не заÑ?иÑ?Ñ?овано. Ð?го Ñ?одеÑ?жимое можеÑ? бÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?ено в "
 "пÑ?оÑ?еÑ?Ñ?е пеÑ?едаÑ?и по Ð?нÑ?еÑ?неÑ?Ñ?."
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:666
+#: ../mail/em-format-html-display.c:572 ../mail/em-format-html.c:665
 msgid "Encrypted, weak"
 msgstr "Ð?аÑ?иÑ?Ñ?овано, Ñ?Ñ?звимÑ?й Ñ?иÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:572
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12803,11 +11539,11 @@ msgstr ""
 "Ð?оÑ?Ñ?оÑ?онние лиÑ?а могÑ?Ñ?, Ñ?оÑ?Ñ? и Ñ? опÑ?еделÑ?ннÑ?ми Ñ?Ñ?Ñ?дноÑ?Ñ?Ñ?ми, полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п "
 "к Ñ?одеÑ?жимомÑ? пиÑ?Ñ?ма за Ñ?азÑ?мное вÑ?емÑ?."
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:667
+#: ../mail/em-format-html-display.c:573 ../mail/em-format-html.c:666
 msgid "Encrypted"
 msgstr "Ð?аÑ?иÑ?Ñ?овано"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:573
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12815,11 +11551,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение заÑ?иÑ?Ñ?овано. Ð?оÑ?Ñ?оÑ?онним лиÑ?ам бÑ?деÑ? оÑ?енÑ? Ñ?ложно пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? "
 "Ñ?одеÑ?жимое Ñ?Ñ?ого Ñ?ообÑ?ениÑ?."
 
-#: ../mail/em-format-html-display.c:965 ../mail/em-format-html.c:668
+#: ../mail/em-format-html-display.c:574 ../mail/em-format-html.c:667
 msgid "Encrypted, strong"
 msgstr "Ð?аÑ?иÑ?Ñ?овано, Ñ?Ñ?ойкий Ñ?иÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:574
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12829,88 +11565,58 @@ msgstr ""
 "Ð?лÑ? поÑ?Ñ?оÑ?оннего бÑ?деÑ? оÑ?енÑ? Ñ?ложнÑ?м пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? Ñ?одеÑ?жимое Ñ?Ñ?ого Ñ?ообÑ?ениÑ? "
 "в Ñ?азÑ?мнÑ?й пеÑ?иод вÑ?емени."
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:675 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "_Ð?Ñ?оÑ?моÑ?Ñ?еÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:690
 msgid "This certificate is not viewable"
 msgstr "ЭÑ?оÑ? Ñ?еÑ?Ñ?иÑ?икаÑ? нелÑ?зÑ? пÑ?оÑ?моÑ?Ñ?еÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:1410
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "Ð?Ñ?полнено %d %b %Y, %l:%M %p"
+#: ../mail/em-format-html-display.c:980
+msgid "Completed on"
+msgstr "Ð?авеÑ?Ñ?ено в"
 
-#: ../mail/em-format-html-display.c:1418
+#: ../mail/em-format-html-display.c:988
 msgid "Overdue:"
 msgstr "Ð?Ñ?оÑ?Ñ?оÑ?ена:"
 
-#: ../mail/em-format-html-display.c:1421
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "оÑ? %B %d, %Y, %l:%M %p"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:992
+msgid "by"
+msgstr "в"
 
-#: ../mail/em-format-html-display.c:1499
+#: ../mail/em-format-html-display.c:1071
+#: ../widgets/misc/e-attachment-view.c:357
 msgid "_View Inline"
 msgstr "_Ð?Ñ?Ñ?Ñ?оеннÑ?й пÑ?оÑ?моÑ?Ñ?"
 
-#: ../mail/em-format-html-display.c:1500
+#: ../mail/em-format-html-display.c:1072
+#: ../widgets/misc/e-attachment-view.c:350
 msgid "_Hide"
 msgstr "_СкÑ?Ñ?Ñ?Ñ?"
 
-#: ../mail/em-format-html-display.c:1501
+#: ../mail/em-format-html-display.c:1073
 msgid "_Fit to Width"
 msgstr "_УмеÑ?Ñ?иÑ?Ñ? по Ñ?иÑ?ине"
 
-#: ../mail/em-format-html-display.c:1502
+#: ../mail/em-format-html-display.c:1074
 msgid "Show _Original Size"
 msgstr "Ð?оказаÑ?Ñ? _иÑ?Ñ?однÑ?й Ñ?азмеÑ?"
 
-#: ../mail/em-format-html-display.c:2171
-msgid "Save attachment as"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вложение как"
-
-#: ../mail/em-format-html-display.c:2175
-msgid "Select folder to save all attachments"
-msgstr "Ð?Ñ?беÑ?иÑ?е папкÑ? длÑ? Ñ?оÑ?Ñ?анениÑ? вÑ?еÑ? вложений"
-
-#: ../mail/em-format-html-display.c:2226
-msgid "_Save Selected..."
-msgstr "_СоÑ?Ñ?аниÑ?Ñ? вÑ?деленнÑ?е..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2293
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d вложе_ние"
-msgstr[1] "%d вложе_ний"
-msgstr[2] "%d вложе_ний"
-
-#: ../mail/em-format-html-display.c:2300 ../mail/em-format-html-display.c:2390
-msgid "S_ave"
-msgstr "С_оÑ?Ñ?аниÑ?Ñ?"
-
-#: ../mail/em-format-html-display.c:2311
-msgid "S_ave All"
-msgstr "С_оÑ?Ñ?аниÑ?Ñ? вÑ?е"
-
-#: ../mail/em-format-html-display.c:2386
-msgid "No Attachment"
-msgstr "Ð?еÑ? вложений"
-
-#: ../mail/em-format-html-display.c:2533 ../mail/em-format-html-display.c:2572
+#: ../mail/em-format-html-display.c:1575 ../mail/em-format-html-display.c:1614
 msgid "View _Unformatted"
 msgstr "Ð?Ñ?обÑ?азиÑ?Ñ? _неоÑ?Ñ?оÑ?маÑ?иÑ?ованнÑ?е"
 
-#: ../mail/em-format-html-display.c:2535
+#: ../mail/em-format-html-display.c:1577
 msgid "Hide _Unformatted"
 msgstr "СкÑ?Ñ?Ñ?Ñ? _неÑ?оÑ?маÑ?иÑ?ованнÑ?е"
 
-#: ../mail/em-format-html-display.c:2592
+#: ../mail/em-format-html-display.c:1634
 msgid "O_pen With"
 msgstr "Ð?_Ñ?кÑ?Ñ?Ñ?Ñ? Ñ? помоÑ?Ñ?Ñ?"
 
-#: ../mail/em-format-html-display.c:2668
+#: ../mail/em-format-html-display.c:1711
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12924,246 +11630,238 @@ msgstr ""
 msgid "Page %d of %d"
 msgstr "СÑ?Ñ?аниÑ?а %d из %d"
 
-#: ../mail/em-format-html.c:506 ../mail/em-format-html.c:515
+#: ../mail/em-format-html.c:505 ../mail/em-format-html.c:514
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Ð?олÑ?Ñ?ение «%s»"
 
-#: ../mail/em-format-html.c:930
+#: ../mail/em-format-html.c:929
 msgid "Unknown external-body part."
 msgstr "Ð?еизвеÑ?Ñ?наÑ? Ñ?аÑ?Ñ?Ñ? external-body."
 
-#: ../mail/em-format-html.c:938
+#: ../mail/em-format-html.c:937
 msgid "Malformed external-body part."
 msgstr "ЧаÑ?Ñ?Ñ? external-body невеÑ?но Ñ?Ñ?оÑ?миÑ?ована"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:967
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "УказаÑ?елÑ? на FTP Ñ?айÑ? (%s)"
 
-#: ../mail/em-format-html.c:979
+#: ../mail/em-format-html.c:978
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "УказаÑ?елÑ? на локалÑ?нÑ?й Ñ?айл (%s), доÑ?Ñ?Ñ?пнÑ?й на Ñ?айÑ?е «%s»"
 
-#: ../mail/em-format-html.c:981
+#: ../mail/em-format-html.c:980
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "УказаÑ?елÑ? на локалÑ?нÑ?й Ñ?айл (%s)"
 
-#: ../mail/em-format-html.c:1002
+#: ../mail/em-format-html.c:1001
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "УказаÑ?елÑ? на Ñ?далÑ?ннÑ?е даннÑ?е (%s)"
 
-#: ../mail/em-format-html.c:1013
+#: ../mail/em-format-html.c:1012
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "УказаÑ?елÑ? на неизвеÑ?Ñ?нÑ?е внеÑ?ние даннÑ?е (Ñ?ипа «%s»)"
 
-#: ../mail/em-format-html.c:1241
+#: ../mail/em-format-html.c:1240
 msgid "Formatting message"
 msgstr "ФоÑ?маÑ?иÑ?ование Ñ?ообÑ?ениÑ?"
 
-#: ../mail/em-format-html.c:1415
+#: ../mail/em-format-html.c:1414
 msgid "Formatting Message..."
 msgstr "ФоÑ?маÑ?иÑ?ование Ñ?ообÑ?ениÑ?..."
 
-#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1632
-#: ../mail/em-format-html.c:1654 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:78
+#: ../mail/em-format-html.c:1567 ../mail/em-format-html.c:1631
+#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:926 ../mail/em-mailer-prefs.c:79
 msgid "Cc"
 msgstr "Ð?опиÑ?"
 
-#: ../mail/em-format-html.c:1569 ../mail/em-format-html.c:1638
-#: ../mail/em-format-html.c:1657 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:79
+#: ../mail/em-format-html.c:1568 ../mail/em-format-html.c:1637
+#: ../mail/em-format-html.c:1655 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:927 ../mail/em-mailer-prefs.c:80
 msgid "Bcc"
 msgstr "СкÑ?.копиÑ?"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1749 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
+#: ../mail/em-format-html.c:1747 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1435
 msgid "Mailer"
 msgstr "Ð?оÑ?Ñ?овÑ?й клиенÑ?"
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1776
-msgid " (%a, %R %Z)"
-msgstr " (%a, %R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1781
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1917
+#: ../mail/em-format-html.c:1910
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "ЭÑ?о пиÑ?Ñ?мо бÑ?ло оÑ?оÑ?лано <b>%s</b> оÑ? лиÑ?а <b>%s</b>"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "Ð?Ñ?"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:76
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:924
+#: ../mail/em-mailer-prefs.c:77
 msgid "Reply-To"
 msgstr "Ð?бÑ?аÑ?нÑ?й адÑ?еÑ?"
 
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
+#: ../mail/em-format.c:929 ../mail/em-mailer-prefs.c:82
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:338
 msgid "Date"
 msgstr "Ð?аÑ?а"
 
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:82
+#: ../mail/em-format.c:930 ../mail/em-mailer-prefs.c:83
 msgid "Newsgroups"
 msgstr "Ð?Ñ?Ñ?ппÑ? новоÑ?Ñ?ей"
 
-#: ../mail/em-format.c:893 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+#: ../mail/em-format.c:931 ../mail/em-mailer-prefs.c:84
+#: ../plugins/face/org-gnome-face.eplug.xml.h:4
 msgid "Face"
 msgstr "ФоÑ?о"
 
-#: ../mail/em-format.c:1160
+#: ../mail/em-format.c:1201
 #, c-format
 msgid "%s attachment"
 msgstr "вложение %s"
 
-#: ../mail/em-format.c:1199
+#: ../mail/em-format.c:1239
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение S/MIME: Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../mail/em-format.c:1336 ../mail/em-format.c:1492
+#: ../mail/em-format.c:1376 ../mail/em-format.c:1533
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение MIME. Ð?Ñ?обÑ?ажаеÑ?Ñ?Ñ? как еÑ?Ñ?Ñ?."
 
-#: ../mail/em-format.c:1344
+#: ../mail/em-format.c:1384
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Ð?еподдеÑ?живаемÑ?й Ñ?ип Ñ?иÑ?Ñ?ованиÑ? длÑ? multipart/encrypted"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение PGP/MIME"
 
-#: ../mail/em-format.c:1354
+#: ../mail/em-format.c:1394
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение PGP/MIME: Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../mail/em-format.c:1511
+#: ../mail/em-format.c:1552
 msgid "Unsupported signature format"
 msgstr "Ð?еподдеÑ?живаемÑ?й Ñ?оÑ?маÑ? подпиÑ?и"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1698
 msgid "Error verifying signature"
 msgstr "Ð?Ñ?ибка пÑ?овеÑ?ки подпиÑ?и"
 
-#: ../mail/em-format.c:1519 ../mail/em-format.c:1581 ../mail/em-format.c:1590
+#: ../mail/em-format.c:1560 ../mail/em-format.c:1689 ../mail/em-format.c:1698
 msgid "Unknown error verifying signature"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и пÑ?овеÑ?ке подпиÑ?и"
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение PGP."
 
-#: ../mail/em-format.c:1664
+#: ../mail/em-format.c:1772
 msgid "Could not parse PGP message: Unknown error"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?ообÑ?ение PGP: Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
 
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-mailer-prefs.c:95
 msgid "Every time"
 msgstr "Ð?аждÑ?й Ñ?аз"
 
-#: ../mail/em-mailer-prefs.c:95
+#: ../mail/em-mailer-prefs.c:96
 msgid "Once per day"
 msgstr "Ð?дин Ñ?аз в денÑ?"
 
-#: ../mail/em-mailer-prefs.c:96
+#: ../mail/em-mailer-prefs.c:97
 msgid "Once per week"
 msgstr "Ð?дин Ñ?аз в неделÑ?"
 
-#: ../mail/em-mailer-prefs.c:97
+#: ../mail/em-mailer-prefs.c:98
 msgid "Once per month"
 msgstr "Ð?дин Ñ?аз в меÑ?Ñ?Ñ?"
 
-#: ../mail/em-mailer-prefs.c:327
+#: ../mail/em-mailer-prefs.c:332
 msgid "Add Custom Junk Header"
 msgstr "Ð?обавиÑ?Ñ? Ñ?обÑ?Ñ?веннÑ?й заголовок Ñ?пама"
 
-#: ../mail/em-mailer-prefs.c:331
+#: ../mail/em-mailer-prefs.c:336
 msgid "Header Name:"
 msgstr "Ð?азвание заголовка:"
 
-#: ../mail/em-mailer-prefs.c:332
+#: ../mail/em-mailer-prefs.c:337
 msgid "Header Value Contains:"
 msgstr "Ð?наÑ?ение заголовка Ñ?одеÑ?жиÑ?:"
 
-#: ../mail/em-mailer-prefs.c:437
+#: ../mail/em-mailer-prefs.c:438 ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "Ð?аголовок"
+
+#: ../mail/em-mailer-prefs.c:442
 msgid "Contains Value"
 msgstr "СодеÑ?жиÑ? знаÑ?ение"
 
-#: ../mail/em-mailer-prefs.c:459
+#: ../mail/em-mailer-prefs.c:465
 msgid "Color"
 msgstr "ЦвеÑ?"
 
-#: ../mail/em-mailer-prefs.c:462
+#: ../mail/em-mailer-prefs.c:468
 msgid "Tag"
 msgstr "Ð?еÑ?ка"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
+#: ../mail/em-mailer-prefs.c:1063 ../mail/em-mailer-prefs.c:1117
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Ð?одÑ?лÑ? %s доÑ?Ñ?Ñ?пен и Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ?ий иÑ?полнÑ?емÑ?й Ñ?айл Ñ?Ñ?Ñ?ановлен"
 
 #. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
+#: ../mail/em-mailer-prefs.c:1071 ../mail/em-mailer-prefs.c:1126
 #, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
+msgid "%s plugin is not available. Please check whether the package is installed."
 msgstr "Ð?одÑ?лÑ? %s недоÑ?Ñ?Ñ?пен. Ð?Ñ?овеÑ?Ñ?Ñ?е, Ñ?Ñ?о Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ?ий пакеÑ? Ñ?Ñ?Ñ?ановлен."
 
-#: ../mail/em-mailer-prefs.c:1108
+#: ../mail/em-mailer-prefs.c:1092
 msgid "No Junk plugin available"
 msgstr "Ð?одÑ?лÑ? Ñ?абоÑ?Ñ? Ñ?о Ñ?памом недоÑ?Ñ?Ñ?пен"
 
+#: ../mail/em-mailer-prefs.c:1455
+msgid "Date header:"
+msgstr "Ð?аголовок даÑ?Ñ?:"
+
 #. green
-#: ../mail/em-migrate.c:1059
+#: ../mail/em-migrate.c:961
 msgid "To Do"
 msgstr "Ð?Ñ?полниÑ?Ñ?"
 
 #. blue
-#: ../mail/em-migrate.c:1060
+#: ../mail/em-migrate.c:962
 msgid "Later"
 msgstr "Ð?озже"
 
-#: ../mail/em-migrate.c:1228
+#: ../mail/em-migrate.c:1128
 msgid "Migration"
 msgstr "Ð?еÑ?еноÑ?"
 
-#: ../mail/em-migrate.c:1673
+#: ../mail/em-migrate.c:1573
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? папкÑ? `%s': %s"
 
-#: ../mail/em-migrate.c:1699
+#: ../mail/em-migrate.c:1599
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? деÑ?кÑ?ипÑ?оÑ? Ñ?айла: `%s' в `%s': %s"
 
-#: ../mail/em-migrate.c:1884
+#: ../mail/em-migrate.c:1784
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?каниÑ?оваÑ?Ñ? имеÑ?Ñ?иеÑ?Ñ? поÑ?Ñ?овÑ?е Ñ?Ñ?ики на `%s': %s"
 
-#: ../mail/em-migrate.c:1889
+#: ../mail/em-migrate.c:1789
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13175,31 +11873,31 @@ msgstr ""
 "\n"
 "Ð?одождиÑ?е, пока Evolution пÑ?еобÑ?азÑ?еÑ? ваÑ?и папки..."
 
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:1990
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?оÑ?Ñ?аненнÑ?е на Ñ?еÑ?веÑ?е POP даннÑ?е «%s»: %s"
 
-#: ../mail/em-migrate.c:2104
+#: ../mail/em-migrate.c:2004
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? каÑ?алог длÑ? Ñ?Ñ?анениÑ? даннÑ?Ñ? на Ñ?еÑ?веÑ?е POP3 «%s»: %s"
 
-#: ../mail/em-migrate.c:2133
+#: ../mail/em-migrate.c:2033
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?копиÑ?оваÑ?Ñ? Ñ?оÑ?Ñ?аненнÑ?е на Ñ?еÑ?веÑ?е POP3 даннÑ?е «%s»: %s"
 
-#: ../mail/em-migrate.c:2604 ../mail/em-migrate.c:2616
+#: ../mail/em-migrate.c:2504 ../mail/em-migrate.c:2516
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Ð?Ñ?ибка Ñ?озданиÑ? локалÑ?ного Ñ?Ñ?анилиÑ?а поÑ?Ñ?Ñ? «%s»: %s"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid "Migrating Folders"
 msgstr "Ð?еÑ?еноÑ? папок"
 
-#: ../mail/em-migrate.c:2974
+#: ../mail/em-migrate.c:2874
 msgid ""
 "The summary format of the Evolution mailbox folders has been moved to SQLite "
 "since Evolution 2.24.\n"
@@ -13211,12 +11909,12 @@ msgstr ""
 "\n"
 "Ð?одождиÑ?е, пока Evolution пÑ?еобÑ?азÑ?еÑ? ваÑ?и папки..."
 
-#: ../mail/em-migrate.c:3056
+#: ../mail/em-migrate.c:2955
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? локалÑ?нÑ?е поÑ?Ñ?овÑ?е папки в «%s»: %s"
 
-#: ../mail/em-migrate.c:3075
+#: ../mail/em-migrate.c:2974
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13224,74 +11922,91 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? даннÑ?е пÑ?едÑ?дÑ?Ñ?ей Ñ?Ñ?Ñ?ановки Evolution, `evolution/"
 "config/xmldb' не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ? или повÑ?ежден."
 
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
+#: ../mail/em-popup.c:364
+msgid "Save As..."
+msgstr "СоÑ?Ñ?аниÑ?Ñ? как..."
+
+#: ../mail/em-popup.c:389
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../mail/em-popup.c:495 ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "УÑ?Ñ?ановиÑ?Ñ? как _Ñ?он"
+
+#: ../mail/em-popup.c:497
 msgid "_Reply to sender"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ? оÑ?п_Ñ?авиÑ?елÑ?"
 
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:498 ../ui/evolution-mail-message.xml.h:79
 msgid "Reply to _List"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ? в _Ñ?пиÑ?ок"
 
 #. make it first item
-#: ../mail/em-popup.c:623 ../mail/em-popup.c:848
+#: ../mail/em-popup.c:547 ../mail/em-popup.c:746
 msgid "_Add to Address Book"
 msgstr "_Ð?обавиÑ?Ñ? в адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
-#: ../mail/em-subscribe-editor.c:605
+#: ../mail/em-popup.c:725
+#, c-format
+msgid "Open in %s..."
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? в пÑ?огÑ?амме %s..."
+
+#: ../mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "ЭÑ?оÑ? Ñ?еÑ?веÑ? не поддеÑ?живаеÑ? подпиÑ?кÑ?, или подпиÑ?ка запÑ?еÑ?ена."
 
-#: ../mail/em-subscribe-editor.c:638
+#: ../mail/em-subscribe-editor.c:639
 msgid "Subscribed"
 msgstr "Ð?одпиÑ?ан"
 
-#: ../mail/em-subscribe-editor.c:642
+#: ../mail/em-subscribe-editor.c:643
 msgid "Folder"
 msgstr "Ð?апка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:844
+#: ../mail/em-subscribe-editor.c:858
 msgid "Please select a server."
 msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е Ñ?еÑ?веÑ?."
 
-#: ../mail/em-subscribe-editor.c:865
+#: ../mail/em-subscribe-editor.c:894
 msgid "No server has been selected"
 msgstr "Ð?е бÑ?л вÑ?бÑ?ан Ñ?еÑ?веÑ?"
 
 #. Check buttons
-#: ../mail/em-utils.c:122
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../mail/em-utils.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:129
 msgid "_Do not show this message again."
 msgstr "_Ð?е вÑ?водиÑ?Ñ? болÑ?Ñ?е Ñ?Ñ?о Ñ?ообÑ?ение."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "ФилÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ений"
 
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:369
 msgid "message"
 msgstr "Ñ?ообÑ?ение"
 
-#: ../mail/em-utils.c:655
+#: ../mail/em-utils.c:652
 msgid "Save Message..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?ообÑ?ение ..."
 
-#: ../mail/em-utils.c:705
+#: ../mail/em-utils.c:702
 msgid "Add address"
 msgstr "Ð?обавиÑ?Ñ? адÑ?еÑ?"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1226
+#: ../mail/em-utils.c:1223
 #, c-format
 msgid "Messages from %s"
 msgstr "СообÑ?ениÑ? оÑ? %s"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:114
 msgid "Search _Folders"
 msgstr "_Ð?апки поиÑ?ка"
 
-#: ../mail/em-vfolder-rule.c:593
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "Ð?Ñ?Ñ?оÑ?ник папок поиÑ?ка"
 
@@ -13513,39 +12228,42 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ð?Ñ?иÑ?аÑ?Ñ? вÑ?е коÑ?зинÑ? пÑ?и вÑ?Ñ?оде из Evolution."
 
 #: ../mail/evolution-mail.schemas.in.h:47
-msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Ð?клÑ?Ñ?иÑ?Ñ? Ñ?ежим каÑ?еÑ?ки, Ñ?о еÑ?Ñ?Ñ? вÑ? Ñ?можеÑ?е видеÑ?Ñ? кÑ?Ñ?Ñ?оÑ? пÑ?и Ñ?Ñ?ении поÑ?Ñ?Ñ?."
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr "Ð?клÑ?Ñ?иÑ?Ñ? анимаÑ?иÑ? изобÑ?ажений в Ñ?ообÑ?ениÑ?Ñ? HTML. Ð?ногие полÑ?зоваÑ?ели наÑ?одÑ?Ñ? анимиÑ?ованнÑ?е изобÑ?ажениÑ? Ñ?аздÑ?ажаÑ?Ñ?ими и вмеÑ?Ñ?о Ñ?Ñ?ого пÑ?едпоÑ?иÑ?аÑ?Ñ? видеÑ?Ñ? Ñ?Ñ?аÑ?иÑ?еÑ?кие изобÑ?ажениÑ?."
 
 #: ../mail/evolution-mail.schemas.in.h:48
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
+msgstr "Ð?клÑ?Ñ?иÑ?Ñ? Ñ?ежим каÑ?еÑ?ки, Ñ?о еÑ?Ñ?Ñ? вÑ? Ñ?можеÑ?е видеÑ?Ñ? кÑ?Ñ?Ñ?оÑ? пÑ?и Ñ?Ñ?ении поÑ?Ñ?Ñ?."
+
+#: ../mail/evolution-mail.schemas.in.h:49
 msgid "Enable or disable magic space bar"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? или вÑ?клÑ?Ñ?иÑ?Ñ? «волÑ?ебнÑ?й пÑ?обел»"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "Ð?клÑ?Ñ?аеÑ?/вÑ?клÑ?Ñ?аеÑ? запÑ?оÑ? подÑ?веÑ?ждениÑ? пÑ?и помеÑ?ке неÑ?колÑ?киÑ? Ñ?ообÑ?ений."
+
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Enable or disable type ahead search feature"
 msgstr "Enable or disable type ahead search feature"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Enable search folders"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? папки поиÑ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Enable search folders on startup."
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? папки поиÑ?ка пÑ?и запÑ?Ñ?ке."
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"Ð?клÑ?Ñ?иÑ?Ñ? возможноÑ?Ñ?и инÑ?еÑ?акÑ?ивного поиÑ?ка по меÑ?е набоÑ?а Ñ?екÑ?Ñ?а в боковой "
-"панели. ЭÑ?а возможноÑ?Ñ?Ñ? иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? длÑ? бÑ?Ñ?Ñ?Ñ?ого поиÑ?ка нÑ?жной папки, "
-"коÑ?оÑ?Ñ?й можно пÑ?оизвеÑ?Ñ?и, пÑ?оÑ?Ñ?о набÑ?ав имÑ? папки. Ð?Ñ?деление бÑ?деÑ? "
-"авÑ?омаÑ?иÑ?еÑ?ки пеÑ?емеÑ?ено к нÑ?жной папке."
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:55
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -13553,42 +12271,43 @@ msgstr ""
 "УÑ?Ñ?ановиÑ?е Ñ?Ñ?оÑ? клÑ?Ñ?, Ñ?Ñ?обÑ? можно бÑ?ло иÑ?полÑ?зоваÑ?Ñ? клавиÑ?Ñ? пÑ?обела длÑ? "
 "пÑ?окÑ?Ñ?Ñ?ки пÑ?едпÑ?оÑ?моÑ?Ñ?а Ñ?ообÑ?ениÑ?, Ñ?пиÑ?ка Ñ?ообÑ?ений и папок."
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable to render message text part of limited size."
 msgstr "РазÑ?еÑ?иÑ?Ñ? Ñ?ендеÑ?инг Ñ?екÑ?Ñ?овой Ñ?аÑ?Ñ?и Ñ?ообÑ?ениÑ? огÑ?аниÑ?енного Ñ?азмеÑ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable/disable caret mode"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ?/вÑ?клÑ?Ñ?иÑ?Ñ? Ñ?ежим каÑ?еÑ?ки"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:58 ../mail/mail-config.glade.h:86
 msgid "Encode file names in an Outlook/GMail way"
 msgstr "Ð?одиÑ?оваÑ?Ñ? имена Ñ?айлов в Ñ?Ñ?иле Outlook/GMail"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:59
+#, fuzzy
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 "Ð?одиÑ?оваÑ?Ñ? имена Ñ?айлов в заголовкаÑ? длÑ? Ñ?овмеÑ?Ñ?имоÑ?Ñ?и Ñ? Outlook или Gmail. "
 "ЭÑ?и пÑ?иложениÑ? иÑ?полÑ?зÑ?Ñ?Ñ? некоÑ?Ñ?екÑ?нÑ?Ñ? кодиÑ?овкÑ? локализованнÑ?Ñ? имÑ?н Ñ?айлов "
 "из RFC 2047, в Ñ?о вÑ?емÑ? как дейÑ?Ñ?вÑ?еÑ? Ñ?Ñ?андаÑ?Ñ? RFC2231."
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Height of the message-list pane"
 msgstr "Ð?Ñ?Ñ?оÑ?а панели Ñ?пиÑ?ка Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Height of the message-list pane."
 msgstr "Ð?Ñ?Ñ?оÑ?а панели Ñ?пика Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid "Hides the per-folder preview and removes the selection"
-msgstr ""
-"СкÑ?Ñ?Ñ?Ñ? пÑ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ? длÑ? каждого каÑ?алога и Ñ?далиÑ?Ñ? вÑ?деление"
+msgstr "СкÑ?Ñ?Ñ?Ñ? пÑ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ? длÑ? каждого каÑ?алога и Ñ?далиÑ?Ñ? вÑ?деление"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -13596,7 +12315,7 @@ msgstr ""
 "Ð?Ñ?ли полÑ?зоваÑ?елÑ? пÑ?Ñ?аеÑ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? 10 или более Ñ?ообÑ?ений одновÑ?еменно, "
 "вÑ?водиÑ?Ñ? диалог запÑ?оÑ?а, дейÑ?Ñ?виÑ?елÑ?но ли полÑ?зоваÑ?елÑ? Ñ?оÑ?еÑ? Ñ?Ñ?о Ñ?делаÑ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
@@ -13604,7 +12323,7 @@ msgstr ""
 "Ð?Ñ?ли вклÑ?Ñ?ен пÑ?едваÑ?иÑ?елÑ?нÑ?й пÑ?оÑ?моÑ?Ñ? Ñ?ообÑ?ений, оÑ?обÑ?ажаÑ?Ñ? его Ñ?бокÑ?, а не "
 "под Ñ?пиÑ?ком Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13615,7 +12334,7 @@ msgstr ""
 "компоненÑ?ом пÑ?оÑ?моÑ?Ñ?а Bonobo Ñ?Ñ?едÑ? GNOME бÑ?дÑ?Ñ? оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? Ñ? иÑ?полÑ?зованием "
 "Ñ?Ñ?ого компоненÑ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
@@ -13623,7 +12342,7 @@ msgstr ""
 "Ð?Ñ?Ñ?одное знаÑ?ение вÑ?Ñ?оÑ?Ñ? окна «Ð?Ñ?пÑ?авка и полÑ?Ñ?ение поÑ?Ñ?Ñ?». ЭÑ?о знаÑ?ение "
 "изменÑ?еÑ?Ñ?Ñ?, когда полÑ?зоваÑ?елÑ? изменÑ?еÑ? Ñ?азмеÑ? окна по веÑ?Ñ?икали."
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13637,7 +12356,7 @@ msgstr ""
 "окно «Ð?Ñ?пÑ?авка и полÑ?Ñ?ение поÑ?Ñ?Ñ?» не можеÑ? бÑ?Ñ?Ñ? Ñ?азвÑ?Ñ?нÑ?Ñ?о на веÑ?Ñ? Ñ?кÑ?ан. "
 "ЭÑ?оÑ? клÑ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ? Ñ?олÑ?ко из-за деÑ?алей Ñ?еализаÑ?ии."
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Initial width of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window horizontally."
@@ -13645,12 +12364,7 @@ msgstr ""
 "Ð?Ñ?Ñ?одное знаÑ?ение Ñ?иÑ?инÑ? окна «Ð?Ñ?пÑ?авка и полÑ?Ñ?ение поÑ?Ñ?Ñ?». ЭÑ?о знаÑ?ение "
 "изменÑ?еÑ?Ñ?Ñ?, когда полÑ?зоваÑ?елÑ? изменÑ?еÑ? Ñ?азмеÑ? окна по гоÑ?изонÑ?али."
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr ""
-"Ð?клÑ?Ñ?аеÑ?/вÑ?клÑ?Ñ?аеÑ? запÑ?оÑ? подÑ?веÑ?ждениÑ? пÑ?и помеÑ?ке неÑ?колÑ?киÑ? Ñ?ообÑ?ений."
-
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid ""
 "It disables/enables the repeated prompts to ask if offline sync is required "
 "before going into offline mode."
@@ -13658,7 +12372,7 @@ msgstr ""
 "Ð?клÑ?Ñ?аеÑ?/вÑ?клÑ?Ñ?аеÑ? повÑ?оÑ?Ñ?Ñ?Ñ?иеÑ?Ñ? запÑ?оÑ?Ñ? о Ñ?ом, надо ли Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ? "
 "пеÑ?ед пеÑ?еÑ?одом в авÑ?ономнÑ?й Ñ?ежим."
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13668,31 +12382,31 @@ msgstr ""
 "Ñ?ообÑ?ений из папки поиÑ?ка они Ñ?далÑ?Ñ?Ñ?Ñ?Ñ? Ñ?овÑ?ем, а не Ñ?олÑ?ко из Ñ?езÑ?лÑ?Ñ?аÑ?ов "
 "поиÑ?ка."
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Last time empty junk was run"
 msgstr "Ð?Ñ?емÑ? поÑ?ледней оÑ?иÑ?Ñ?ки Ñ?пама"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Last time empty trash was run"
 msgstr "Ð?Ñ?емÑ? поÑ?ледней оÑ?иÑ?Ñ?ки коÑ?зинÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "List of Labels and their associated colors"
 msgstr "СпиÑ?ок Ñ?Ñ?лÑ?ков и Ñ?вÑ?заннÑ?Ñ? Ñ? ними Ñ?веÑ?ов"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "СпиÑ?ок Ñ?ипов mime длÑ? подбоÑ?а компоненÑ?а пÑ?оÑ?моÑ?Ñ?а Ñ?еÑ?ез Bonobo"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "List of accepted licenses"
 msgstr "СпиÑ?ок пÑ?инÑ?Ñ?Ñ?Ñ? лиÑ?ензий"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "List of accounts"
 msgstr "СпиÑ?ок Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?ей"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13701,15 +12415,15 @@ msgstr ""
 "Ñ?пиÑ?ок Ñ?одеÑ?жиÑ? Ñ?Ñ?Ñ?оки, Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?Ñ?Ñ?ие именам каÑ?алогов в /apps/evolution/"
 "mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "List of custom headers and whether they are enabled."
 msgstr "СпиÑ?ок дополниÑ?елÑ?нÑ?Ñ? заголовков и вклÑ?Ñ?енÑ? ли они."
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
 msgid "List of dictionary language codes used for spell checking."
 msgstr "СпиÑ?ок Ñ?зÑ?ков, иÑ?полÑ?зÑ?емÑ?й длÑ? пÑ?овеÑ?ки оÑ?Ñ?огÑ?аÑ?ии."
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13717,15 +12431,15 @@ msgstr ""
 "СпиÑ?ок Ñ?Ñ?лÑ?ков, извеÑ?Ñ?нÑ?Ñ? поÑ?Ñ?овомÑ? компоненÑ?Ñ? Evolution. СпиÑ?ок Ñ?одеÑ?жиÑ? "
 "Ñ?Ñ?Ñ?оки имÑ?:Ñ?веÑ?, где Ñ?веÑ? иÑ?полÑ?зÑ?еÑ? кодиÑ?овкÑ? Ñ?веÑ?а HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid "List of protocol names whose license has been accepted."
 msgstr "СпиÑ?ок имен пÑ?оÑ?околов, Ñ?Ñ?и лиÑ?ензии бÑ?ли пÑ?инÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Load images for HTML messages over HTTP"
 msgstr "Ð?агÑ?Ñ?жаÑ?Ñ? Ñ?ообÑ?ениÑ? длÑ? HTML-Ñ?ообÑ?ений по HTTP"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13735,245 +12449,313 @@ msgstr ""
 "â?? никогда не загÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ? из Ñ?еÑ?и; «1» â?? загÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ?, еÑ?ли "
 "оÑ?пÑ?авиÑ?елÑ? еÑ?Ñ?Ñ? в адÑ?еÑ?ной книге; «2» â?? вÑ?егда загÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ? из Ñ?еÑ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Log filter actions"
 msgstr "РегиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ? дейÑ?Ñ?виÑ? Ñ?илÑ?Ñ?Ñ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Log filter actions to the specified log file."
 msgstr "РегиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ? дейÑ?Ñ?виÑ? Ñ?илÑ?Ñ?Ñ?а в Ñ?казанном Ñ?айле жÑ?Ñ?нала."
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "Logfile to log filter actions"
 msgstr "Файл жÑ?Ñ?нала дейÑ?Ñ?вий Ñ?илÑ?Ñ?Ñ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "Logfile to log filter actions."
 msgstr "Файл жÑ?Ñ?нала дейÑ?Ñ?вий Ñ?илÑ?Ñ?Ñ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "Mark as Seen after specified timeout"
 msgstr "Ð?омеÑ?аÑ?Ñ? как пÑ?оÑ?моÑ?Ñ?еннÑ?е Ñ?еÑ?ез Ñ?казанное вÑ?емÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Mark as Seen after specified timeout."
 msgstr "Ð?омеÑ?аÑ?Ñ? Ñ?ообÑ?ение как пÑ?оÑ?моÑ?Ñ?енное Ñ?еÑ?ез Ñ?казаннÑ?й пеÑ?иод вÑ?емени."
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Mark citations in the message \"Preview\""
 msgstr "Ð?омеÑ?аÑ?Ñ? Ñ?иÑ?иÑ?ование в Ñ?ообÑ?ении в панели пÑ?едваÑ?иÑ?елÑ?ного пÑ?оÑ?моÑ?Ñ?а"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Ð?омеÑ?аÑ?Ñ? Ñ?иÑ?иÑ?ование в Ñ?ообÑ?ении в панели пÑ?едваÑ?иÑ?елÑ?ного пÑ?оÑ?моÑ?Ñ?а."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "Message Window default height"
 msgstr "Ð?Ñ?Ñ?оÑ?а окна Ñ?ообÑ?ениÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Message Window default width"
 msgstr "ШиÑ?ина окна Ñ?ообÑ?ениÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Тип оÑ?обÑ?ажениÑ? Ñ?ообÑ?ениÑ? («normal», «full headers», «source»)"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Ð?инималÑ?ное колиÑ?еÑ?Ñ?во дней междÑ? оÑ?иÑ?Ñ?кой Ñ?пама пÑ?и вÑ?Ñ?оде"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Ð?инималÑ?ное колиÑ?еÑ?Ñ?во дней междÑ? оÑ?иÑ?Ñ?кой коÑ?зинÑ? пÑ?и вÑ?Ñ?оде"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Ð?инималÑ?ное вÑ?емÑ? междÑ? оÑ?иÑ?Ñ?кой Ñ?пама пÑ?и вÑ?Ñ?оде, в днÑ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Ð?инималÑ?ное вÑ?емÑ? междÑ? оÑ?иÑ?Ñ?кой коÑ?зинÑ? пÑ?и вÑ?Ñ?оде, в днÑ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Ð?олиÑ?еÑ?Ñ?во адÑ?еÑ?ов, оÑ?обÑ?ажаемÑ?Ñ? в TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Prompt on empty subject"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, еÑ?ли Ñ?ема пÑ?Ñ?Ñ?аÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, еÑ?ли полÑ?зоваÑ?елÑ? пÑ?Ñ?аеÑ?Ñ?Ñ? оÑ?иÑ?Ñ?иÑ?Ñ? Ñ?далÑ?ннÑ?е Ñ?ообÑ?ениÑ? в "
 "папке."
 
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, еÑ?ли полÑ?зоваÑ?елÑ? пÑ?Ñ?аеÑ?Ñ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение Ñ? пÑ?Ñ?Ñ?Ñ?м полем "
 "Subject."
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Prompt to check if the user wants to go offline immediately"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? о немедленном вÑ?Ñ?оде в авÑ?ономнÑ?й Ñ?ежим"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Prompt when deleting messages in search folder"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и Ñ?далении Ñ?ообÑ?ений в папке поиÑ?ка"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Prompt when user expunges"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?иÑ?Ñ?ке полÑ?зоваÑ?елем"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Prompt when user only fills Bcc"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, еÑ?ли полÑ?зоваÑ?елÑ? заполнил Ñ?олÑ?ко поле Bcc"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Ð?Ñ?водиÑ?Ñ? запÑ?оÑ? пÑ?и попÑ?Ñ?ке полÑ?зоваÑ?елÑ? оÑ?кÑ?Ñ?Ñ?Ñ? 10 или более Ñ?ообÑ?ений "
 "одновÑ?еменно"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr ""
-"Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений в Ñ?оÑ?маÑ?е HTML Ñ?ем, кÑ?о не желаеÑ? Ñ?Ñ?ого."
+msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений в Ñ?оÑ?маÑ?е HTML Ñ?ем, кÑ?о не желаеÑ? Ñ?Ñ?ого."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и попÑ?Ñ?ке оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение Ñ? пÑ?Ñ?Ñ?Ñ?ми полÑ?ми To и Cc."
+msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и попÑ?Ñ?ке оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение Ñ? пÑ?Ñ?Ñ?Ñ?ми полÑ?ми To и Cc."
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-"Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, когда полÑ?зоваÑ?елÑ? пÑ?Ñ?аеÑ?Ñ?Ñ? оÑ?пÑ?авиÑ?Ñ? нежелаÑ?елÑ?нÑ?й HTML"
+msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ?, когда полÑ?зоваÑ?елÑ? пÑ?Ñ?аеÑ?Ñ?Ñ? оÑ?пÑ?авиÑ?Ñ? нежелаÑ?елÑ?нÑ?й HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Prompt while marking multiple messages"
 msgstr "Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и помеÑ?ке неÑ?колÑ?киÑ? Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Put the cursor at the bottom of replies"
+msgstr "Ð?омеÑ?аÑ?Ñ? кÑ?Ñ?Ñ?оÑ? в наÑ?ало пÑ?и оÑ?веÑ?е"
+
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "РаÑ?познаваÑ?Ñ? Ñ?моÑ?ии в Ñ?екÑ?Ñ?е и заменÑ?Ñ?Ñ? иÑ? знаÑ?ками."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Recognize links in text and replace them."
 msgstr "РаÑ?познаваÑ?Ñ? Ñ?Ñ?Ñ?лки в Ñ?екÑ?Ñ?е и заменÑ?Ñ?Ñ? иÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Run junk test on incoming mail."
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? на Ñ?пам вÑ?одÑ?Ñ?Ñ?Ñ? поÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Save directory"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? каÑ?алог"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Search for the sender photo in local address books"
 msgstr "Ð?Ñ?каÑ?Ñ? Ñ?оÑ?огÑ?аÑ?ии оÑ?пÑ?авиÑ?елÑ? в локалÑ?нÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгаÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Send HTML mail by default"
 msgstr "Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? поÑ?Ñ?Ñ? в Ñ?оÑ?маÑ?е HTML по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Send HTML mail by default."
 msgstr "Ð?Ñ?пÑ?авлÑ?Ñ?Ñ? поÑ?Ñ?Ñ? в Ñ?оÑ?маÑ?е HTML по Ñ?молÑ?аниÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Sender email-address column in the message list"
 msgstr "Ð?оказÑ?ваÑ?Ñ? адÑ?еÑ? оÑ?пÑ?авиÑ?елÑ? в Ñ?Ñ?олбÑ?е Ñ?пиÑ?ка Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Server synchronization interval"
 msgstr "Ð?нÑ?еÑ?вал Ñ?инÑ?Ñ?онизаÑ?ии Ñ? Ñ?еÑ?веÑ?ом"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «Bcc» пÑ?и оÑ?пÑ?авке поÑ?Ñ?ового Ñ?ообÑ?ениÑ?"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «Cc» пÑ?и оÑ?пÑ?авке поÑ?Ñ?ового Ñ?ообÑ?ениÑ?"
+
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «From» пÑ?и оÑ?пÑ?авке в гÑ?Ñ?ппÑ? новоÑ?Ñ?ей"
+
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid "Show \"From\" field when sending a mail message"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «From» пÑ?и оÑ?пÑ?авке поÑ?Ñ?ового Ñ?ообÑ?ениÑ?"
+
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «Reply To» пÑ?и оÑ?пÑ?авке в гÑ?Ñ?ппÑ? новоÑ?Ñ?ей"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? поле «Reply To» пÑ?и оÑ?пÑ?авке поÑ?Ñ?овÑ?Ñ? Ñ?ообÑ?ений"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Show Animations"
 msgstr "Ð?оказÑ?ваÑ?Ñ? анимаÑ?иÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Show animated images as animations."
 msgstr "Ð?оказÑ?ваÑ?Ñ? анимиÑ?ованнÑ?е изобÑ?ажениÑ? как анимаÑ?ии."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?далÑ?ннÑ?е Ñ?ообÑ?ениÑ? (как пеÑ?еÑ?еÑ?кнÑ?Ñ?Ñ?е) в Ñ?пиÑ?ке Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Show deleted messages in the message-list"
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?далÑ?ннÑ?е Ñ?ообÑ?ениÑ? в Ñ?пиÑ?ке Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid "Show image animations"
+msgstr "Ð?оказÑ?ваÑ?Ñ? анимаÑ?иÑ? изобÑ?ажений"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Show photo of the sender"
 msgstr "Ð?оказаÑ?Ñ? Ñ?оÑ?огÑ?аÑ?иÑ? оÑ?пÑ?авиÑ?елÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:136
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Ð?оказÑ?ваÑ?Ñ? адÑ?еÑ? оÑ?пÑ?авиÑ?елÑ? в оÑ?делÑ?ном Ñ?Ñ?олбÑ?е Ñ?пиÑ?ка Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?оÑ?огÑ?аÑ?иÑ? оÑ?пÑ?авиÑ?елÑ? в панели Ñ?Ñ?ениÑ? Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Spell check inline"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? оÑ?Ñ?огÑ?аÑ?иÑ? пÑ?и вводе"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Spell checking color"
 msgstr "ЦвеÑ? пÑ?овеÑ?ки оÑ?Ñ?огÑ?аÑ?ии"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Spell checking languages"
 msgstr "ЯзÑ?ки пÑ?овеÑ?ки оÑ?Ñ?огÑ?аÑ?ии"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Subscribe dialog default height"
 msgstr "Ð?Ñ?Ñ?оÑ?а диалога подпиÑ?ки по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "Subscribe dialog default width"
 msgstr "ШиÑ?ина окна диалога подпиÑ?ки по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Terminal font"
 msgstr "ШÑ?иÑ?Ñ? Ñ?еÑ?минала"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Text message part limit"
 msgstr "Ð?гÑ?аниÑ?ение Ñ?азмеÑ?а Ñ?екÑ?Ñ?ового вложениÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "The default plugin for Junk hook"
 msgstr "Ð?одÑ?лÑ?, обÑ?абаÑ?Ñ?ваÑ?Ñ?ий Ñ?пам по Ñ?молÑ?аниÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "Ð?Ñ?емÑ? поÑ?ледней оÑ?иÑ?Ñ?ки Ñ?пама, в днÑ?Ñ? Ñ? наÑ?ала Ñ?поÑ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "Ð?Ñ?емÑ? поÑ?ледней оÑ?иÑ?Ñ?ки коÑ?зинÑ?, в днÑ?Ñ? Ñ? наÑ?ала Ñ?поÑ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "The terminal font for mail display."
 msgstr "ШÑ?иÑ?Ñ? Ñ?еÑ?минала длÑ? оÑ?обÑ?ажениÑ? поÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "The variable width font for mail display."
 msgstr "Ð?Ñ?опоÑ?Ñ?ионалÑ?нÑ?й Ñ?Ñ?иÑ?Ñ? длÑ? оÑ?новного диÑ?плеÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -13981,7 +12763,7 @@ msgstr ""
 "У Ñ?Ñ?ого клÑ?Ñ?а можеÑ? бÑ?Ñ?Ñ? одно из Ñ?Ñ?Ñ?Ñ? знаÑ?ений: 0 â?? оÑ?ибки, 1 â?? "
 "пÑ?едÑ?пÑ?еждениÑ?; 2 â?? оÑ?ладоÑ?нÑ?е Ñ?ообÑ?ениÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13990,7 +12772,7 @@ msgstr ""
 "внÑ?Ñ?Ñ?и пиÑ?Ñ?ма в пÑ?огÑ?амме Evolution. РазмеÑ? по Ñ?молÑ?аниÑ? 4Ð?Ð? / 4096 Ð?Ð? и "
 "Ñ?казÑ?ваеÑ?Ñ?Ñ? в Ð?Ð?."
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -14000,7 +12782,7 @@ msgstr ""
 "обÑ?абоÑ?ки Ñ?пама вклÑ?Ñ?енÑ? одновÑ?еменно. Ð?Ñ?ли модÑ?лÑ? по Ñ?молÑ?аниÑ? вÑ?клÑ?Ñ?ен, "
 "доÑ?Ñ?Ñ?пнÑ?е модÑ?ли обÑ?абоÑ?ки Ñ?пама вÑ?Ñ? Ñ?авно не бÑ?дÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -14009,7 +12791,7 @@ msgstr ""
 "помоÑ?Ñ?Ñ? него можно оÑ?мениÑ?Ñ? вÑ?деление поÑ?Ñ?Ñ? и оÑ?клÑ?Ñ?иÑ?Ñ? панелÑ? пÑ?оÑ?моÑ?Ñ?а "
 "Ñ?екÑ?Ñ?его каÑ?алога."
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -14021,7 +12803,7 @@ msgstr ""
 "enabled&gt; - Ñ?Ñ?Ñ?ановиÑ?Ñ? вклÑ?Ñ?еннÑ?м, еÑ?ли заголовок должен оÑ?обÑ?ажаÑ?Ñ?Ñ?Ñ? в "
 "окне пÑ?оÑ?моÑ?Ñ?а поÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -14031,11 +12813,11 @@ msgstr ""
 "иÑ?полÑ?зоваÑ?Ñ? ли Ñ?олÑ?ко локалÑ?нÑ?е адÑ?еÑ?нÑ?е книги пÑ?и иÑ?клÑ?Ñ?ении извеÑ?Ñ?нÑ?Ñ? "
 "конÑ?акÑ?ов пÑ?и Ñ?илÑ?Ñ?Ñ?аÑ?ии Ñ?пама."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "This option would help in improving the speed of fetching."
 msgstr "ЭÑ?оÑ? паÑ?амеÑ?Ñ? должен Ñ?велиÑ?иÑ?Ñ? Ñ?коÑ?оÑ?Ñ?Ñ? загÑ?Ñ?зки."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -14043,7 +12825,7 @@ msgstr ""
 "УÑ?Ñ?анавливаеÑ? колиÑ?еÑ?Ñ?во адÑ?еÑ?ов, оÑ?обÑ?ажаемÑ?Ñ? пÑ?и пÑ?оÑ?моÑ?Ñ?е Ñ?ообÑ?ениÑ?, за "
 "коÑ?оÑ?Ñ?ми оÑ?обÑ?ажаеÑ?Ñ?Ñ? «...»."
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -14052,7 +12834,7 @@ msgstr ""
 "Ñ?вÑ?Ñ?нÑ?Ñ?ой. ЧÑ?обÑ? изменение Ñ?Ñ?ого клÑ?Ñ?а вÑ?Ñ?Ñ?пило в Ñ?илÑ?, надо пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? "
 "Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -14062,115 +12844,89 @@ msgstr ""
 "Ñ?ообÑ?ениÑ? в каждой подÑ?ивке, а не по даÑ?е Ñ?ообÑ?ениÑ?. ЧÑ?обÑ? изменение Ñ?Ñ?ого "
 "клÑ?Ñ?а вÑ?Ñ?Ñ?пило в Ñ?илÑ?, надо пеÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Evolution."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Thread the message list."
 msgstr "Ð?одÑ?иваÑ?Ñ? Ñ?пиÑ?ок Ñ?ообÑ?ений."
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Thread the message-list"
 msgstr "Ð?одÑ?иваÑ?Ñ? Ñ?пиÑ?ок Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Thread the message-list based on Subject"
 msgstr "Ð?одÑ?иваÑ?Ñ? Ñ?пиÑ?ок Ñ?ообÑ?ений по полÑ? «Тема»"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "Timeout for marking message as seen"
 msgstr "Ð?адеÑ?жка пеÑ?ед помеÑ?анием Ñ?ообÑ?ениÑ? как пÑ?оÑ?моÑ?Ñ?енное"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Timeout for marking message as seen."
 msgstr "Ð?адеÑ?жка пеÑ?ед помеÑ?анием Ñ?ообÑ?ениÑ? как пÑ?оÑ?моÑ?Ñ?енное."
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "UID string of the default account."
 msgstr "СÑ?Ñ?ока UID оÑ?новной Ñ?Ñ?Ñ?Ñ?ной запиÑ?и."
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ЦвеÑ? подÑ?Ñ?Ñ?киваниÑ? длÑ? Ñ?лов Ñ? оÑ?ибкой пÑ?и пÑ?овеÑ?ке оÑ?Ñ?огÑ?аÑ?ии."
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Use SpamAssassin daemon and client"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? клиенÑ? и демон SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? клиенÑ? и демон SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Use custom fonts"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? дÑ?Ñ?гие Ñ?Ñ?иÑ?Ñ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Use custom fonts for displaying mail."
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? дÑ?Ñ?гие Ñ?Ñ?иÑ?Ñ?Ñ? длÑ? оÑ?обÑ?ажениÑ? поÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Use only local spam tests."
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?олÑ?ко локалÑ?нÑ?е Ñ?пам-Ñ?еÑ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?олÑ?ко локалÑ?нÑ?е Ñ?пам-Ñ?еÑ?Ñ?Ñ? (без DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "Use side-by-side or wide layout"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? веÑ?Ñ?икалÑ?нÑ?й или Ñ?иÑ?окий Ñ?оÑ?маÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:166
-msgid "Variable width font"
-msgstr "ШÑ?иÑ?Ñ? пеÑ?еменной Ñ?иÑ?инÑ?"
-
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/СкÑ?. копиÑ? Ñ?Ñ?Ñ?ановлен"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/СкÑ?. копиÑ? Ñ?Ñ?Ñ?ановлен."
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/Ð?опиÑ? Ñ?Ñ?Ñ?ановлен"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/Ð?опиÑ? Ñ?Ñ?Ñ?ановлен."
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/Ð?Ñ? кого Ñ?Ñ?Ñ?ановлен"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "Ð?Ñ?нкÑ? менÑ? Ð?ид/Ð?Ñ? кого Ñ?Ñ?Ñ?ановлен."
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "Ð?Ñ?нкÑ? менÑ? «Ð?ид/Ð?омеÑ?Ñ?иÑ?Ñ? в» Ñ?Ñ?Ñ?ановлен"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "Ð?Ñ?нкÑ? менÑ? «Ð?ид/Ð?омеÑ?Ñ?иÑ?Ñ? в» Ñ?Ñ?Ñ?ановлен."
+#: ../mail/evolution-mail.schemas.in.h:182
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "Ð?Ñ?нкÑ? менÑ? «Ð?ид/Ð?бÑ?аÑ?нÑ?й адÑ?еÑ?» Ñ?Ñ?Ñ?ановлен"
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "Ð?Ñ?нкÑ? менÑ? «Ð?ид/Ð?бÑ?аÑ?нÑ?й адÑ?еÑ?» Ñ?Ñ?Ñ?ановлен."
+#: ../mail/evolution-mail.schemas.in.h:184
+msgid "Variable width font"
+msgstr "ШÑ?иÑ?Ñ? пеÑ?еменной Ñ?иÑ?инÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ð?обавлÑ?Ñ?Ñ? ли оÑ?Ñ?Ñ?Ñ? о пÑ?оÑ?Ñ?ении к каждомÑ? Ñ?ообÑ?ениÑ?."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? ли Ñ?окÑ?аÑ?ение имÑ?н в деÑ?еве папок в боковой панели."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -14178,15 +12934,15 @@ msgstr ""
 "Ð?еÑ?еÑ?одиÑ?Ñ? ли к Ñ?азвоÑ?аÑ?иваниÑ? подÑ?ивок по Ñ?еме, еÑ?ли Ñ?ообÑ?ениÑ? не Ñ?одеÑ?жаÑ? "
 "заголовков In-Reply-To и References."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "СоÑ?Ñ?иÑ?оваÑ?Ñ? ли подÑ?ивки по поÑ?леднемÑ? Ñ?ообÑ?ениÑ? в Ñ?Ñ?ой подÑ?ивке"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Width of the message-list pane"
 msgstr "ШиÑ?ина панели Ñ?пиÑ?ка Ñ?ообÑ?ений"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Width of the message-list pane."
 msgstr "Ð?Ñ?Ñ?оÑ?а панели Ñ?пика Ñ?ообÑ?ений."
 
@@ -14203,12 +12959,12 @@ msgid "Import mail from Elm."
 msgstr "Ð?мпоÑ?Ñ? поÑ?Ñ?Ñ? из Elm."
 
 #: ../mail/importers/evolution-mbox-importer.c:79
-#: ../plugins/pst-import/pst-importer.c:312
+#: ../plugins/pst-import/pst-importer.c:309
 msgid "Destination folder:"
 msgstr "Ð?апка назнаÑ?ениÑ?:"
 
 #: ../mail/importers/evolution-mbox-importer.c:82
-#: ../plugins/pst-import/pst-importer.c:305
+#: ../plugins/pst-import/pst-importer.c:302
 msgid "Select folder to import into"
 msgstr "Ð?Ñ?беÑ?иÑ?е папкÑ? длÑ? импоÑ?Ñ?а"
 
@@ -14226,8 +12982,8 @@ msgstr "Ð?мпоÑ?Ñ? из Ñ?айла mailbox"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:231
-#: ../plugins/pst-import/pst-importer.c:457
-#: ../plugins/pst-import/pst-importer.c:563 ../shell/e-shell-importer.c:512
+#: ../plugins/pst-import/pst-importer.c:454
+#: ../plugins/pst-import/pst-importer.c:560 ../shell/e-shell-importer.c:555
 #, c-format
 msgid "Importing `%s'"
 msgstr "Ð?мпоÑ?Ñ? `%s'"
@@ -14254,26 +13010,26 @@ msgstr "Ð?мпоÑ?Ñ? поÑ?Ñ?Ñ? из Pine"
 msgid "Mail to %s"
 msgstr "Ð?оÑ?Ñ?а к %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "Ð?оÑ?Ñ?а оÑ? %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "Ñ?пиÑ?ок Ñ?аÑ?Ñ?Ñ?лки %s"
 
-#: ../mail/mail-autofilter.c:365
+#: ../mail/mail-autofilter.c:364
 msgid "Add Filter Rule"
 msgstr "Ð?обавиÑ?Ñ? пÑ?авило Ñ?илÑ?Ñ?Ñ?а"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:573
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -14281,7 +13037,7 @@ msgstr[0] "вÑ?делено %d, "
 msgstr[1] "вÑ?делено %d, "
 msgstr[2] "вÑ?делено %d, "
 
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:577
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -14289,7 +13045,7 @@ msgstr[0] "%d Ñ?даленное"
 msgstr[1] "%d Ñ?даленнÑ?Ñ?"
 msgstr[2] "%d Ñ?даленнÑ?Ñ?"
 
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:584
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -14297,7 +13053,7 @@ msgstr[0] "%d Ñ?пам"
 msgstr[1] "%d Ñ?пам"
 msgstr[2] "%d Ñ?пам"
 
-#: ../mail/mail-component.c:564
+#: ../mail/mail-component.c:587
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -14305,7 +13061,7 @@ msgstr[0] "%d Ñ?еÑ?новиков"
 msgstr[1] "%d Ñ?еÑ?новика"
 msgstr[2] "%d Ñ?еÑ?новиков"
 
-#: ../mail/mail-component.c:566
+#: ../mail/mail-component.c:589
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -14313,7 +13069,7 @@ msgstr[0] "%d оÑ?пÑ?авленное"
 msgstr[1] "%d оÑ?пÑ?авленнÑ?Ñ?"
 msgstr[2] "%d оÑ?пÑ?авленнÑ?Ñ?"
 
-#: ../mail/mail-component.c:568
+#: ../mail/mail-component.c:591
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -14321,7 +13077,7 @@ msgstr[0] "%d неоÑ?пÑ?авленное"
 msgstr[1] "%d неоÑ?пÑ?авленнÑ?Ñ?"
 msgstr[2] "%d неоÑ?пÑ?авленнÑ?Ñ?"
 
-#: ../mail/mail-component.c:574
+#: ../mail/mail-component.c:597
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -14329,7 +13085,7 @@ msgstr[0] "%d непÑ?оÑ?иÑ?анное, "
 msgstr[1] "%d непÑ?оÑ?иÑ?аннÑ?Ñ?, "
 msgstr[2] "%d непÑ?оÑ?иÑ?аннÑ?Ñ?, "
 
-#: ../mail/mail-component.c:575
+#: ../mail/mail-component.c:598
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -14337,77 +13093,73 @@ msgstr[0] "%d вÑ?его"
 msgstr[1] "%d вÑ?его"
 msgstr[2] "%d вÑ?его"
 
-#: ../mail/mail-component.c:927
+#: ../mail/mail-component.c:952
 msgid "New Mail Message"
 msgstr "Ð?овое поÑ?Ñ?овое Ñ?ообÑ?ение"
 
-#: ../mail/mail-component.c:928
+#: ../mail/mail-component.c:953
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "Ð?оÑ?Ñ?овое Ñ?ообÑ?_ение"
 
-#: ../mail/mail-component.c:929
+#: ../mail/mail-component.c:954
 msgid "Compose a new mail message"
 msgstr "СоздаÑ?Ñ? новое Ñ?ообÑ?ение"
 
-#: ../mail/mail-component.c:935
+#: ../mail/mail-component.c:960
 msgid "New Mail Folder"
 msgstr "Ð?оваÑ? поÑ?Ñ?оваÑ? папка"
 
-#: ../mail/mail-component.c:936
+#: ../mail/mail-component.c:961
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Ð?оÑ?Ñ?оваÑ? _папка"
 
-#: ../mail/mail-component.c:937
+#: ../mail/mail-component.c:962
 msgid "Create a new mail folder"
 msgstr "СоздаÑ?Ñ? новÑ?Ñ? поÑ?Ñ?овÑ?Ñ? папкÑ?"
 
-#: ../mail/mail-component.c:1084
+#: ../mail/mail-component.c:1109
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Ð?Ñ?ибка обновлениÑ? паÑ?амеÑ?Ñ?ов поÑ?Ñ?Ñ? или папок."
 
 #: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr " Ð?Ñ?ов_еÑ?ка поддеÑ?живаемÑ?Ñ? Ñ?ипов "
-
-#: ../mail/mail-config.glade.h:2
 msgid "(Note: Requires restart of the application)"
 msgstr "(Ð?Ñ?имеÑ?ание: Ñ?Ñ?ебÑ?еÑ? пеÑ?езапÑ?Ñ?ка пÑ?иложениÑ?)"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:3
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>SSL не поддеÑ?живаеÑ?Ñ?Ñ? в Ñ?Ñ?ой Ñ?боÑ?ке Evolution</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:4
 msgid "<b>Sender Photograph</b>"
 msgstr "<b>ФоÑ?огÑ?аÑ?иÑ? оÑ?пÑ?авиÑ?елÑ?</b>"
 
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:5
 msgid "<b>Sig_natures</b>"
 msgstr "<b>_Ð?одпиÑ?и</b>"
 
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Ð?Ñ?веÑ? в наÑ?але пиÑ?Ñ?ма</b> (Ð?е Ñ?екомендÑ?еÑ?Ñ?Ñ?)"
 
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_ЯзÑ?ки</b>"
 
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:8
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Ð?пиÑ?ание Ñ?Ñ?Ñ?Ñ?ной запиÑ?и</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Ð?Ñ?овеÑ?ка подлинноÑ?Ñ?и</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">СоÑ?Ñ?авление Ñ?ообÑ?ений</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Ð?аÑ?амеÑ?Ñ?Ñ?</span>"
 
@@ -14530,59 +13282,76 @@ msgstr "Ð?Ñ?егда Ñ?_иÑ?Ñ?оваÑ?Ñ? длÑ? Ñ?ебÑ? пÑ?и оÑ?пÑ?авке
 msgid "Always request rea_d receipt"
 msgstr "Ð?Ñ?егда запÑ?аÑ?иваÑ?Ñ? _оÑ?Ñ?Ñ?Ñ? о пÑ?оÑ?Ñ?ении"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:45
+#, fuzzy
+msgid ""
+"Attachment\n"
+"Inline\n"
+"Quoted"
+msgstr "Ð?апоминание о вложении"
+
+#: ../mail/mail-config.glade.h:48
+msgid ""
+"Attachment\n"
+"Inline (Outlook style)\n"
+"Quoted\n"
+"Do not quote"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:52
 msgid "Automatically insert _emoticon images"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки вÑ?Ñ?авлÑ?Ñ?Ñ? _изобÑ?ажениÑ? Ñ?моÑ?ий"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:53
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:54
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:55
 msgid "C_haracter set:"
 msgstr "_Ð?абоÑ? Ñ?имволов:"
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr "Ð?Ñ?ов_еÑ?ка поддеÑ?живаемÑ?Ñ? Ñ?ипов "
+#: ../mail/mail-config.glade.h:56
+#: ../plugins/exchange-operations/exchange-account-setup.c:1015
+msgid "Ch_eck for Supported Types"
+msgstr "Ð?Ñ?ов_еÑ?иÑ?Ñ? поддеÑ?живаемÑ?е Ñ?ипÑ?"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:57
 msgid "Check cu_stom headers for junk"
 msgstr "Ð?Ñ?о_веÑ?Ñ?Ñ?Ñ? дополниÑ?елÑ?нÑ?е заголовки длÑ? опÑ?еделениÑ? Ñ?пама"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:58
 msgid "Check incoming _messages for junk"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? в_Ñ?одÑ?Ñ?ие Ñ?ообÑ?ениÑ? на Ñ?пам"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:59
 msgid "Check spelling while I _type"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? оÑ?Ñ?огÑ?аÑ?иÑ? в пÑ?оÑ?еÑ?Ñ?е ввода _Ñ?екÑ?Ñ?а"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:60
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ð?Ñ?овеÑ?Ñ?еÑ?, Ñ?влÑ?Ñ?Ñ?Ñ?Ñ? ли вÑ?одÑ?Ñ?ие Ñ?ообÑ?ениÑ? Ñ?памом"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:61
 msgid "Cle_ar"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:62
 msgid "Clea_r"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:63
 msgid "Color for _misspelled words:"
 msgstr "ЦвеÑ? длÑ? _оÑ?ибоÑ?нÑ?Ñ? Ñ?лов:"
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:64
 msgid "Confirm _when expunging a folder"
 msgstr "_Ð?апÑ?аÑ?иваÑ?Ñ? подÑ?веÑ?ждение оÑ?иÑ?Ñ?ки папки оÑ? Ñ?даленнÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../mail/mail-config.glade.h:59
+#: ../mail/mail-config.glade.h:65
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14598,157 +13367,149 @@ msgstr ""
 "\n"
 "Ð?ажмиÑ?е «Ð?Ñ?имениÑ?Ñ?», Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? ваÑ?и наÑ?Ñ?Ñ?ойки."
 
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:71
 msgid "De_fault"
 msgstr "СделаÑ?Ñ? _оÑ?новной"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.glade.h:72
 msgid "Default character e_ncoding:"
 msgstr "_Ð?одиÑ?овка Ñ?имволов по Ñ?молÑ?аниÑ?:"
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.glade.h:74
 msgid "Delete junk messages on e_xit"
 msgstr "УдалÑ?Ñ?Ñ? Ñ?пам пÑ?и в_Ñ?Ñ?оде"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.glade.h:76
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "_Ð?одпиÑ?Ñ?ваÑ?Ñ? иÑ?Ñ?одÑ?Ñ?ие Ñ?ообÑ?ениÑ? (по Ñ?молÑ?аниÑ?)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:77
 msgid "Do not format messages when text si_ze exceeds"
 msgstr ""
 "Ð?е Ñ?оÑ?маÑ?иÑ?оваÑ?Ñ? Ñ?екÑ?Ñ?овое Ñ?одеÑ?жимое в Ñ?ообÑ?ениÑ?Ñ?, еÑ?ли Ñ?азмеÑ? Ñ?екÑ?Ñ?а "
 "пÑ?евÑ?Ñ?аеÑ?"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:78
 msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr ""
-"Ð?е поме_Ñ?аÑ?Ñ? Ñ?ообÑ?ениÑ? как Ñ?пам, еÑ?ли оÑ?пÑ?авиÑ?елÑ? еÑ?Ñ?Ñ? в моей адÑ?еÑ?ной книге"
-
-#: ../mail/mail-config.glade.h:73
-msgid "Do not quote"
-msgstr "Ð?е Ñ?иÑ?иÑ?оваÑ?Ñ?"
+msgstr "Ð?е поме_Ñ?аÑ?Ñ? Ñ?ообÑ?ениÑ? как Ñ?пам, еÑ?ли оÑ?пÑ?авиÑ?елÑ? еÑ?Ñ?Ñ? в моей адÑ?еÑ?ной книге"
 
-#: ../mail/mail-config.glade.h:74
+#: ../mail/mail-config.glade.h:79
 msgid "Done"
 msgstr "Ð?оÑ?ово"
 
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:80
 msgid "Drafts _Folder:"
 msgstr "Ð?апка _Ñ?еÑ?новиков:"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:81
 msgid "Email Accounts"
 msgstr "УÑ?Ñ?Ñ?нÑ?е запиÑ?и"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:82
 msgid "Email _Address:"
 msgstr "_ЭлекÑ?Ñ?оннаÑ? поÑ?Ñ?а:"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:83
 msgid "Empty trash folders on e_xit"
 msgstr "Ð?Ñ?иÑ?аÑ?Ñ? коÑ?зинÑ? пÑ?и вÑ?_Ñ?оде"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:84
 msgid "Enable Magic S_pacebar"
 msgstr "Ð?кл_Ñ?Ñ?иÑ?Ñ? «волÑ?ебнÑ?й пÑ?обел»"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.glade.h:85
 msgid "Enable Sea_rch Folders"
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? папки поиÑ?ка"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:87
 msgid "Encry_ption certificate:"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?иÑ?Ñ?ованиÑ?:"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:88
 msgid "Encrypt out_going messages (by default)"
 msgstr "_ШиÑ?Ñ?оваÑ?Ñ? иÑ?Ñ?одÑ?Ñ?ие Ñ?ообÑ?ениÑ? (по Ñ?молÑ?аниÑ?)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:90
 msgid "Fi_xed-width:"
 msgstr "_Ð?оноÑ?иÑ?иннÑ?й:"
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:91
 msgid "Fix_ed width Font:"
 msgstr "_Ð?оноÑ?иÑ?иннÑ?й Ñ?Ñ?иÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:92
 msgid "Font Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?Ñ?иÑ?Ñ?ов"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:93
 msgid "Format messages in _HTML"
 msgstr "ФоÑ?маÑ?иÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? в _HTML"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:94
 msgid "Full Nam_e:"
 msgstr "_Ð?олное имÑ?:"
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:96
 msgid "HTML Messages"
 msgstr "СообÑ?ениÑ? HTML"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:97
 msgid "H_TTP Proxy:"
 msgstr "Ð?Ñ?окÑ?и H_TTP:"
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:98
 msgid "Headers"
 msgstr "Ð?аголовки"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:99
 msgid "Highlight _quotations with"
 msgstr "Ð?Ñ?делÑ?Ñ?Ñ? _Ñ?иÑ?иÑ?ование Ñ?веÑ?ом:"
 
-#: ../mail/mail-config.glade.h:96
-msgid "Inline"
-msgstr "Ð?Ñ?Ñ?Ñ?оенное"
-
-#: ../mail/mail-config.glade.h:97
-msgid "Inline (Outlook style)"
-msgstr "Ð?Ñ?Ñ?Ñ?аиваÑ?Ñ? (в Ñ?Ñ?иле Outlook)"
+#: ../mail/mail-config.glade.h:101
+msgid ""
+"If the server uses a non-standard port then specify the server address as "
+"\"server-name:port-number\""
+msgstr ""
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:103
 msgid "KB"
 msgstr "Ð?Ð?"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.glade.h:104 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "ЯÑ?лÑ?ки"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:105
 msgid "Languages Table"
 msgstr "ТаблиÑ?а Ñ?зÑ?ков"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:106
 msgid "Mail Configuration"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:107
 msgid "Mail Headers Table"
 msgstr "ТаблиÑ?а заголовков поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:109
 msgid "Mailbox location"
 msgstr "РаÑ?положение поÑ?Ñ?ового Ñ?Ñ?ика"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:110
 msgid "Message Composer"
 msgstr "СоÑ?Ñ?авление Ñ?ообÑ?ениÑ?"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:111
 msgid "No _Proxy for:"
 msgstr "Ð?е иÑ?полÑ?зоваÑ?Ñ? _пÑ?окÑ?и длÑ?:"
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
+#: ../mail/mail-config.glade.h:112
+msgid "Note: Underscore in the label name is used as mnemonic identifier in menu."
 msgstr ""
 "Ð?Ñ?имеÑ?ание: Символ подÑ?Ñ?Ñ?киваниÑ? в надпиÑ?и иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? как обознаÑ?ение "
 "мнемоники в менÑ?."
 
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:113
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -14756,33 +13517,39 @@ msgstr ""
 "Ð?Ñ?имеÑ?ание: вам не бÑ?деÑ? пÑ?едложено ввеÑ?Ñ?и паÑ?олÑ? до пеÑ?вого подклÑ?Ñ?ениÑ? к "
 "Ñ?еÑ?веÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:114
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "ЭÑ?оÑ? паÑ?амеÑ?Ñ? бÑ?деÑ? игноÑ?иÑ?оваÑ?Ñ?Ñ?Ñ?, в Ñ?лÑ?Ñ?ае Ñ?овпадениÑ? Ñ? Ñ?казаннÑ?Ñ? "
 "полÑ?зоваÑ?елем заголовков длÑ? вÑ?Ñ?влениÑ? Ñ?пама."
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:115
 msgid "Or_ganization:"
 msgstr "Ð?_Ñ?ганизаÑ?иÑ?:"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:116
 msgid "PGP/GPG _Key ID:"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? клÑ?Ñ?а PGP/GPG:"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:117
 msgid "Pass_word:"
 msgstr "_Ð?аÑ?олÑ?:"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:119
+#, fuzzy
+msgid "Please configure the following account settings."
+msgstr "Ð?Ñ?беÑ?иÑ?е один из Ñ?ледÑ?Ñ?Ñ?иÑ? ваÑ?ианÑ?ов"
+
+#: ../mail/mail-config.glade.h:120
+#, fuzzy
 msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
+"Please enter a descriptive name for this account in the space below. This "
+"name will be used for display purposes only."
 msgstr ""
 "Ð?ведиÑ?е имÑ?, опиÑ?Ñ?ваÑ?Ñ?ее Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ?.\n"
 "ЭÑ?о имÑ? бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?олÑ?ко на Ñ?кÑ?ане."
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:121
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14790,7 +13557,7 @@ msgstr ""
 "Ð?ведиÑ?е инÑ?оÑ?маÑ?иÑ? о Ñ?поÑ?обе оÑ?пÑ?авки Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?. Ð?Ñ?ли вÑ? не Ñ?веÑ?енÑ?, "
 "Ñ?вÑ?жиÑ?еÑ?Ñ? Ñ?о Ñ?воим Ñ?иÑ?Ñ?емнÑ?м админиÑ?Ñ?Ñ?аÑ?оÑ?ом или поÑ?Ñ?авÑ?иком Ñ?Ñ?лÑ?г Ð?нÑ?еÑ?неÑ?а."
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:122
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14800,60 +13567,44 @@ msgstr ""
 "обÑ?заÑ?елÑ?нÑ? длÑ? заполнениÑ?, еÑ?ли Ñ?олÑ?ко вÑ? не Ñ?оÑ?иÑ?е вклÑ?Ñ?аÑ?Ñ? Ñ?Ñ?и Ñ?ведениÑ? в "
 "оÑ?пÑ?авлÑ?емÑ?Ñ? вами поÑ?Ñ?Ñ?."
 
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "Ð?Ñ?беÑ?иÑ?е один из Ñ?ледÑ?Ñ?Ñ?иÑ? ваÑ?ианÑ?ов"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:123
 msgid "Port:"
 msgstr "_Ð?оÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:124
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ð?Ñ?_едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений, в коÑ?оÑ?Ñ?Ñ? опÑ?еделенÑ? Ñ?олÑ?ко "
 "полÑ?Ñ?аÑ?ели Ñ?кÑ?Ñ?Ñ?ой копии."
 
-#: ../mail/mail-config.glade.h:122
-msgid "Quoted"
-msgstr "Ð?Ñ?оÑ?иÑ?иÑ?овано"
-
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "Re_member password"
 msgstr "Ð?а_помниÑ?Ñ? паÑ?олÑ?"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:126
 msgid "Re_ply-To:"
 msgstr "_Ð?бÑ?аÑ?нÑ?й адÑ?еÑ?:"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:128
 msgid "Remember _password"
 msgstr "Ð?апомниÑ?Ñ? _паÑ?олÑ?"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "Узел S_OCKS:"
-
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Ð?_Ñ?каÑ?Ñ? Ñ?оÑ?огÑ?аÑ?иÑ? оÑ?пÑ?авиÑ?елÑ? в локалÑ?нÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгаÑ?"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "S_elect..."
 msgstr "Ð?_Ñ?бÑ?аÑ?Ñ?..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "S_end message receipts:"
 msgstr "Ð?_Ñ?пÑ?авлÑ?Ñ?Ñ? оÑ?Ñ?Ñ?Ñ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "S_tandard Font:"
 msgstr "С_Ñ?андаÑ?Ñ?нÑ?й Ñ?Ñ?иÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:133
-msgid "Select Drafts Folder"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? папкÑ? длÑ? Ñ?еÑ?новиков"
-
 #: ../mail/mail-config.glade.h:134
 msgid "Select HTML fixed width font"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?Ñ?иÑ?Ñ? HTML Ñ?икÑ?иÑ?ованной Ñ?иÑ?инÑ?"
@@ -14870,55 +13621,53 @@ msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?Ñ?иÑ?Ñ? HTML пеÑ?еменной Ñ?иÑ?инÑ?"
 msgid "Select HTML variable width font for printing"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?Ñ?иÑ?Ñ? HTML пеÑ?еменной Ñ?иÑ?инÑ? длÑ? пеÑ?аÑ?и"
 
-#: ../mail/mail-config.glade.h:138
-msgid "Select Sent Folder"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? папкÑ? оÑ?пÑ?авленнÑ?Ñ? Ñ?ообÑ?ений"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:139
 msgid "Sending Mail"
 msgstr "Ð?Ñ?пÑ?авка поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:140
 msgid "Sent _Messages Folder:"
 msgstr "Ð?апка _оÑ?пÑ?авленнÑ?Ñ? Ñ?ообÑ?ений:"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "Ser_ver requires authentication"
 msgstr "Т_Ñ?ебÑ?еÑ?Ñ?Ñ? пÑ?овеÑ?ка подлинноÑ?Ñ?и"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.glade.h:142
+#, fuzzy
+msgid "Server _Type:"
 msgstr "_Тип Ñ?еÑ?веÑ?а: "
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid "Sig_ning certificate:"
 msgstr "Се_Ñ?Ñ?иÑ?икаÑ? подпиÑ?и:"
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:144
 msgid "Signat_ure:"
 msgstr "Ð?одп_иÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:145
 msgid "Signatures"
 msgstr "Ð?одпиÑ?и"
 
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:146
 msgid "Signatures Table"
 msgstr "ТаблиÑ?а подпиÑ?ей"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:147
 msgid "Spell Checking"
 msgstr "Ð?Ñ?овеÑ?ка оÑ?Ñ?огÑ?аÑ?ии"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:148
 msgid "Start _typing at the bottom on replying"
 msgstr "Ð?Ñ?и оÑ?веÑ?е наÑ?инаÑ?Ñ? _ввод поÑ?ле Ñ?иÑ?аÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.glade.h:149
+#, fuzzy
+msgid "T_ype:"
 msgstr "_Тип: "
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -14926,17 +13675,17 @@ msgstr ""
 "ЭÑ?оÑ? Ñ?пиÑ?ок Ñ?зÑ?ков пеÑ?еÑ?иÑ?лÑ?еÑ? Ñ?олÑ?ко Ñ?е Ñ?зÑ?ки, длÑ? коÑ?оÑ?Ñ?Ñ? Ñ? ваÑ? "
 "Ñ?Ñ?Ñ?ановленÑ? Ñ?ловаÑ?и."
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
+#, fuzzy
 msgid ""
 "The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only. "
+"signature. The name you specify will be used for display purposes only."
 msgstr ""
 "Ð?Ñ?вод из Ñ?Ñ?ого Ñ?кÑ?ипÑ?а бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ?\n"
 "в каÑ?еÑ?Ñ?ве ваÑ?ей подпиÑ?и. Ð?мÑ?, Ñ?казанное вами,\n"
 "бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?олÑ?ко длÑ? оÑ?обÑ?ажениÑ?. "
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:153
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14944,157 +13693,157 @@ msgstr ""
 "УкажиÑ?е имÑ?, иÑ?полÑ?зÑ?емое длÑ? далÑ?нейÑ?иÑ? обÑ?аÑ?ений к Ñ?Ñ?ой \n"
 "Ñ?Ñ?Ñ?Ñ?ной запиÑ?и. Ð?апÑ?имеÑ?, «СлÑ?жебнаÑ?» или «Ð?иÑ?наÑ?»"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "Us_ername:"
 msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:156
 msgid "Use Authe_ntication"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? пÑ?овеÑ?кÑ? подл_инноÑ?Ñ?и"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:615
-#: ../plugins/google-account-setup/google-contacts-source.c:325
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:349
+#: ../mail/mail-config.glade.h:157 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-source.c:701
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:158
 msgid "V_ariable-width:"
 msgstr "_Ð?еÑ?еменной Ñ?иÑ?инÑ?:"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Forward\" to begin. "
+"Click \"Forward\" to begin."
 msgstr ""
 "Ð?аÑ? пÑ?ивеÑ?Ñ?Ñ?вÑ?еÑ? маÑ?Ñ?еÑ? наÑ?Ñ?Ñ?ойки Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ? Evolution.\n"
 "\n"
 "Ð?ажмиÑ?е «Ð?алее» длÑ? наÑ?ала наÑ?Ñ?Ñ?ойки. "
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:162
 msgid "_Add Signature"
 msgstr "_Ð?обавиÑ?Ñ? подпиÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:163
 msgid "_Always load images from the Internet"
 msgstr "_Ð?Ñ?егда загÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ? из Ð?нÑ?еÑ?неÑ?а"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "РеÑ?Ñ?Ñ?Ñ? URL длÑ? _авÑ?омаÑ?иÑ?еÑ?кой конÑ?игÑ?Ñ?аÑ?ии пÑ?окÑ?и:"
-
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:164
 msgid "_Default junk plugin:"
 msgstr "Ð?одÑ?лÑ? Ñ?_пама по Ñ?молÑ?аниÑ?:"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:165
 msgid "_Direct connection to the Internet"
 msgstr "_Ð?Ñ?Ñ?мое подклÑ?Ñ?ение к Ð?нÑ?еÑ?неÑ?Ñ?"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:166
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ð?е подпиÑ?Ñ?ваÑ?Ñ? запÑ?оÑ?Ñ? Ñ?обÑ?аний (длÑ? Ñ?овмеÑ?Ñ?имоÑ?Ñ?и Ñ? Outlook)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:168
 msgid "_Forward style:"
 msgstr "СÑ?илÑ? _пеÑ?еÑ?Ñ?лки:"
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:169
 msgid "_Keep Signature above the original message on replying"
 msgstr "Ð?омеÑ?аÑ?Ñ? подпиÑ?Ñ? _над иÑ?Ñ?однÑ?м Ñ?ообÑ?ением пÑ?и оÑ?веÑ?е"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:170
 msgid "_Load images in messages from contacts"
 msgstr "_Ð?агÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ? в Ñ?ообÑ?ениÑ?Ñ? оÑ? конÑ?акÑ?ов"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:171
 msgid "_Lookup in local address book only"
 msgstr "Ð?Ñ?оÑ?маÑ?Ñ?иваÑ?Ñ? Ñ?олÑ?ко локалÑ?нÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книгÑ?"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:172
 msgid "_Make this my default account"
 msgstr "_СделаÑ?Ñ? оÑ?новной Ñ?Ñ?Ñ?Ñ?ной запиÑ?Ñ?Ñ?"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:173
 msgid "_Manual proxy configuration:"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка пÑ?окÑ?и _вÑ?Ñ?Ñ?нÑ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:174
 msgid "_Mark messages as read after"
 msgstr "Ð?о_меÑ?аÑ?Ñ? Ñ?ообÑ?ениÑ? как «Ð?Ñ?оÑ?иÑ?аннÑ?е» Ñ?еÑ?ез:"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:176
 msgid "_Never load images from the Internet"
 msgstr "_Ð?икогда не загÑ?Ñ?жаÑ?Ñ? изобÑ?ажениÑ? из Ð?нÑ?еÑ?неÑ?а"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:177
 msgid "_Path:"
 msgstr "_Ð?Ñ?Ñ?Ñ?:"
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:178
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr ""
-"Ð?_Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений в Ñ?оÑ?маÑ?е HTML Ñ?ем, кÑ?о не желаеÑ? Ñ?Ñ?ого"
+msgstr "Ð?_Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений в Ñ?оÑ?маÑ?е HTML Ñ?ем, кÑ?о не желаеÑ? Ñ?Ñ?ого"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:179
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Ð?Ñ?едÑ?пÑ?еждаÑ?Ñ? пÑ?и оÑ?пÑ?авке Ñ?ообÑ?ений Ñ? пÑ?Ñ?Ñ?ой Ñ?емой"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:180
 msgid "_Reply style:"
 msgstr "СÑ?илÑ? _оÑ?веÑ?а:"
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:181
 msgid "_Script:"
 msgstr "_СкÑ?ипÑ?:"
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:182
 msgid "_Secure HTTP Proxy:"
 msgstr "Ð?Ñ?окÑ?и HTTP_S:"
 
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:183
 msgid "_Select..."
 msgstr "Ð?_Ñ?бÑ?аÑ?Ñ?..."
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:186
 msgid "_Show image animations"
 msgstr "_Ð?клÑ?Ñ?иÑ?Ñ? анимаÑ?иÑ? изобÑ?ажений"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:187
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Ð?оказÑ?ваÑ?Ñ? Ñ?оÑ?огÑ?аÑ?иÑ? _оÑ?пÑ?авиÑ?елÑ? в панели пÑ?оÑ?моÑ?Ñ?а поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:188
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Ð?бÑ?езаÑ?Ñ? заголовки To / Cc / Bcc до "
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:189
 msgid "_Use Secure Connection:"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? _заÑ?иÑ?енное Ñ?оединение:"
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:190
 msgid "_Use system defaults"
 msgstr "Ð?о _Ñ?молÑ?аниÑ?"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:191
 msgid "_Use the same fonts as other applications"
 msgstr "_Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?акие же Ñ?Ñ?иÑ?Ñ?Ñ?, как и пÑ?оÑ?ие пÑ?иложениÑ?"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:194
 msgid "addresses"
 msgstr "адÑ?еÑ?ов"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:195
 msgid "color"
 msgstr "."
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:196
 msgid "description"
 msgstr "опиÑ?ание"
 
+#: ../mail/mail-config.glade.h:197
+msgid "seconds"
+msgstr "Ñ?екÑ?нд"
+
 #: ../mail/mail-dialogs.glade.h:1
 msgid "    "
 msgstr "    "
@@ -15124,50 +13873,34 @@ msgid "All local folders"
 msgstr "Ð?Ñ?е локалÑ?нÑ?е папки"
 
 #: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "УÑ?иÑ?Ñ?ваÑ?Ñ? _Ñ?егиÑ?Ñ?Ñ?"
-
-#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "_Ð?авеÑ?Ñ?ено"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "_Ð?айÑ?и:"
-
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "Ð?оиÑ?к в Ñ?ообÑ?ении"
-
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
+#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tag-followup.c:270
 msgid "Flag to Follow Up"
 msgstr "Ð?омеÑ?иÑ?Ñ? к иÑ?полнениÑ?"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:10
 msgid "Folder Subscriptions"
 msgstr "Ð?одпиÑ?ка на папки"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:11
 msgid "License Agreement"
 msgstr "Ð?иÑ?ензионное Ñ?оглаÑ?ение"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "Ð?иÑ?его не вÑ?бÑ?ано"
-
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:12
 msgid "S_erver:"
 msgstr "С_еÑ?веÑ?:"
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.glade.h:13
 msgid "Security Information"
 msgstr "СведениÑ? о безопаÑ?ноÑ?Ñ?и"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.glade.h:14
 msgid "Specific folders"
 msgstr "УказаннÑ?е папки"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.glade.h:15
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -15175,19 +13908,19 @@ msgstr ""
 "СообÑ?ениÑ?, помеÑ?еннÑ?е вами к иÑ?полнениÑ?, пеÑ?еÑ?иÑ?ленÑ? ниже.\n"
 "Ð?Ñ?беÑ?иÑ?е дейÑ?Ñ?вие из менÑ? «Ð?Ñ?меÑ?ка»."
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.glade.h:17
 msgid "_Accept License"
 msgstr "_Ð?Ñ?инÑ?Ñ?Ñ? лиÑ?ензиÑ?"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.glade.h:18
 msgid "_Due By:"
 msgstr "_СÑ?ок до:"
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:19
 msgid "_Flag:"
 msgstr "_Ð?Ñ?меÑ?ка:"
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "УÑ?Ñ?ановиÑ?е, Ñ?Ñ?обÑ? пÑ?инÑ?Ñ?Ñ? лиÑ?ензионное Ñ?оглаÑ?ение"
 
@@ -15196,21 +13929,21 @@ msgstr "УÑ?Ñ?ановиÑ?е, Ñ?Ñ?обÑ? пÑ?инÑ?Ñ?Ñ? лиÑ?ензионное
 msgid "Pinging %s"
 msgstr "Ping на %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:107
 msgid "Filtering Selected Messages"
 msgstr "ФилÑ?Ñ?Ñ?аÑ?иÑ? вÑ?деленнÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "Ð?олÑ?Ñ?ение Ñ?л.поÑ?Ñ?Ñ?"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:562
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ð?Ñ?ибка пÑ?именениÑ? Ñ?илÑ?Ñ?Ñ?ов иÑ?Ñ?одÑ?Ñ?ей поÑ?Ñ?Ñ?: %s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15219,109 +13952,109 @@ msgstr ""
 "Ð?Ñ?ибка добавлениÑ? в %s: %s\n"
 "Ð?Ñ?оизводиÑ?Ñ?Ñ? добавление в локалÑ?нÑ?Ñ? папкÑ? «Ð?Ñ?пÑ?авленнÑ?е»."
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ð?Ñ?ибка Ñ?оÑ?Ñ?анениÑ? в локалÑ?ной папке «Ð?Ñ?пÑ?авленнÑ?е»: %s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:724 ../mail/mail-ops.c:805
 msgid "Sending message"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Ð?Ñ?пÑ?авка Ñ?ообÑ?ениÑ? %d из %d"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? %d из %d Ñ?ообÑ?ений"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:701
 msgid "Canceled."
 msgstr "Ð?Ñ?менено."
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:703
 msgid "Complete."
 msgstr "Ð?Ñ?полнено."
 
-#: ../mail/mail-ops.c:872
+#: ../mail/mail-ops.c:877
 msgid "Saving message to folder"
 msgstr "СоÑ?Ñ?анение Ñ?ообÑ?ениÑ? в папке"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Ð?еÑ?емеÑ?ение Ñ?ообÑ?ений в %s"
 
-#: ../mail/mail-ops.c:950
+#: ../mail/mail-ops.c:954
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Ð?опиÑ?ование Ñ?ообÑ?ений в %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1171
 msgid "Forwarded messages"
 msgstr "Ð?еÑ?еÑ?ланнÑ?е Ñ?ообÑ?ениÑ?"
 
-#: ../mail/mail-ops.c:1208
+#: ../mail/mail-ops.c:1212
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?ие папки %s"
 
-#: ../mail/mail-ops.c:1273
+#: ../mail/mail-ops.c:1277
 #, c-format
 msgid "Retrieving quota information for folder %s"
 msgstr "Ð?олÑ?Ñ?ение инÑ?оÑ?маÑ?ии о квоÑ?е длÑ? папки %s"
 
-#: ../mail/mail-ops.c:1342
+#: ../mail/mail-ops.c:1346
 #, c-format
 msgid "Opening store %s"
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?ие Ñ?Ñ?анилиÑ?а %s"
 
-#: ../mail/mail-ops.c:1413
+#: ../mail/mail-ops.c:1417
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1535
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "СоÑ?Ñ?анение папки «%s»"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1598
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Ð?Ñ?иÑ?Ñ?ка и Ñ?оÑ?Ñ?анение Ñ?Ñ?Ñ?Ñ?ной запиÑ?и «%s»"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1599
 #, c-format
 msgid "Storing account '%s'"
 msgstr "СоÑ?Ñ?анение Ñ?Ñ?Ñ?Ñ?ной запиÑ?и «%s»"
 
-#: ../mail/mail-ops.c:1649
+#: ../mail/mail-ops.c:1653
 msgid "Refreshing folder"
 msgstr "Ð?бновление папки"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
+#: ../mail/mail-ops.c:1693 ../mail/mail-ops.c:1743
 msgid "Expunging folder"
 msgstr "Ð?Ñ?иÑ?Ñ?ка папки"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1740
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Ð?Ñ?иÑ?Ñ?ка коÑ?зинÑ? в «%s»"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1741
 msgid "Local Folders"
 msgstr "Ð?окалÑ?нÑ?е папки"
 
-#: ../mail/mail-ops.c:1818
+#: ../mail/mail-ops.c:1822
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Ð?олÑ?Ñ?ение Ñ?ообÑ?ениÑ? %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1931
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15329,7 +14062,7 @@ msgstr[0] "Ð?олÑ?Ñ?ение %d Ñ?ообÑ?ениÑ?"
 msgstr[1] "Ð?олÑ?Ñ?ение %d Ñ?ообÑ?ений"
 msgstr[2] "Ð?олÑ?Ñ?ение %d Ñ?ообÑ?ений"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -15337,7 +14070,7 @@ msgstr[0] "СоÑ?Ñ?анение %d Ñ?ообÑ?ениÑ?"
 msgstr[1] "СоÑ?Ñ?анение %d Ñ?ообÑ?ений"
 msgstr[2] "СоÑ?Ñ?анение %d Ñ?ообÑ?ений"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2096
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15346,11 +14079,11 @@ msgstr ""
 "Ð?Ñ?ибка Ñ?оÑ?Ñ?анениÑ? Ñ?ообÑ?ений в: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2168
 msgid "Saving attachment"
 msgstr "СоÑ?Ñ?анение вложениÑ?"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2186 ../mail/mail-ops.c:2194
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15359,27 +14092,27 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?айл вÑ?вода: %s\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2209
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запиÑ?аÑ?Ñ? даннÑ?е: %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ð?Ñ?клÑ?Ñ?ение оÑ? %s"
 
-#: ../mail/mail-ops.c:2347
+#: ../mail/mail-ops.c:2354
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ð?еÑ?еподклÑ?Ñ?ение к %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2450
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Ð?одгоÑ?овка Ñ?Ñ?Ñ?Ñ?ной запиÑ?и «%s» к авÑ?ономной Ñ?абоÑ?е"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2536
 msgid "Checking Service"
 msgstr "Ð?Ñ?овеÑ?ка Ñ?еÑ?виÑ?а"
 
@@ -15403,43 +14136,43 @@ msgstr "Ð?бновление..."
 msgid "Waiting..."
 msgstr "Ð?жидание..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:814
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?овеÑ?ка новой поÑ?Ñ?Ñ?"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:210
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ð?ведиÑ?е клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ? длÑ? %s"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:212
 msgid "Enter Passphrase"
 msgstr "Ð?ведиÑ?е клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ?"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:215
+#: ../plugins/exchange-operations/exchange-config-listener.c:705
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ð?ведиÑ?е клÑ?Ñ?евÑ?Ñ? Ñ?Ñ?азÑ? длÑ? %s"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:217
 msgid "Enter Password"
 msgstr "Ð?ведиÑ?е паÑ?олÑ?"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:259
 msgid "User canceled operation."
 msgstr "Ð?пеÑ?аÑ?иÑ? оÑ?менена полÑ?зоваÑ?елем."
 
-#: ../mail/mail-signature-editor.c:201
+#: ../mail/mail-signature-editor.c:202
 msgid "_Save and Close"
 msgstr "Со_Ñ?Ñ?аниÑ?Ñ? и закÑ?Ñ?Ñ?Ñ?"
 
-#: ../mail/mail-signature-editor.c:355
+#: ../mail/mail-signature-editor.c:356
 msgid "Edit Signature"
 msgstr "РедакÑ?иÑ?оваÑ?Ñ? подпиÑ?и"
 
-#: ../mail/mail-signature-editor.c:370
+#: ../mail/mail-signature-editor.c:371
 msgid "_Signature Name:"
 msgstr "_Ð?мÑ? подпиÑ?и:"
 
@@ -15472,21 +14205,21 @@ msgstr "Ð?евеÑ?наÑ? папка: «%s»"
 msgid "Setting up Search Folder: %s"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка папки поиÑ?ка: %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:234
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Ð?бновление папок поиÑ?ка длÑ? '%s:%s'"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:241
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Ð?бновление папок пиÑ?ка длÑ? «%s»"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1067
 msgid "Edit Search Folder"
 msgstr "Ð?змениÑ?Ñ? папкÑ? поиÑ?ка"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1155
 msgid "New Search Folder"
 msgstr "Ð?оваÑ? папка поиÑ?ка"
 
@@ -15514,8 +14247,7 @@ msgstr ""
 msgid ""
 "A read receipt notification has been requested for \"{1}\". Send the receipt "
 "notification to {0}?"
-msgstr ""
-"Ð?Ñ?ло запÑ?оÑ?ено Ñ?ведомление о пÑ?оÑ?Ñ?ении длÑ? «{1}». Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?ведомление к {0}?"
+msgstr "Ð?Ñ?ло запÑ?оÑ?ено Ñ?ведомление о пÑ?оÑ?Ñ?ении длÑ? «{1}». Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?ведомление к {0}?"
 
 #: ../mail/mail.error.xml.h:7
 msgid ""
@@ -15540,8 +14272,7 @@ msgid "Are you sure you want to delete this account?"
 msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ??"
 
 #: ../mail/mail.error.xml.h:11
-msgid ""
-"Are you sure you want to disable this account and delete all its proxies?"
+msgid "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ? и вÑ?е еÑ? пÑ?окÑ?и?"
 
 #: ../mail/mail.error.xml.h:12
@@ -15570,8 +14301,7 @@ msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е оÑ?пÑ?авиÑ?Ñ? Ñ?ооб
 
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение полÑ?Ñ?аÑ?елÑ?м Ñ?олÑ?ко Ñ?лепой копии?"
+msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е оÑ?пÑ?авиÑ?Ñ? Ñ?ообÑ?ение полÑ?Ñ?аÑ?елÑ?м Ñ?олÑ?ко Ñ?лепой копии?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
@@ -15619,8 +14349,7 @@ msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? Ñ?иÑ?Ñ?емнÑ?Ñ? папкÑ? «{0}»
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr ""
-"Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? папкÑ? поиÑ?ка «{0}», поÑ?омÑ? Ñ?Ñ?о Ñ?акаÑ? папка не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
+msgstr "Ð?е Ñ?далоÑ?Ñ? измениÑ?Ñ? папкÑ? поиÑ?ка «{0}», поÑ?омÑ? Ñ?Ñ?о Ñ?акаÑ? папка не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
@@ -15786,8 +14515,7 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Ð?Ñ?ли вÑ? пÑ?одолжиÑ?е, Ñ?ведениÑ? о Ñ?Ñ?Ñ?Ñ?ной запиÑ?и бÑ?дÑ?Ñ? безвозвÑ?аÑ?но Ñ?даленÑ?."
+msgstr "Ð?Ñ?ли вÑ? пÑ?одолжиÑ?е, Ñ?ведениÑ? о Ñ?Ñ?Ñ?Ñ?ной запиÑ?и бÑ?дÑ?Ñ? безвозвÑ?аÑ?но Ñ?даленÑ?."
 
 #: ../mail/mail.error.xml.h:67
 msgid ""
@@ -15845,8 +14573,7 @@ msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?е паÑ?амеÑ?Ñ?Ñ? ваÑ?ей Ñ?Ñ?Ñ?Ñ?ной запи
 
 #: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
-msgstr ""
-"Ð?клÑ?Ñ?иÑ?е Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ? или иÑ?полÑ?зÑ?йÑ?е длÑ? оÑ?пÑ?авки дÑ?Ñ?гÑ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ?."
+msgstr "Ð?клÑ?Ñ?иÑ?е Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ? или иÑ?полÑ?зÑ?йÑ?е длÑ? оÑ?пÑ?авки дÑ?Ñ?гÑ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?Ñ?."
 
 #: ../mail/mail.error.xml.h:80
 msgid ""
@@ -15998,10 +14725,8 @@ msgstr ""
 "оÑ?клÑ?Ñ?ена"
 
 #: ../mail/mail.error.xml.h:115
-msgid ""
-"This message cannot be sent because you have not specified any recipients"
-msgstr ""
-"СообÑ?ение не можеÑ? бÑ?Ñ?Ñ? оÑ?пÑ?авлено, поÑ?омÑ? Ñ?Ñ?о не Ñ?казан ни один полÑ?Ñ?аÑ?елÑ?"
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "СообÑ?ение не можеÑ? бÑ?Ñ?Ñ? оÑ?пÑ?авлено, поÑ?омÑ? Ñ?Ñ?о не Ñ?казан ни один полÑ?Ñ?аÑ?елÑ?"
 
 #: ../mail/mail.error.xml.h:116
 msgid ""
@@ -16112,79 +14837,78 @@ msgstr "Уни_Ñ?Ñ?ожиÑ?Ñ? Ñ?далÑ?ннÑ?е"
 msgid "_Open Messages"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1051
 msgid "Unseen"
 msgstr "Ð?епÑ?оÑ?иÑ?ано"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1052
 msgid "Seen"
 msgstr "Ð?Ñ?оÑ?иÑ?ано"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1053
 msgid "Answered"
 msgstr "Ð?Ñ?веÑ?ено"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1054
 msgid "Forwarded"
 msgstr "Ð?еÑ?еÑ?лано"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1055
 msgid "Multiple Unseen Messages"
 msgstr "Ð?ножеÑ?Ñ?во непÑ?оÑ?иÑ?аннÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../mail/message-list.c:1057
+#: ../mail/message-list.c:1056
 msgid "Multiple Messages"
 msgstr "Ð?ножеÑ?Ñ?во Ñ?ообÑ?ений"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1060
 msgid "Lowest"
 msgstr "СамÑ?й низкий"
 
-#: ../mail/message-list.c:1062
+#: ../mail/message-list.c:1061
 msgid "Lower"
 msgstr "Ð?изкий"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1065
 msgid "Higher"
 msgstr "Ð?Ñ?Ñ?окий"
 
-#: ../mail/message-list.c:1067
+#: ../mail/message-list.c:1066
 msgid "Highest"
 msgstr "СамÑ?й вÑ?Ñ?окий"
 
-#: ../mail/message-list.c:1656 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1654 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1663 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:71
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "СегоднÑ? %I:%M %p"
 
-#: ../mail/message-list.c:1672 ../widgets/table/e-cell-date.c:81
+#: ../mail/message-list.c:1670
 msgid "Yesterday %l:%M %p"
 msgstr "Ð?Ñ?еÑ?а %l:%M %p"
 
-#: ../mail/message-list.c:1684 ../widgets/table/e-cell-date.c:93
+#: ../mail/message-list.c:1682
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1692 ../widgets/table/e-cell-date.c:101
+#: ../mail/message-list.c:1690
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1694 ../widgets/table/e-cell-date.c:103
+#: ../mail/message-list.c:1692
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3985 ../mail/message-list.c:4450
+#: ../mail/message-list.c:3987 ../mail/message-list.c:4462
 msgid "Generating message list"
 msgstr "Создание Ñ?пиÑ?ка Ñ?ообÑ?ений"
 
-#: ../mail/message-list.c:4289
+#: ../mail/message-list.c:4299
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -16192,7 +14916,13 @@ msgstr ""
 "Ð?еÑ? пиÑ?ем, Ñ?довлеÑ?воÑ?Ñ?Ñ?Ñ?иÑ? кÑ?иÑ?еÑ?иÑ?м поиÑ?ка. Ð?Ñ?иÑ?Ñ?иÑ?е поле поиÑ?ка Ñ? помоÑ?Ñ?Ñ? "
 "менÑ? Ð?оиÑ?к â?? Ð?Ñ?иÑ?Ñ?иÑ?Ñ? или измениÑ?е кÑ?иÑ?еÑ?ии."
 
-#: ../mail/message-list.c:4291
+#: ../mail/message-list.c:4301
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4303
 msgid "There are no messages in this folder."
 msgstr "Ð? папке неÑ? Ñ?ообÑ?ений."
 
@@ -16222,6 +14952,7 @@ msgstr "Ð?Ñ?пÑ?авленнÑ?е Ñ?ообÑ?ениÑ?"
 
 #: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "РазмеÑ?"
 
@@ -16229,39 +14960,39 @@ msgstr "РазмеÑ?"
 msgid "Subject - Trimmed"
 msgstr "Тема - Ð?Ñ?иÑ?еннаÑ?"
 
-#: ../mail/message-tag-followup.c:55
+#: ../mail/message-tag-followup.c:54
 msgid "Call"
 msgstr "Ð?озвониÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:56
+#: ../mail/message-tag-followup.c:55
 msgid "Do Not Forward"
 msgstr "Ð?е пеÑ?еÑ?Ñ?лаÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:57
+#: ../mail/message-tag-followup.c:56
 msgid "Follow-Up"
 msgstr "Ð? иÑ?полнениÑ?"
 
-#: ../mail/message-tag-followup.c:58
+#: ../mail/message-tag-followup.c:57
 msgid "For Your Information"
 msgstr "Ð?лÑ? Ñ?ведениÑ?"
 
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
+#: ../mail/message-tag-followup.c:58 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ð?еÑ?еÑ?лаÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:60
+#: ../mail/message-tag-followup.c:59
 msgid "No Response Necessary"
 msgstr "Ð?ожно не оÑ?веÑ?аÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:62 ../ui/evolution-mail-message.xml.h:76
 msgid "Reply"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ?"
 
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:77
 msgid "Reply to All"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ? вÑ?ем"
 
-#: ../mail/message-tag-followup.c:65
+#: ../mail/message-tag-followup.c:64
 msgid "Review"
 msgstr "Ð?Ñ?овеÑ?иÑ?Ñ?"
 
@@ -16286,20 +15017,26 @@ msgid "Subject contains"
 msgstr "Тема Ñ?одеÑ?жиÑ?"
 
 #: ../mail/searchtypes.xml.h:6
+#, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "Тема или Ð?Ñ?пÑ?авиÑ?елÑ? Ñ?одеÑ?жиÑ?"
+
+#: ../mail/searchtypes.xml.h:7
 msgid "Subject or Recipients contains"
 msgstr "Тема или Ð?олÑ?Ñ?аÑ?ели Ñ?одеÑ?жиÑ?"
 
-#: ../mail/searchtypes.xml.h:7
+#: ../mail/searchtypes.xml.h:8
 msgid "Subject or Sender contains"
 msgstr "Тема или Ð?Ñ?пÑ?авиÑ?елÑ? Ñ?одеÑ?жиÑ?"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "Ð?окалÑ?нÑ?е адÑ?еÑ?нÑ?е книги"
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "Ð?еÑ?еÑ?иÑ?лиÑ?Ñ? папки локалÑ?ной адÑ?еÑ?ной книги"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? базовÑ?Ñ? Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?Ñ? длÑ? локалÑ?нÑ?Ñ? адÑ?еÑ?нÑ?Ñ? книг."
+msgid "Local Address Books"
+msgstr "Ð?окалÑ?нÑ?е адÑ?еÑ?нÑ?е книги"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -16317,8 +15054,8 @@ msgstr ""
 "СпиÑ?ок клÑ?Ñ?ей, коÑ?оÑ?Ñ?е модÑ?лÑ? Ñ?ведомлениÑ? о забÑ?Ñ?Ñ?Ñ? вложениÑ?Ñ? бÑ?деÑ? иÑ?каÑ?Ñ? в "
 "Ñ?еле пиÑ?Ñ?ма."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:476
+#: ../plugins/templates/templates.c:389
 msgid "Keywords"
 msgstr "Ð?лÑ?Ñ?евÑ?е Ñ?лова"
 
@@ -16328,12 +15065,8 @@ msgid "Attachment Reminder"
 msgstr "Ð?апоминание о вложении"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
+msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr ""
-"Ð?Ñ?еÑ? клÑ?Ñ?и Ñ? Ñ?поминанием вложений в Ñ?ообÑ?ении и пÑ?едÑ?пÑ?еждаеÑ?, еÑ?ли вложение "
-"оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ?"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
@@ -16347,23 +15080,24 @@ msgstr ""
 msgid "Message has no attachments"
 msgstr "СообÑ?ение не Ñ?одеÑ?жиÑ? вложений"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "_Ð?обавиÑ?Ñ? вложение..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "_Ð?змениÑ?Ñ? Ñ?ообÑ?ение"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"Ð?одÑ?лÑ? длÑ? оÑ?обÑ?ажениÑ? звÑ?ковÑ?Ñ? вложений, коÑ?оÑ?Ñ?й позволÑ?еÑ? воÑ?пÑ?оизводиÑ?Ñ? "
-"иÑ? непоÑ?Ñ?едÑ?Ñ?венно из Evolution."
+#, fuzzy
+msgid "Audio Inline"
+msgstr "Ð?одÑ?лÑ? вÑ?Ñ?Ñ?оенного звÑ?ка"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "Ð?одÑ?лÑ? вÑ?Ñ?Ñ?оенного звÑ?ка"
+msgid "Play audio attachments directly from Evolution."
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:138
+#: ../plugins/backup-restore/backup-restore.c:139
 msgid "Select name of the Evolution backup file"
 msgstr "Ð?Ñ?беÑ?иÑ?е имÑ? Ñ?айла длÑ? аÑ?Ñ?ива Evolution"
 
@@ -16384,150 +15118,150 @@ msgid "Restore from backup"
 msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? из аÑ?Ñ?ива"
 
 #: ../plugins/backup-restore/backup-restore.c:289
+#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "Ð?озволÑ?еÑ? воÑ?Ñ?Ñ?анавливаÑ?Ñ? Evolution из аÑ?Ñ?ива. Таким обÑ?азом можно "
 "воÑ?Ñ?Ñ?ановиÑ?Ñ? поÑ?Ñ?Ñ?, календаÑ?и, задаÑ?и, замеÑ?ки и конÑ?акÑ?Ñ?. \n"
 "Ð?Ñ?дÑ?Ñ? воÑ?Ñ?Ñ?ановленÑ? Ñ?акже пеÑ?Ñ?оналÑ?нÑ?е наÑ?Ñ?Ñ?ойки, Ñ?илÑ?Ñ?Ñ?Ñ? поÑ?Ñ?Ñ? и Ñ?ак далее."
 
-#: ../plugins/backup-restore/backup-restore.c:295
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? Evolution из аÑ?_Ñ?ива"
 
-#: ../plugins/backup-restore/backup-restore.c:302
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Ð?Ñ?беÑ?иÑ?е аÑ?Ñ?ив Evolution длÑ? воÑ?Ñ?Ñ?ановлениÑ?:"
 
-#: ../plugins/backup-restore/backup-restore.c:305
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл длÑ? воÑ?Ñ?Ñ?ановлениÑ?"
 
-#: ../plugins/backup-restore/backup.c:65
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? каÑ?алог Evolution"
 
-#: ../plugins/backup-restore/backup.c:67
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? каÑ?алог Evolution"
 
-#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "Ð?Ñ?овеÑ?иÑ?Ñ? аÑ?Ñ?ив Evolution"
 
-#: ../plugins/backup-restore/backup.c:71
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "Ð?еÑ?езапÑ?Ñ?Ñ?иÑ?Ñ? Evolution"
 
-#: ../plugins/backup-restore/backup.c:73
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "С гÑ?аÑ?иÑ?еÑ?ким инÑ?еÑ?Ñ?ейÑ?ом"
 
-#: ../plugins/backup-restore/backup.c:124
-#: ../plugins/backup-restore/backup.c:257
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "Ð?Ñ?Ñ?анавливаеÑ?Ñ?Ñ? Evolution"
 
-#: ../plugins/backup-restore/backup.c:131
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "СоÑ?Ñ?анение и воÑ?Ñ?Ñ?ановление даннÑ?Ñ? и паÑ?амеÑ?Ñ?ов Evolution"
 
-#: ../plugins/backup-restore/backup.c:135
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr ""
-"СоÑ?Ñ?анение даннÑ?Ñ? Evolution (пиÑ?ем, конÑ?акÑ?ов, календаÑ?ей, задаÑ?, замеÑ?ок)"
+msgstr "СоÑ?Ñ?анение даннÑ?Ñ? Evolution (пиÑ?ем, конÑ?акÑ?ов, календаÑ?ей, задаÑ?, замеÑ?ок)"
 
-#: ../plugins/backup-restore/backup.c:146
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "Ð?Ñ?Ñ?ив Ñ?оздан"
 
-#: ../plugins/backup-restore/backup.c:151
-#: ../plugins/backup-restore/backup.c:338
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "Ð?еÑ?езапÑ?Ñ?к Evolution"
 
-#: ../plugins/backup-restore/backup.c:261
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "СоÑ?Ñ?анение Ñ?екÑ?Ñ?иÑ? даннÑ?Ñ? Evolution"
 
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "Ð?оÑ?Ñ?Ñ?ановление из аÑ?Ñ?ива"
 
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "Ð?агÑ?Ñ?зка наÑ?Ñ?Ñ?оек Evolution"
 
-#: ../plugins/backup-restore/backup.c:277
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "Удаление вÑ?еменнÑ?Ñ? Ñ?айлов аÑ?Ñ?иваÑ?ии"
 
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "Ð?Ñ?овеÑ?ка локалÑ?нÑ?Ñ? иÑ?Ñ?оÑ?ников"
 
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Ð?Ñ?Ñ?иваÑ?иÑ? даннÑ?Ñ? в каÑ?алог %s"
 
-#: ../plugins/backup-restore/backup.c:459
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Ð?оÑ?Ñ?Ñ?ановление из каÑ?алога %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Ð?Ñ?Ñ?ив Evolution"
 
-#: ../plugins/backup-restore/backup.c:478
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Ð?оÑ?Ñ?Ñ?ановление Evolution"
 
-#: ../plugins/backup-restore/backup.c:513
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "РезеÑ?вное копиÑ?ование даннÑ?Ñ? Evolution"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
-msgstr ""
-"Ð?одождиÑ?е, пока Evolution вÑ?полнÑ?еÑ? Ñ?езеÑ?вное копиÑ?ование ваÑ?иÑ? даннÑ?Ñ?."
+msgstr "Ð?одождиÑ?е, пока Evolution вÑ?полнÑ?еÑ? Ñ?езеÑ?вное копиÑ?ование ваÑ?иÑ? даннÑ?Ñ?."
 
-#: ../plugins/backup-restore/backup.c:516
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "Ð?оÑ?Ñ?Ñ?ановление даннÑ?Ñ? Evolution"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Ð?одождиÑ?е, пока Evolution воÑ?Ñ?Ñ?анавливаеÑ? ваÑ?и даннÑ?е."
 
-#: ../plugins/backup-restore/backup.c:535
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "ЭÑ?о можеÑ? занÑ?Ñ?Ñ? некоÑ?оÑ?ое вÑ?емÑ?, в завимоÑ?Ñ?и оÑ? обÑ?ема даннÑ?Ñ? ваÑ?ей Ñ?Ñ?еÑ?ной "
 "запиÑ?и."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "Ð?одÑ?лÑ? длÑ? Ñ?оÑ?Ñ?анениÑ? и воÑ?Ñ?Ñ?ановление даннÑ?Ñ? и паÑ?амеÑ?Ñ?ов Evolution."
-
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
 msgstr "Ð?одÑ?лÑ? Ñ?оÑ?Ñ?анениÑ? и воÑ?Ñ?Ñ?ановлениÑ?"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "СоÑ?Ñ?анение и воÑ?Ñ?Ñ?ановление даннÑ?Ñ? и паÑ?амеÑ?Ñ?ов Evolution"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е закÑ?Ñ?Ñ?Ñ? Evolution?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid ""
-"Are you sure you want to restore Evolution from the selected backup file?"
-msgstr ""
-"Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е воÑ?Ñ?Ñ?ановиÑ?Ñ? Evolution из вÑ?бÑ?анного Ñ?айла аÑ?Ñ?ива?"
+msgid "Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е воÑ?Ñ?Ñ?ановиÑ?Ñ? Evolution из вÑ?бÑ?анного Ñ?айла аÑ?Ñ?ива?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid ""
@@ -16582,76 +15316,78 @@ msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? _паÑ?амеÑ?Ñ?Ñ?..."
 msgid "_Backup Settings..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? паÑ?а_меÑ?Ñ?Ñ?..."
 
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?кие конÑ?акÑ?Ñ?"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
-msgstr ""
-"_Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?оздаваÑ?Ñ? запиÑ?и в адÑ?еÑ?ной книге пÑ?и оÑ?веÑ?е на Ñ?ообÑ?ениÑ?"
+#: ../plugins/bbdb/bbdb.c:646
+#, fuzzy
+msgid "Create _address book entries when sending mails"
+msgstr "_Ð?вÑ?омаÑ?иÑ?еÑ?ки Ñ?оздаваÑ?Ñ? запиÑ?и в адÑ?еÑ?ной книге пÑ?и оÑ?веÑ?е на Ñ?ообÑ?ениÑ?"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:652
 msgid "Select Address book for Automatic Contacts"
 msgstr "Ð?Ñ?беÑ?иÑ?е адÑ?еÑ?нÑ?Ñ? книгÑ? длÑ? авÑ?омаÑ?иÑ?еÑ?киÑ? конÑ?акÑ?ов"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Instant Messaging Contacts"
 msgstr "Ð?онÑ?акÑ?Ñ? мгновеннÑ?Ñ? Ñ?ообÑ?ений"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:682
 msgid "Synchronize contact info and images from Pidgin buddy list"
-msgstr ""
-"СинÑ?Ñ?онизиÑ?Ñ?еÑ? конÑ?акÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и изобÑ?ажениÑ? из Ñ?пиÑ?ка конÑ?акÑ?ов Pidgin"
+msgstr "СинÑ?Ñ?онизиÑ?Ñ?еÑ? конÑ?акÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и изобÑ?ажениÑ? из Ñ?пиÑ?ка конÑ?акÑ?ов Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:688
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Ð?Ñ?беÑ?иÑ?е адÑ?еÑ?нÑ?Ñ? книгÑ? длÑ? Ñ?пиÑ?ка конÑ?акÑ?ов Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:699
 msgid "Synchronize with _buddy list now"
 msgstr "СинÑ?Ñ?онизиÑ?оваÑ?Ñ? Ñ?о Ñ?пиÑ?ком конÑ?акÑ?ов Ñ?ейÑ?аÑ?"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "Ð?вÑ?омаÑ?иÑ?еÑ?ки добавлÑ?еÑ? в адÑ?еÑ?нÑ?Ñ? книгÑ? имена и адÑ?еÑ?а полÑ?Ñ?аÑ?елей, когда "
 "вÑ? оÑ?веÑ?аеÑ?е на Ñ?ообÑ?ениÑ?. Также заполнÑ?еÑ? конÑ?акÑ?нÑ?е даннÑ?е из Ñ?пиÑ?ка "
 "конÑ?акÑ?ов Ñ?лÑ?жбÑ? мгновеннÑ?Ñ? Ñ?ообÑ?ений."
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
-
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "Ð?Ñ?оизоÑ?ла оÑ?ибка, пока вÑ?полнÑ?лÑ?Ñ? %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:186
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:183
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Ð?оÑ?еÑ?ний пÑ?оÑ?еÑ?Ñ? Bogofilter не оÑ?веÑ?аеÑ?, завеÑ?Ñ?ение..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:188
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:185
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Ð?жидание доÑ?еÑ?него пÑ?оÑ?еÑ?Ñ?а Bogofilter пÑ?еÑ?вано, завеÑ?Ñ?ение..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:211
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:208
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Ð?Ñ?ибка канала длÑ? Bogofilter, код оÑ?ибки: %d."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:374
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:371
 msgid "Convert message text to _Unicode"
 msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ? Ñ?екÑ?Ñ? пиÑ?Ñ?ма в _Юникод"
 
@@ -16668,73 +15404,118 @@ msgstr ""
 "Ñ?илÑ?Ñ?Ñ?ов Ñ?пама, имеÑ?Ñ?иÑ? пÑ?облемÑ? Ñ? Ñ?азлиÑ?нÑ?ми кодиÑ?овками."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Bogofilter"
+#, fuzzy
+msgid "Bogofilter Junk Filter"
+msgstr "Ð?нÑ?иÑ?памовÑ?й модÑ?лÑ? Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Ð?нÑ?иÑ?памовÑ?й модÑ?лÑ? Bogofilter"
+msgid "Bogofilter Options"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Bogofilter"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Filter junk messages using Bogofilter."
 msgstr "ФилÑ?Ñ?Ñ?Ñ?еÑ? Ñ?пам иÑ?полÑ?зÑ?Ñ? Bogofilter."
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:608
-#: ../plugins/google-account-setup/google-contacts-source.c:348
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:632
-#: ../plugins/google-account-setup/google-contacts-source.c:367
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:508
+#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-contacts-source.c:322
 msgid "Re_fresh:"
 msgstr "Ð?бнов_иÑ?Ñ?"
 
+#: ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:526
+#: ../plugins/google-account-setup/google-source.c:743
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+msgid "weeks"
+msgstr "недели"
+
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "Ð?Ñ?Ñ?оÑ?ники календаÑ?ей CalDAV"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
+#, fuzzy
+msgid "CalDAV Support"
 msgstr "Ð?Ñ?Ñ?оÑ?ники CalDAV"
 
+#: ../plugins/calendar-file/calendar-file.c:208
+#, fuzzy
+msgid "_Customize options"
+msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ?"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+#, fuzzy
+msgid "File _name:"
+msgstr "Ð?мÑ? Ñ?айла:"
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#, fuzzy
+msgid "On open"
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ?"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr ""
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#, fuzzy
+msgid "Periodically"
+msgstr "Ð?иÑ?ное"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr ""
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "Ð?окалÑ?нÑ?е календаÑ?и"
+msgid "Add local calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? базовÑ?Ñ? Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?Ñ? длÑ? локалÑ?нÑ?Ñ? календаÑ?ей."
+msgid "Local Calendars"
+msgstr "Ð?окалÑ?нÑ?е календаÑ?и"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? _заÑ?иÑ?енное Ñ?оединение"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "Ð?алендаÑ?и HTTP"
+msgid "Add web calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? базовÑ?Ñ? Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?Ñ? длÑ? календаÑ?ей webcal и http."
+#, fuzzy
+msgid "Web Calendars"
+msgstr "Ð?алендаÑ?и"
 
 #: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Fog"
@@ -16776,80 +15557,73 @@ msgstr "Ð?огода: гÑ?озÑ?"
 msgid "Select a location"
 msgstr "Ð?Ñ?беÑ?иÑ?е адÑ?еÑ?"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:606
 msgid "_Units:"
 msgstr "_Ð?диниÑ?Ñ?:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:613
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Ð?еÑ?Ñ?иÑ?еÑ?кие (ЦелÑ?Ñ?ий, Ñ?анÑ?имеÑ?Ñ?Ñ?, и Ñ?.д.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:614
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Ð?Ñ?иÑ?анÑ?кие (ФаÑ?енгейÑ?, дÑ?ймÑ?, и Ñ?.д.)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? базовÑ?Ñ? Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?Ñ? длÑ? календаÑ?ей погодÑ?."
+msgid "Add weather calendars to Evolution."
+msgstr ""
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "Ð?алендаÑ?и погодÑ?"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr ""
-"ТеÑ?Ñ?овÑ?й модÑ?лÑ?, коÑ?оÑ?Ñ?й демонÑ?Ñ?Ñ?иÑ?Ñ?еÑ? модÑ?лÑ? вÑ?падаÑ?Ñ?его менÑ?, позволÑ?Ñ?Ñ?ий "
-"Ñ?копиÑ?оваÑ?Ñ? Ñ?леменÑ?Ñ? в бÑ?Ñ?еÑ? обмена."
+#, fuzzy
+msgid "Copy Tool"
+msgstr "СÑ?едÑ?Ñ?во копиÑ?ованиÑ?"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "СÑ?едÑ?Ñ?во копиÑ?ованиÑ?"
+#, fuzzy
+msgid "Copy things to the clipboard."
+msgstr "Ð?опиÑ?оваÑ?Ñ? вÑ?деленнÑ?е Ñ?ообÑ?ениÑ? в бÑ?Ñ?еÑ? обмена"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ?, Ñ?влÑ?еÑ?Ñ?Ñ? ли Evolution поÑ?Ñ?овой пÑ?огÑ?аммой по Ñ?молÑ?аниÑ?"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr ""
 "Ð?Ñ?овеÑ?Ñ?Ñ?Ñ? пÑ?и каждом запÑ?Ñ?ке, Ñ?влÑ?еÑ?Ñ?Ñ? ли Evolution поÑ?Ñ?овой пÑ?огÑ?аммой по "
 "Ñ?молÑ?аниÑ?."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Ð?Ñ?овеÑ?Ñ?еÑ? пÑ?и запÑ?Ñ?ке, Ñ?влÑ?еÑ?Ñ?Ñ? ли Evolution поÑ?Ñ?овÑ?м клиенÑ?ом по Ñ?молÑ?аниÑ?."
+#, fuzzy
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "Ð?Ñ?овеÑ?Ñ?еÑ? пÑ?и запÑ?Ñ?ке, Ñ?влÑ?еÑ?Ñ?Ñ? ли Evolution поÑ?Ñ?овÑ?м клиенÑ?ом по Ñ?молÑ?аниÑ?."
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+#, fuzzy
+msgid "Default Mail Client"
 msgstr "Ð?оÑ?Ñ?овÑ?й клиенÑ? по Ñ?молÑ?аниÑ? "
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "СделаÑ?Ñ? Evolution ваÑ?им поÑ?Ñ?овÑ?м клиенÑ?ом по Ñ?молÑ?аниÑ??"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:80
 msgid "Mark as _default address book"
 msgstr "Ð?омеÑ?иÑ?Ñ? как адÑ?еÑ?нÑ?Ñ? книгÑ? по _Ñ?молÑ?аниÑ?"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:101
 msgid "Mark as _default calendar"
 msgstr "Ð?омеÑ?иÑ?Ñ? как календаÑ?Ñ? по _Ñ?молÑ?аниÑ?"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:102
 msgid "Mark as _default task list"
 msgstr "Ð?омеÑ?иÑ?Ñ? как Ñ?пиÑ?ок задаÑ? по _Ñ?молÑ?аниÑ?"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:103
 msgid "Mark as _default memo list"
 msgstr "Ð?омеÑ?иÑ?Ñ? как Ñ?пиÑ?ок замеÑ?ок по _Ñ?молÑ?аниÑ?"
 
@@ -16858,43 +15632,39 @@ msgid "Default Sources"
 msgstr "Ð?Ñ?Ñ?оÑ?ники по Ñ?молÑ?аниÑ?"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
+msgid "Mark your preferred address book and calendar as default."
 msgstr ""
-"Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?Ñ? длÑ? Ñ?Ñ?Ñ?ановки иÑ?полÑ?зÑ?емÑ?Ñ? по Ñ?молÑ?аниÑ? "
-"календаÑ?Ñ? или адÑ?еÑ?ной книги."
 
-#: ../plugins/email-custom-header/email-custom-header.c:334
+#: ../plugins/email-custom-header/email-custom-header.c:333
 msgid "Security:"
 msgstr "Ð?езопаÑ?ноÑ?Ñ?Ñ?:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:339
+#: ../plugins/email-custom-header/email-custom-header.c:338
 msgid "Unclassified"
 msgstr "Ð?е клаÑ?Ñ?иÑ?иÑ?иÑ?ованное"
 
-#: ../plugins/email-custom-header/email-custom-header.c:340
+#: ../plugins/email-custom-header/email-custom-header.c:339
 msgid "Protected"
 msgstr "Ð?аÑ?иÑ?Ñ?нное"
 
-#: ../plugins/email-custom-header/email-custom-header.c:342
+#: ../plugins/email-custom-header/email-custom-header.c:341
 msgid "Secret"
 msgstr "СекÑ?еÑ?ное"
 
-#: ../plugins/email-custom-header/email-custom-header.c:343
+#: ../plugins/email-custom-header/email-custom-header.c:342
 msgid "Top secret"
 msgstr "СовеÑ?Ñ?енно Ñ?екÑ?еÑ?ное"
 
-#: ../plugins/email-custom-header/email-custom-header.c:585
+#: ../plugins/email-custom-header/email-custom-header.c:584
 msgid "_Custom Header"
 msgstr "_Ð?ополниÑ?елÑ?нÑ?е заголовки"
 
-#: ../plugins/email-custom-header/email-custom-header.c:907
+#: ../plugins/email-custom-header/email-custom-header.c:906
 msgid "Key"
 msgstr "Ð?лÑ?Ñ?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:918
-#: ../plugins/templates/templates.c:396
+#: ../plugins/email-custom-header/email-custom-header.c:917
+#: ../plugins/templates/templates.c:395
 msgid "Values"
 msgstr "Ð?наÑ?ениÑ?"
 
@@ -16913,7 +15683,8 @@ msgstr "Ð?ополниÑ?елÑ?нÑ?е заголовки Ñ?ообÑ?ений"
 
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
+#, fuzzy
+msgid "Add custom headers to outgoing mail messages."
 msgstr "Ð?обавлÑ?Ñ?Ñ? дополниÑ?елÑ?нÑ?е заголовки к иÑ?Ñ?одÑ?Ñ?им Ñ?ообÑ?ениÑ?м."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
@@ -16977,11 +15748,11 @@ msgstr ""
 "ЭÑ?оÑ? паÑ?амеÑ?Ñ? позволиÑ? подклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?веÑ?Ñ? Exchange Ñ?Ñ?едÑ?Ñ?вами "
 "Ñ?Ñ?андаÑ?Ñ?ной пÑ?овеÑ?ки подлинноÑ?Ñ?и (незаÑ?иÑ?Ñ?ннÑ?й Ñ?екÑ?Ñ?овÑ?й паÑ?олÑ?)."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
+#: ../plugins/exchange-operations/exchange-account-setup.c:271
 msgid "Out Of Office"
 msgstr "Ð?е на Ñ?абоÑ?е"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:278
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -16989,90 +15760,93 @@ msgstr ""
 "СообÑ?ение, Ñ?казанное ниже, бÑ?деÑ? авÑ?омаÑ?иÑ?еÑ?ки оÑ?пÑ?авлено\n"
 "вÑ?ем лиÑ?ам, пÑ?иÑ?лавÑ?им вам поÑ?Ñ?Ñ? во вÑ?емÑ? ваÑ?его оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?виÑ? на Ñ?абоÑ?е."
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
+#: ../plugins/exchange-operations/exchange-account-setup.c:290
+#: ../plugins/exchange-operations/exchange-account-setup.c:295
 msgid "I am out of the office"
 msgstr "Я Ñ?ейÑ?аÑ? не на Ñ?абоÑ?е"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
+#: ../plugins/exchange-operations/exchange-account-setup.c:291
+#: ../plugins/exchange-operations/exchange-account-setup.c:294
 msgid "I am in the office"
 msgstr "Я Ñ?ейÑ?аÑ? на Ñ?абоÑ?е"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
+#: ../plugins/exchange-operations/exchange-account-setup.c:340
 msgid "Change the password for Exchange account"
 msgstr "Ð?змениÑ?Ñ? паÑ?олÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:342
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:1
 msgid "Change Password"
 msgstr "Ð?змениÑ?Ñ? паÑ?олÑ?"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
+#: ../plugins/exchange-operations/exchange-account-setup.c:347
 msgid "Manage the delegate settings for Exchange account"
 msgstr "УпÑ?авление паÑ?амеÑ?Ñ?ами поÑ?Ñ?Ñ?ениÑ? длÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Delegation Assistant"
 msgstr "Ð?омоÑ?ник делегаÑ?ии"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Miscelleneous"
 msgstr "Разное"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
+#: ../plugins/exchange-operations/exchange-account-setup.c:371
 msgid "View the size of all Exchange folders"
 msgstr "Ð?Ñ?оÑ?моÑ?Ñ? Ñ?азмеÑ?а вÑ?еÑ? папок Excange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
+#: ../plugins/exchange-operations/exchange-account-setup.c:373
 msgid "Folders Size"
 msgstr "РазмеÑ? папок"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
+#: ../plugins/exchange-operations/exchange-account-setup.c:380
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Exchange"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
+#: ../plugins/exchange-operations/exchange-account-setup.c:726
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
+#: ../plugins/exchange-operations/exchange-account-setup.c:752
 msgid "A_uthenticate"
 msgstr "Ð?Ñ?овеÑ?иÑ?Ñ? п_одлинноÑ?Ñ?Ñ?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "_Ð?адаÑ?Ñ? поÑ?Ñ?овÑ?й Ñ?Ñ?ик"
+#: ../plugins/exchange-operations/exchange-account-setup.c:774
+msgid "Mailbox name is _different than user name"
+msgstr ""
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
+#: ../plugins/exchange-operations/exchange-account-setup.c:787
 msgid "_Mailbox:"
 msgstr "_Ð?оÑ?Ñ?овÑ?й Ñ?Ñ?ик:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
+#: ../plugins/exchange-operations/exchange-account-setup.c:1001
 msgid "_Authentication Type"
 msgstr "Тип _пÑ?овеÑ?ки подлинноÑ?Ñ?и"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "Ð?Ñ?ов_еÑ?иÑ?Ñ? поддеÑ?живаемÑ?е Ñ?ипÑ?"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
+#: ../plugins/exchange-operations/exchange-account-setup.c:1130
 #: ../plugins/exchange-operations/exchange-contacts.c:217
 #, c-format
 msgid "%s KB"
 msgstr "%s Ð?Ð?"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
+#: ../plugins/exchange-operations/exchange-account-setup.c:1132
 #: ../plugins/exchange-operations/exchange-contacts.c:219
 #, c-format
 msgid "0 KB"
 msgstr "0 Ð?Ð?"
 
+#. FIXME: Take care of i18n
+#: ../plugins/exchange-operations/exchange-account-setup.c:1137
+#: ../plugins/exchange-operations/exchange-calendar.c:236
+#: ../plugins/exchange-operations/exchange-contacts.c:222
+msgid "Size:"
+msgstr "РазмеÑ?:"
+
 #: ../plugins/exchange-operations/exchange-calendar.c:196
 #: ../plugins/exchange-operations/exchange-contacts.c:170
 msgid ""
@@ -17114,38 +15888,35 @@ msgstr "Ð?овÑ?й паÑ?олÑ?:"
 msgid "Your current password has expired. Please change your password now."
 msgstr "СÑ?ок дейÑ?Ñ?виÑ? ваÑ?его Ñ?екÑ?Ñ?его паÑ?олÑ? иÑ?Ñ?Ñ?к. Ð?змениÑ?е паÑ?олÑ?."
 
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
+#: ../plugins/exchange-operations/exchange-config-listener.c:657
 #, c-format
 msgid "Your password will expire in the next %d days"
 msgstr "СÑ?ок дейÑ?Ñ?виÑ? ваÑ?его паÑ?олÑ? иÑ?Ñ?екаеÑ? Ñ?еÑ?ез %d дней"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:565
+#: ../plugins/exchange-operations/exchange-delegates-user.c:142
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:560
 msgid "Custom"
 msgstr "Ð?аÑ?Ñ?Ñ?аиваемÑ?й"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates-user.c:168
 msgid "Editor (read, create, edit)"
 msgstr "РедакÑ?оÑ? (Ñ?Ñ?ение, Ñ?оздание, изменение)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+#: ../plugins/exchange-operations/exchange-delegates-user.c:172
 msgid "Author (read, create)"
 msgstr "Ð?вÑ?оÑ? (Ñ?Ñ?ение, Ñ?оздание)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+#: ../plugins/exchange-operations/exchange-delegates-user.c:176
 msgid "Reviewer (read-only)"
 msgstr "Ð?бозÑ?еваÑ?елÑ? (Ñ?олÑ?ко Ñ?Ñ?ение)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates-user.c:225
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
 msgid "Delegate Permissions"
 msgstr "Ð?Ñ?ава пÑ?едÑ?Ñ?авиÑ?елÑ?"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
+#: ../plugins/exchange-operations/exchange-delegates-user.c:236
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:176
 #, c-format
 msgid "Permissions for %s"
 msgstr "Ð?Ñ?ава доÑ?Ñ?Ñ?па длÑ? %s"
@@ -17153,7 +15924,7 @@ msgstr "Ð?Ñ?ава доÑ?Ñ?Ñ?па длÑ? %s"
 #. To translators: This is a part of the message to be sent to the delegatee
 #. summarizing the permissions assigned to him.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
+#: ../plugins/exchange-operations/exchange-delegates-user.c:326
 msgid ""
 "This message was sent automatically by Evolution to inform you that you have "
 "been designated as a delegate. You can now send messages on my behalf."
@@ -17163,84 +15934,92 @@ msgstr ""
 
 #. To translators: Another chunk of the same message.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:331
 msgid "You have been given the following permissions on my folders:"
 msgstr "Ð?ам бÑ?ли данÑ? Ñ?ледÑ?Ñ?Ñ?ие пÑ?ава на доÑ?Ñ?Ñ?п к Ñ?ледÑ?Ñ?Ñ?им папкам:"
 
 #. To translators: This message is included if the delegatee has been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
+#: ../plugins/exchange-operations/exchange-delegates-user.c:351
 msgid "You are also permitted to see my private items."
 msgstr "Ð?Ñ? Ñ?акже можеÑ?е пÑ?оÑ?маÑ?Ñ?иваÑ?Ñ? мои пÑ?иваÑ?нÑ?е обÑ?екÑ?Ñ?."
 
 #. To translators: This message is included if the delegatee has not been given access
 #. to the private items.
 #.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
 msgid "However you are not permitted to see my private items."
 msgstr "Ð?о, вам нелÑ?зÑ? пÑ?оÑ?маÑ?Ñ?иваÑ?Ñ? мои пÑ?иваÑ?нÑ?е обÑ?екÑ?Ñ?."
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
+#: ../plugins/exchange-operations/exchange-delegates-user.c:390
 #, c-format
 msgid "You have been designated as a delegate for %s"
 msgstr "Ð?Ñ? подÑ?веÑ?жденÑ?, как пÑ?едÑ?Ñ?авиÑ?елÑ? %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../plugins/exchange-operations/exchange-delegates.c:416
 msgid "Delegate To"
 msgstr "Ð?оÑ?Ñ?Ñ?иÑ?Ñ?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:582
+#: ../plugins/exchange-operations/exchange-delegates.c:581
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "УдалиÑ?Ñ? пÑ?едÑ?Ñ?авиÑ?елÑ? %s?"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:700
+#: ../plugins/exchange-operations/exchange-delegates.c:698
 msgid "Could not access Active Directory"
 msgstr "Ð?еÑ? доÑ?Ñ?Ñ?па к Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:712
+#: ../plugins/exchange-operations/exchange-delegates.c:710
 msgid "Could not find self in Active Directory"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?ебÑ? в Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:725
+#: ../plugins/exchange-operations/exchange-delegates.c:723
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и пÑ?едÑ?Ñ?авиÑ?елÑ? %s в Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:737
+#: ../plugins/exchange-operations/exchange-delegates.c:735
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?далиÑ?Ñ? пÑ?едÑ?Ñ?авиÑ?елÑ? %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 msgid "Could not update list of delegates."
 msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? Ñ?пиÑ?ок пÑ?едÑ?Ñ?авиÑ?елей."
 
-#: ../plugins/exchange-operations/exchange-delegates.c:815
+#: ../plugins/exchange-operations/exchange-delegates.c:813
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? добавиÑ?Ñ? пÑ?едÑ?Ñ?авиÑ?елÑ? %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:983
+#: ../plugins/exchange-operations/exchange-delegates.c:980
 msgid "Error reading delegates list."
 msgstr "Ð?Ñ?ибка Ñ?Ñ?ениÑ? Ñ?пиÑ?ка пÑ?едÑ?Ñ?авиÑ?елей."
 
 #. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
 msgid "C_alendar:"
 msgstr "Ð?_алендаÑ?Ñ?:"
 
 #. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
 msgid "Co_ntacts:"
 msgstr "Ð?о_нÑ?акÑ?Ñ?:"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegates"
 msgstr "Ð?Ñ?едÑ?Ñ?авиÑ?ели"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
+msgid ""
+"None\n"
+"Reviewer (read-only)\n"
+"Author (read, create)\n"
+"Editor (read, create, edit)"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
 msgid "Permissions for"
 msgstr "Ð?Ñ?ава длÑ?"
 
@@ -17268,6 +16047,7 @@ msgstr "С_водка пÑ?ав доÑ?Ñ?Ñ?па"
 
 #. Translators: This is used for permissions for <user> for the folder Tasks.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:20
+#: ../plugins/itip-formatter/itip-view.c:1912
 msgid "_Tasks:"
 msgstr "_Ð?адаÑ?и:"
 
@@ -17285,11 +16065,11 @@ msgid "Folder Size"
 msgstr "РазмеÑ? папки"
 
 #. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:76
 msgid "User"
 msgstr "Ð?олÑ?зоваÑ?елÑ?"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:309
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "Ð?одпиÑ?ка на папкÑ? дÑ?Ñ?гого полÑ?зоваÑ?елÑ?"
@@ -17298,20 +16078,20 @@ msgstr "Ð?одпиÑ?ка на папкÑ? дÑ?Ñ?гого полÑ?зоваÑ?елÑ?
 msgid "Exchange Folder Tree"
 msgstr "Ð?еÑ?ево папок Exchange"
 
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
+#: ../plugins/exchange-operations/exchange-folder.c:65
+#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:243
 msgid "Unsubscribe Folder..."
 msgstr "Ð?Ñ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:518
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "Ð?ейÑ?Ñ?виÑ?елÑ?но оÑ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? папки «%s»?"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:530
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "Ð?Ñ?пиÑ?аÑ?Ñ?Ñ?Ñ? оÑ? «%s»"
@@ -17376,18 +16156,18 @@ msgstr "СÑ?ок дейÑ?Ñ?виÑ? ваÑ?его паÑ?олÑ? иÑ?Ñ?екаеÑ? Ñ?
 msgid "_Change Password"
 msgstr "_Ð?змениÑ?Ñ? паÑ?олÑ?"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:293
 msgid "(Permission denied.)"
 msgstr "(Ð?оÑ?Ñ?Ñ?п запÑ?еÑ?ен.)"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 msgid "Add User:"
 msgstr "Ð?обавиÑ?Ñ? полÑ?зоваÑ?елÑ?:"
 
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:399
 #: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
+#: ../plugins/groupwise-features/proxy.c:932
+#: ../plugins/groupwise-features/share-folder.c:713
 msgid "Add User"
 msgstr "Ð?обавиÑ?Ñ? полÑ?зоваÑ?елÑ?"
 
@@ -17505,11 +16285,11 @@ msgstr "_ЧÑ?вÑ?Ñ?виÑ?елÑ?ноÑ?Ñ?Ñ?: "
 msgid "_User"
 msgstr "_Ð?олÑ?зоваÑ?елÑ?"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
+#: ../plugins/exchange-operations/exchange-user-dialog.c:134
 msgid "Select User"
 msgstr "Ð?Ñ?беÑ?иÑ?е полÑ?зоваÑ?елÑ?"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
+#: ../plugins/exchange-operations/exchange-user-dialog.c:172
 msgid "Address Book..."
 msgstr "Ð?дÑ?еÑ?наÑ? книга..."
 
@@ -17522,12 +16302,8 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "Ð?одпиÑ?ка на календаÑ?Ñ? дÑ?Ñ?гого полÑ?зоваÑ?елÑ?"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
+msgid "Activates the Evolution-Exchange extension package."
 msgstr ""
-"Ð?одÑ?лÑ?, коÑ?оÑ?Ñ?й пÑ?едоÑ?Ñ?авлÑ?еÑ? доÑ?Ñ?Ñ?п к дополниÑ?елÑ?ной Ñ?Ñ?нкÑ?ионалÑ?ноÑ?Ñ?и "
-"Exchange."
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
@@ -17675,7 +16451,7 @@ msgid "Folder offline"
 msgstr "Ð?апка оÑ?клÑ?Ñ?ена"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1259
 msgid "Generic error"
 msgstr "Ð?бÑ?аÑ? оÑ?ибка"
 
@@ -17795,7 +16571,9 @@ msgid "Unknown error looking up {0}"
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка пÑ?и поиÑ?ке {0}"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:599
+#: ../plugins/mail-to-task/mail-to-task.c:821
 msgid "Unknown error."
 msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка."
 
@@ -17878,35 +16656,42 @@ msgid "Check folder permissions"
 msgstr "Ð?Ñ?овеÑ?Ñ?Ñ?е пÑ?ава папки"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:120
+msgid "Automatically launch when a new mail is edited"
+msgstr ""
+
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "Ð?неÑ?ний Ñ?едакÑ?оÑ? по Ñ?молÑ?аниÑ?"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "Ð?оманда длÑ? запÑ?Ñ?ка Ñ?едакÑ?оÑ?а по Ñ?молÑ?аниÑ?."
 
 #: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
-msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
+msgid "External Editor"
+msgstr "Ð?неÑ?ний Ñ?едакÑ?оÑ?"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
 msgstr ""
 "Ð?одÑ?лÑ? длÑ? иÑ?полÑ?зованиÑ? внеÑ?него Ñ?едакÑ?оÑ?а длÑ? напиÑ?аниÑ? Ñ?ообÑ?ений. "
 "Ð?озволÑ?еÑ? оÑ?пÑ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? Ñ?олÑ?ко в виде обÑ?Ñ?ного Ñ?екÑ?Ñ?а."
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
-msgid "External Editor"
-msgstr "Ð?неÑ?ний Ñ?едакÑ?оÑ?"
-
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? вÑ?еменнÑ?й Ñ?айл"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?едакÑ?оÑ?"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
@@ -17914,7 +16699,18 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? вÑ?еменнÑ?й Ñ?айл длÑ? поÑ?Ñ?ового Ñ?ообÑ?ениÑ?. Ð?опÑ?обÑ?йÑ?е еÑ?Ñ? "
 "Ñ?аз."
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+#, fuzzy
+msgid "External editor still running"
+msgstr "Ð?неÑ?ний Ñ?едакÑ?оÑ?"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
@@ -17922,26 +16718,25 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Ñ?екÑ?Ñ?овÑ?й Ñ?едакÑ?оÑ? из наÑ?Ñ?Ñ?оек модÑ?лÑ?. Ð?опÑ?обÑ?йÑ?е "
 "задаÑ?Ñ? дÑ?Ñ?гой Ñ?едакÑ?оÑ?."
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "СоÑ?Ñ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? _во внеÑ?нем Ñ?едакÑ?оÑ?е"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "СоÑ?Ñ?авление Ñ?ообÑ?ений Ñ? помоÑ?Ñ?Ñ? внеÑ?него Ñ?едакÑ?оÑ?а"
-
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:109
 msgid "Command to be executed to launch the editor: "
 msgstr "Ð?оманда длÑ? запÑ?Ñ?ка Ñ?едакÑ?оÑ?а: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:110
+#, fuzzy
 msgid ""
 "For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"For VI use \"gvim -f\""
 msgstr ""
 "Ð?лÑ? Emacs иÑ?полÑ?зÑ?йÑ?е \"xemacs\"\n"
 "Ð?лÑ? VI иÑ?полÑ?зÑ?йÑ?е \"gvim\""
 
+#: ../plugins/external-editor/external-editor.c:354
+#: ../plugins/external-editor/external-editor.c:356
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "СоÑ?Ñ?авлÑ?Ñ?Ñ? Ñ?ообÑ?ениÑ? _во внеÑ?нем Ñ?едакÑ?оÑ?е"
+
 #: ../plugins/face/face.c:59
 msgid "Select a (48*48) png of size < 700bytes"
 msgstr "Ð?Ñ?беÑ?иÑ?е изобÑ?ажение в Ñ?оÑ?маÑ?е png Ñ?азмеÑ?ом (48x48) не болÑ?Ñ?е 700 байÑ?"
@@ -17955,41 +16750,47 @@ msgid "_Face"
 msgstr "_ФоÑ?о"
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+"Attach a small picture of your face to outgoing messages.\n"
+"\n"
+"First time the user needs to configure a 48x48 PNG image. It is Base-64 "
+"encoded and stored in ~/.evolution/faces. This will be used in subsequent "
+"sent messages."
 msgstr ""
 "Ð?обавлÑ?Ñ?Ñ? заголовок Ñ? Ñ?оÑ?огÑ?аÑ?ией к иÑ?Ñ?одÑ?Ñ?им пиÑ?Ñ?мам. Ð? пеÑ?вÑ?й Ñ?аз "
 "полÑ?зоваÑ?елÑ? должен пÑ?едоÑ?Ñ?авиÑ?Ñ? Ñ?оÑ?огÑ?аÑ?иÑ? 48Ã?48 пикÑ?елей. Ð?но кодиÑ?Ñ?еÑ?Ñ?Ñ? в "
 "base64 и Ñ?оÑ?Ñ?анÑ?еÑ?Ñ?Ñ? в ~/.evolution/faces. ЭÑ?а Ñ?оÑ?огÑ?аÑ?иÑ? бÑ?деÑ? "
 "иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? в оÑ?пÑ?авленнÑ?Ñ? пиÑ?Ñ?маÑ?."
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:53
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Ð?Ñ?мена подпиÑ?ки на папкÑ? «%s»"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr ""
-"Ð?озволÑ?еÑ? оÑ?менÑ?Ñ?Ñ? подпиÑ?кÑ? на поÑ?Ñ?овÑ?е папки в конÑ?екÑ?Ñ?ном менÑ? папки в "
-"боковой панели."
-
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
 msgstr "Ð?Ñ?пиÑ?ка оÑ? папок"
 
+#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
+msgid "Unsubscribe from an IMAP folder by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
 msgid "_Unsubscribe"
 msgstr "_Ð?Ñ?казаÑ?Ñ?Ñ?Ñ? оÑ? подпиÑ?ки"
 
-#: ../plugins/google-account-setup/google-source.c:421
+#: ../plugins/google-account-setup/google-source.c:82
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/google-source.c:518
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? доÑ?Ñ?Ñ?па календаÑ?Ñ?м полÑ?зоваÑ?елÑ? %s."
 
-#: ../plugins/google-account-setup/google-source.c:521
+#: ../plugins/google-account-setup/google-source.c:624
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17998,45 +16799,40 @@ msgstr ""
 "Ð?е Ñ?далоÑ?Ñ? пÑ?оÑ?иÑ?аÑ?Ñ? даннÑ?е Ñ? Ñ?еÑ?веÑ?а Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:683
+#: ../plugins/google-account-setup/google-source.c:759
 msgid "Cal_endar:"
 msgstr "_Ð?алендаÑ?Ñ?:"
 
-#: ../plugins/google-account-setup/google-source.c:718
+#: ../plugins/google-account-setup/google-source.c:794
 msgid "Retrieve _list"
 msgstr "Ð?олÑ?Ñ?иÑ?Ñ? _Ñ?пиÑ?ок"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:69
-#: ../plugins/google-account-setup/google-contacts-source.c:71
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:315
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:326
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
 msgid "<b>Server</b>"
 msgstr "<b>СеÑ?веÑ?</b>"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "Ð?одÑ?лÑ? длÑ? наÑ?Ñ?Ñ?ойки календаÑ?Ñ? и конÑ?акÑ?ов Google."
+msgid "Add Google Calendars to Evolution."
+msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Ð?Ñ?Ñ?оÑ?ники Google"
+msgid "Google Calendars"
+msgstr "Ð?алендаÑ?и Google"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:450
 msgid "Checklist"
 msgstr "Ð?еÑ?еÑ?енÑ?"
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "Ð?одÑ?лÑ? длÑ? наÑ?Ñ?Ñ?ойки календаÑ?Ñ? и конÑ?акÑ?ов GroupWise."
+msgid "Add Novell GroupWise support to Evolution."
+msgstr "Ð?обавлÑ?еÑ? в Evolution поддеÑ?жкÑ? Novell GroupWise."
 
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
 msgid "GroupWise Account Setup"
 msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?Ñ?Ñ?Ñ?ной запиÑ?и GroupWise"
 
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:219
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -18061,11 +16857,11 @@ msgstr ""
 "Ð?ажмиÑ?е «Ð?алее», Ñ?Ñ?обÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? обÑ?Ñ?Ñ? папкÑ?\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:224
 msgid "Install the shared folder"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? обÑ?Ñ?Ñ? папкÑ?"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:226
 msgid "Shared Folder Installation"
 msgstr "УÑ?Ñ?ановка обÑ?ей папки"
 
@@ -18103,11 +16899,11 @@ msgstr "_Ð?клÑ?Ñ?иÑ?Ñ?"
 msgid "_Junk List"
 msgstr "_СпиÑ?ок Ñ?пама"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
+#: ../plugins/groupwise-features/mail-retract.c:52
 msgid "Message Retract"
 msgstr "Ð?Ñ?зÑ?в Ñ?ообÑ?ениÑ?"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:57
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this ?"
@@ -18115,11 +16911,11 @@ msgstr ""
 "Ð?Ñ?зÑ?в Ñ?ообÑ?ениÑ? можеÑ? повлеÑ?Ñ? за Ñ?обой его Ñ?даление из поÑ?Ñ?ового Ñ?Ñ?ика "
 "полÑ?Ñ?аÑ?елÑ?. Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е оÑ?озваÑ?Ñ? Ñ?ообÑ?ение?"
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:76
 msgid "Message retracted successfully"
 msgstr "СообÑ?ение бÑ?ло Ñ?Ñ?пеÑ?но оÑ?озвано"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid "Retract Mail"
 msgstr "Ð?Ñ?озваÑ?Ñ? Ñ?ообÑ?ение"
 
@@ -18128,90 +16924,124 @@ msgid "Add Send Options to GroupWise messages"
 msgstr "Ð?обавиÑ?Ñ? Ð?аÑ?амеÑ?Ñ?Ñ? Ð?Ñ?пÑ?авки к Ñ?ообÑ?ениÑ?м GroupWise"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Ð?одÑ?лÑ? длÑ? поддеÑ?жки Ñ?Ñ?нкÑ?ий Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?ей GroupWise."
+msgid "Fine-tune your GroupWise accounts."
+msgstr "Ð?еÑ?алÑ?наÑ? наÑ?Ñ?Ñ?ойка ваÑ?иÑ? Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?ей GroupWise."
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "GroupWise Features"
 msgstr "Ð?озможноÑ?Ñ?и GroupWise"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "Ð?Ñ?ибка оÑ?зÑ?ва Ñ?ообÑ?ениÑ?"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 msgid "The server did not allow the selected message to be retracted."
 msgstr "СеÑ?веÑ? не позволил оÑ?озваÑ?Ñ? вÑ?бÑ?анное Ñ?ообÑ?ение."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? «{0}» Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?. Ð?Ñ?овеÑ?Ñ?Ñ?е Ñ?вое деÑ?ево папок."
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "Ð?едейÑ?Ñ?виÑ?елÑ?нÑ?й полÑ?зоваÑ?елÑ?"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"РегиÑ?Ñ?Ñ?аÑ?иÑ? в пÑ?окÑ?и под именем «{0}» не Ñ?далаÑ?Ñ?. Ð?Ñ?овеÑ?Ñ?Ñ?е иденÑ?иÑ?икаÑ?оÑ? "
+"Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ? и попÑ?обÑ?йÑ?е еÑ?Ñ? Ñ?аз."
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "Ð?олÑ?зоваÑ?елÑ? не пÑ?едоÑ?Ñ?авлен доÑ?Ñ?Ñ?п Ñ?еÑ?ез пÑ?окÑ?и «{0}»"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "УкажиÑ?е полÑ?зоваÑ?елÑ?"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 msgid "You have already given proxy permissions to this user."
 msgstr "Ð?Ñ? Ñ?же пÑ?едоÑ?Ñ?авили пÑ?ава доÑ?Ñ?Ñ?па Ñ?еÑ?ез proxy длÑ? Ñ?Ñ?ого полÑ?зоваÑ?елÑ?."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr "Ð?Ñ?жно задаÑ?Ñ? коÑ?Ñ?екÑ?ное имÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и."
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? «{0}» Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?. Ð?Ñ?овеÑ?Ñ?Ñ?е Ñ?вое деÑ?ево папок."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "Ð?Ñ? не можеÑ?е иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ? папкÑ? Ñ?овмеÑ?Ñ?но Ñ? Ñ?казаннÑ?м полÑ?зоваÑ?елем «{0}»"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
+msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? имÑ? полÑ?зоваÑ?елÑ?, коÑ?оÑ?ого Ñ?оÑ?иÑ?е добавиÑ?Ñ? в Ñ?пиÑ?ок"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
-msgstr ""
-"РегиÑ?Ñ?Ñ?аÑ?иÑ? в пÑ?окÑ?и под именем «{0}» не Ñ?далаÑ?Ñ?. Ð?Ñ?овеÑ?Ñ?Ñ?е иденÑ?иÑ?икаÑ?оÑ? "
-"Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ? и попÑ?обÑ?йÑ?е еÑ?Ñ? Ñ?аз."
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting ?"
+msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? Ñ?Ñ?о Ñ?обÑ?ание?"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting ?"
+msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? Ñ?Ñ?о Ñ?обÑ?ание?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item ?"
+msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? незавеÑ?Ñ?еннÑ?е Ñ?ообÑ?ениÑ??"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "_УдалиÑ?Ñ? Ñ?Ñ?оÑ? Ñ?леменÑ? из Ñ?Ñ?иков вÑ?еÑ? оÑ?Ñ?алÑ?нÑ?Ñ? полÑ?Ñ?аÑ?елей?"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 msgid "This is a recurring meeting"
 msgstr "ЭÑ?о повÑ?оÑ?Ñ?Ñ?Ñ?аÑ?Ñ?Ñ? вÑ?Ñ?Ñ?еÑ?а"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 msgid "Would you like to accept it?"
 msgstr "Ð?Ñ?инÑ?Ñ?Ñ??"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 msgid "Would you like to decline it?"
 msgstr "Ð?Ñ?клониÑ?Ñ??"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr ""
-"Ð?Ñ? не можеÑ?е иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ? папкÑ? Ñ?овмеÑ?Ñ?но Ñ? Ñ?казаннÑ?м полÑ?зоваÑ?елем «{0}»"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr "Ð?Ñ? должнÑ? Ñ?казаÑ?Ñ? имÑ? полÑ?зоваÑ?елÑ?, коÑ?оÑ?ого Ñ?оÑ?иÑ?е добавиÑ?Ñ? в Ñ?пиÑ?ок"
-
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:53
 msgid "Accept Tentatively"
 msgstr "Ð?Ñ?инÑ?Ñ?Ñ? в поÑ?Ñ?дке Ñ?кÑ?пеÑ?именÑ?а"
 
+#: ../plugins/groupwise-features/process-meeting.c:319
+#, fuzzy
+msgid "Rese_nd Meeting..."
+msgstr "_Ð?оÑ?Ñ?Ñ?иÑ?Ñ? Ñ?обÑ?ание..."
+
 #: ../plugins/groupwise-features/properties.glade.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>Ð?олÑ?зоваÑ?ели:</b>"
@@ -18225,7 +17055,7 @@ msgid "Con_tacts..."
 msgstr "Ð?он_Ñ?акÑ?Ñ?..."
 
 #: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../widgets/table/e-table-click-to-add.c:514
 msgid "Message"
 msgstr "СообÑ?ение"
 
@@ -18308,10 +17138,10 @@ msgstr "<b>Ð?мÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и</b>"
 msgid "Proxy Login"
 msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? пÑ?окÑ?и"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:207
+#: ../plugins/groupwise-features/proxy-login.c:250
+#: ../plugins/groupwise-features/proxy.c:488
+#: ../plugins/groupwise-features/send-options.c:86
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sÐ?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
@@ -18319,19 +17149,19 @@ msgstr "%sÐ?ведиÑ?е паÑ?олÑ? длÑ? %s (полÑ?зоваÑ?елÑ? %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
+#: ../plugins/groupwise-features/proxy-login.c:512
 msgid "_Proxy Login..."
 msgstr "УÑ?Ñ?Ñ?наÑ? запиÑ?Ñ? _пÑ?окÑ?и..."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "Ð?кладка «Ð?Ñ?окÑ?и» бÑ?деÑ? доÑ?Ñ?Ñ?пна Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, когда Ñ?Ñ?Ñ?Ñ?наÑ? запиÑ?Ñ? "
 "вклÑ?Ñ?ена."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "Ð?кладка «Ð?Ñ?окÑ?и» бÑ?деÑ? доÑ?Ñ?Ñ?пна Ñ?олÑ?ко в Ñ?ом Ñ?лÑ?Ñ?ае, когда Ñ?Ñ?Ñ?Ñ?наÑ? запиÑ?Ñ? "
@@ -18341,101 +17171,101 @@ msgstr ""
 msgid "Advanced send options"
 msgstr "Ð?ополниÑ?елÑ?нÑ?е паÑ?амеÑ?Ñ?Ñ? оÑ?пÑ?авки"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:320
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Users"
 msgstr "Ð?олÑ?зоваÑ?ели"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:321
 msgid "Enter the users and set permissions"
 msgstr "Ð?ведиÑ?е полÑ?зоваÑ?елей и Ñ?Ñ?Ñ?ановиÑ?е пÑ?ава"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
+#: ../plugins/groupwise-features/share-folder-common.c:340
 msgid "New _Shared Folder..."
 msgstr "Ð?оваÑ? _обÑ?аÑ? папка..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "Ð?бÑ?ий доÑ?Ñ?Ñ?п"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:531
 msgid "Custom Notification"
 msgstr "Ð?ополниÑ?елÑ?ное Ñ?ведомление"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:753
 msgid "Add   "
 msgstr "Ð?обавиÑ?Ñ?   "
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:759
 msgid "Modify"
 msgstr "Ð?змениÑ?Ñ?"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:94
 msgid "Message Status"
 msgstr "СоÑ?Ñ?оÑ?ние Ñ?ообÑ?ениÑ?"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:108
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:122
 msgid "From:"
 msgstr "Ð?Ñ?:"
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Creation date:"
 msgstr "Ð?аÑ?а Ñ?озданиÑ?:"
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:176
 msgid "Recipient: "
 msgstr "Ð?олÑ?Ñ?аÑ?елÑ?: "
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:183
 msgid "Delivered: "
 msgstr "Ð?оÑ?Ñ?авлено: "
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:189
 msgid "Opened: "
 msgstr "Ð?Ñ?кÑ?Ñ?Ñ?о: "
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:194
 msgid "Accepted: "
 msgstr "Ð?Ñ?инÑ?Ñ?о: "
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:199
 msgid "Deleted: "
 msgstr "Удалено: "
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:204
 msgid "Declined: "
 msgstr "Ð?Ñ?клонено: "
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:209
 msgid "Completed: "
 msgstr "Ð?авеÑ?Ñ?ено: "
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Undelivered: "
 msgstr "Ð?е доÑ?Ñ?авлено: "
 
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Track Message Status..."
 msgstr "Ð?Ñ?Ñ?леживаÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Ñ?ообÑ?ениÑ?..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "Ð?одÑ?лÑ? длÑ? наÑ?Ñ?Ñ?ойки иÑ?Ñ?оÑ?ников календаÑ?ей Hula."
+msgid "Add Hula support to Evolution."
+msgstr "Ð?обавлÑ?еÑ? в Evolution поддеÑ?жкÑ? Hula."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Ð?аÑ?Ñ?Ñ?ойка Ñ?Ñ?Ñ?Ñ?ной запиÑ?и Hula"
+msgid "Hula Support"
+msgstr "Ð?оддеÑ?жка Hula"
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:332
 msgid "Custom Headers"
 msgstr "Ð?Ñ?обÑ?е заголовки"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:345
 msgid "IMAP Headers"
 msgstr "Ð?аголовки IMAP"
 
@@ -18452,10 +17282,6 @@ msgid "Basic and _Mailing List Headers (Default)"
 msgstr "Ð?Ñ?новнÑ?е заголовки и заголовки Ñ?пиÑ?ков _Ñ?аÑ?Ñ?Ñ?лки (по Ñ?молÑ?аниÑ?)"
 
 #: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "РазбиÑ?аÑ?Ñ? _вÑ?е заголовки"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -18465,7 +17291,7 @@ msgstr ""
 "дополнение к пеÑ?еÑ?иÑ?леннÑ?м вÑ?Ñ?е Ñ?Ñ?андаÑ?Ñ?нÑ?м заголовкам.\n"
 "ЭÑ?оÑ? пÑ?нкÑ? игноÑ?иÑ?Ñ?еÑ?Ñ?Ñ?, еÑ?ли вÑ?бÑ?ан паÑ?амеÑ?Ñ? «Ð?Ñ?е заголовки»."
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.glade.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -18474,7 +17300,7 @@ msgstr ""
 "Чем болÑ?Ñ?е бÑ?деÑ? вÑ?бÑ?ано заголовков, Ñ?ем болÑ?Ñ?е вÑ?емени поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? длÑ? иÑ? "
 "загÑ?Ñ?зки."
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.glade.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -18482,53 +17308,24 @@ msgstr ""
 "_Ð?Ñ?новнÑ?е заголовки (Ñ?амÑ?й бÑ?Ñ?Ñ?Ñ?Ñ?й) \n"
 "Ð?Ñ?полÑ?зÑ?йÑ?е, еÑ?ли Ñ? ваÑ? неÑ? Ñ?илÑ?Ñ?Ñ?ов на оÑ?нове Ñ?пиÑ?ков Ñ?аÑ?Ñ?Ñ?лки"
 
+#: ../plugins/imap-features/imap-headers.glade.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "РазбиÑ?аÑ?Ñ? _вÑ?е заголовки"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "Ð?одÑ?лÑ? длÑ? поддеÑ?жки возможноÑ?Ñ?ей Ñ?Ñ?Ñ?Ñ?нÑ?Ñ? запиÑ?ей IMAP."
+msgid "Fine-tune your IMAP accounts."
+msgstr ""
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "Ð?озможноÑ?Ñ?и IMAP"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "_Ð?мпоÑ?Ñ?иÑ?оваÑ?Ñ? в календаÑ?Ñ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "_Ð?мпоÑ?Ñ?иÑ?оваÑ?Ñ? в задаÑ?и"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "Ð?мпоÑ?Ñ? ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?пиÑ?ок задаÑ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "Ð?Ñ?беÑ?иÑ?е календаÑ?Ñ?"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "_Ð?мпоÑ?Ñ?"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "Ð?мпоÑ?Ñ?иÑ?оваÑ?Ñ? в календаÑ?Ñ?"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "Ð?мпоÑ?Ñ? ICS вложений в календаÑ?Ñ?"
-
 #: ../plugins/ipod-sync/evolution-ipod-sync.c:49
 msgid "Hardware Abstraction Layer not loaded"
 msgstr "СеÑ?виÑ? абÑ?Ñ?Ñ?акÑ?ии обоÑ?Ñ?дованиÑ? HAL не запÑ?Ñ?ен"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:52
 msgid ""
 "The \"hald\" service is required but not currently running. Please enable "
 "the service and rerun this program, or contact your system administrator."
@@ -18536,7 +17333,7 @@ msgstr ""
 "Ð?еобÑ?одимÑ?й Ñ?еÑ?виÑ? «hald» не запÑ?Ñ?ен. Ð?клÑ?Ñ?иÑ?е Ñ?еÑ?виÑ? и пеÑ?езапÑ?Ñ?Ñ?иÑ?е "
 "пÑ?огÑ?аммÑ? или Ñ?вÑ?жиÑ?еÑ?Ñ? Ñ? админиÑ?Ñ?Ñ?аÑ?оÑ?ом."
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:81
 msgid "Search for an iPod failed"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и iPod"
 
@@ -18554,143 +17351,143 @@ msgid "iCalendar format (.ics)"
 msgstr "ФоÑ?маÑ? iCalendar (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr ""
-"СинÑ?Ñ?онизиÑ?Ñ?еÑ? вÑ?деленнÑ?Ñ? задаÑ?Ñ?/замеÑ?кÑ?/календаÑ?Ñ?/адÑ?еÑ?нÑ?Ñ? книгÑ? Ñ? Apple "
-"iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
 msgstr "СинÑ?Ñ?онизиÑ?Ñ?еÑ? Ñ? iPod"
 
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize your data with your Apple iPod."
+msgstr "СинÑ?Ñ?онизиÑ?Ñ?еÑ? даннÑ?е Ñ? ваÑ?им Apple iPod."
+
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
 msgid "iPod Synchronization"
 msgstr "СинÑ?Ñ?онизаÑ?иÑ? Ñ? iPod"
 
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:482
+#: ../plugins/itip-formatter/itip-formatter.c:607
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? календаÑ?Ñ? «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:627
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?а в календаÑ?е «%s» конÑ?ликÑ?Ñ?еÑ? Ñ? Ñ?Ñ?им Ñ?обÑ?анием"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:663
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Ð?Ñ?Ñ?Ñ?еÑ?а найдена в календаÑ?е «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:753
 msgid "Unable to find any calendars"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и ни одного календаÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:760
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?Ñ? вÑ?Ñ?Ñ?еÑ?Ñ? ни в одном календаÑ?е"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Unable to find this task in any task list"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?Ñ? задаÑ?Ñ? ни в одном Ñ?пиÑ?ке задаÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:768
 msgid "Unable to find this memo in any memo list"
 msgstr "Ð?е Ñ?далоÑ?Ñ? найÑ?и Ñ?Ñ?Ñ? замеÑ?кÑ? ни в одном Ñ?пиÑ?ке замеÑ?ок"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:839
+msgid "Opening the calendar. Please wait.."
+msgstr "Ð?Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? календаÑ?Ñ?. Ð?одождиÑ?е, пожалÑ?йÑ?Ñ?а..."
+
+#: ../plugins/itip-formatter/itip-formatter.c:842
 msgid "Searching for an existing version of this appointment"
 msgstr "Ð?оиÑ?к Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ей веÑ?Ñ?ии Ñ?Ñ?ой вÑ?Ñ?Ñ?еÑ?и"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1024
 msgid "Unable to parse item"
 msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? Ñ?леменÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1111
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? Ñ?леменÑ? в календаÑ?Ñ? «%s».  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1123
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Ð?Ñ?пÑ?авлен в календаÑ?Ñ? «%s» как пÑ?инÑ?Ñ?Ñ?й"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1127
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Ð?Ñ?пÑ?авлен в календаÑ?Ñ? «%s» как пÑ?обнÑ?й"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Ð?Ñ?пÑ?авлен в календаÑ?Ñ? «%s» как оÑ?клоненнÑ?й"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1137
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Ð?Ñ?пÑ?авлен в календаÑ?Ñ? «%s» как оÑ?мененнÑ?й"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1231
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Ð?Ñ?ганизаÑ?оÑ? Ñ?далил пÑ?едÑ?Ñ?авиÑ?елÑ? %s "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1238
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Ð?Ñ?едÑ?Ñ?авиÑ?елÑ? оÑ?пÑ?авлено Ñ?ообÑ?ение об оÑ?мене"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1240
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ð?евозможно оÑ?пÑ?авиÑ?Ñ? Ñ?ведомление об оÑ?мене пÑ?едÑ?Ñ?авиÑ?елÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1348
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника не можеÑ? бÑ?Ñ?Ñ? обновлÑ?н из-за невеÑ?ного Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?Ñ?а"
+msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника не можеÑ? бÑ?Ñ?Ñ? обновлÑ?н из-за невеÑ?ного Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?Ñ?а"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1377
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ð?е Ñ?далоÑ?Ñ? обновиÑ?Ñ? Ñ?Ñ?аÑ?Ñ?ника. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1381
 msgid "Attendee status updated"
 msgstr "СÑ?аÑ?Ñ?Ñ? Ñ?Ñ?аÑ?Ñ?ника обновлÑ?н"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1407
 msgid "Meeting information sent"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о Ñ?обÑ?ании поÑ?лана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1410
 msgid "Task information sent"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о задаÑ?е поÑ?лана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1413
 msgid "Memo information sent"
 msgstr "Ð?нÑ?оÑ?маÑ?иÑ? о замеÑ?ке поÑ?лана"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1422
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ð?е Ñ?далоÑ?Ñ? поÑ?лаÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о вÑ?Ñ?Ñ?еÑ?е, вÑ?Ñ?Ñ?еÑ?а не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1425
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ð?е Ñ?далоÑ?Ñ? поÑ?лаÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о задаÑ?е, задаÑ?а не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1428
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ð?е Ñ?далоÑ?Ñ? поÑ?лаÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о замеÑ?ке, замеÑ?ка не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1507
 msgid "The calendar attached is not valid"
 msgstr "Ð?ложеннÑ?й календаÑ?Ñ? недейÑ?Ñ?виÑ?елен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1508
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18698,15 +17495,15 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение пÑ?еÑ?ендÑ?еÑ?, Ñ?Ñ?о Ñ?одеÑ?жиÑ? календаÑ?Ñ?, но календаÑ?Ñ? не Ñ?влÑ?еÑ?Ñ?Ñ? "
 "дейÑ?Ñ?виÑ?елÑ?нÑ?м iCalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1548
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1668
 msgid "The item in the calendar is not valid"
 msgstr "ЭлеменÑ? в календаÑ?е недейÑ?Ñ?виÑ?елен"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1549
+#: ../plugins/itip-formatter/itip-formatter.c:1577
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18714,11 +17511,11 @@ msgstr ""
 "ЭÑ?о Ñ?ообÑ?ение Ñ?одеÑ?жиÑ? календаÑ?Ñ?, но календаÑ?Ñ? не Ñ?одеÑ?жиÑ? Ñ?обÑ?Ñ?ий, задаÑ? "
 "или Ñ?ведений о занÑ?Ñ?оÑ?Ñ?и."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1588
 msgid "The calendar attached contains multiple items"
 msgstr "Ð?ложеннÑ?й календаÑ?Ñ? Ñ?одеÑ?жиÑ? неÑ?колÑ?ко Ñ?леменÑ?ов"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1589
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18726,40 +17523,34 @@ msgstr ""
 "ЧÑ?обÑ? обÑ?абоÑ?аÑ?Ñ? вÑ?е Ñ?Ñ?и Ñ?леменÑ?Ñ?, Ñ?айл должен бÑ?Ñ?Ñ? Ñ?оÑ?Ñ?анен и календаÑ?Ñ? "
 "должен бÑ?Ñ?Ñ? импоÑ?Ñ?иÑ?ован"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2335
 msgid "This meeting recurs"
 msgstr "ЭÑ?а вÑ?Ñ?Ñ?еÑ?а повÑ?оÑ?Ñ?еÑ?Ñ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2338
 msgid "This task recurs"
 msgstr "ЭÑ?а задаÑ?а повÑ?оÑ?Ñ?еÑ?Ñ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2341
 msgid "This memo recurs"
 msgstr "ЭÑ?а замеÑ?ка повÑ?оÑ?Ñ?еÑ?Ñ?Ñ?"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2574
 msgid "_Delete message after acting"
 msgstr "_УдалиÑ?Ñ? Ñ?ообÑ?ение поÑ?ле дейÑ?Ñ?виÑ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2584
+#: ../plugins/itip-formatter/itip-formatter.c:2617
 msgid "Conflict Search"
 msgstr "Ð?оиÑ?к конÑ?ликÑ?ов"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2599
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Ð?Ñ?беÑ?иÑ?е календаÑ?и длÑ? поиÑ?ка конÑ?ликÑ?Ñ?Ñ?Ñ?иÑ? Ñ?обÑ?аний"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "СегоднÑ?"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
@@ -18778,11 +17569,6 @@ msgstr "СегоднÑ? в %H:%M:%S"
 msgid "Today %l:%M:%S %p"
 msgstr "СегоднÑ? в %l:%M:%S %p"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "Ð?авÑ?Ñ?а"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
@@ -18951,13 +17737,11 @@ msgstr "<b>%s</b> желаеÑ? добавиÑ?Ñ? к Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?емÑ? Ñ?
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
-msgstr ""
-"<b>%s</b> Ñ?еÑ?ез %s желаеÑ? полÑ?Ñ?иÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?ледÑ?Ñ?Ñ?ем Ñ?обÑ?ании:"
+msgstr "<b>%s</b> Ñ?еÑ?ез %s желаеÑ? полÑ?Ñ?иÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?ледÑ?Ñ?Ñ?ем Ñ?обÑ?ании:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
 #, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> желаеÑ? полÑ?Ñ?иÑ?Ñ? поÑ?леднÑ?Ñ? инÑ?оÑ?маÑ?иÑ? о Ñ?ледÑ?Ñ?Ñ?ем Ñ?обÑ?ании:"
 
 #: ../plugins/itip-formatter/itip-view.c:388
@@ -19055,8 +17839,7 @@ msgstr ""
 
 #: ../plugins/itip-formatter/itip-view.c:476
 #, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> Ñ?еÑ?ез %s веÑ?нÑ?л Ñ?ледÑ?Ñ?Ñ?ий оÑ?веÑ? на назнаÑ?еннÑ?Ñ? задаÑ?Ñ?:"
 
 #: ../plugins/itip-formatter/itip-view.c:478
@@ -19076,8 +17859,7 @@ msgstr "<b>%s</b> оÑ?менил Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? назнаÑ?еннÑ?Ñ? за
 
 #: ../plugins/itip-formatter/itip-view.c:488
 #, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> Ñ?еÑ?ез %s пÑ?едложил Ñ?ледÑ?Ñ?Ñ?ие изменениÑ? назнаÑ?ениÑ? задаÑ?и:"
 
 #: ../plugins/itip-formatter/itip-view.c:490
@@ -19126,110 +17908,107 @@ msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> оÑ?менил Ñ?ледÑ?Ñ?Ñ?Ñ?Ñ? обÑ?Ñ?Ñ? замеÑ?кÑ?:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:823
 msgid "_Open Calendar"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
-msgid "_Decline"
-msgstr "_Ð?Ñ?клониÑ?Ñ?"
-
-#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:829
 #: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:839
 #: ../plugins/itip-formatter/itip-view.c:856
 #: ../plugins/itip-formatter/itip-view.c:861
+msgid "_Decline"
+msgstr "_Ð?Ñ?клониÑ?Ñ?"
+
+#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:863
 msgid "_Accept"
 msgstr "_Ð?Ñ?инÑ?Ñ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Decline all"
 msgstr "_Ð?Ñ?клониÑ?Ñ? вÑ?е"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:834
 msgid "_Tentative all"
 msgstr "_Ð?еопÑ?еделÑ?ннÑ?е вÑ?е"
 
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:857
+#: ../plugins/itip-formatter/itip-view.c:862
 msgid "_Tentative"
 msgstr "_Ð?еопÑ?еделÑ?ное"
 
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:835
 msgid "_Accept all"
 msgstr "_Ð?Ñ?инÑ?Ñ?Ñ? вÑ?е"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:846
 msgid "_Send Information"
 msgstr "_Ð?Ñ?пÑ?авиÑ?Ñ? Ñ?ведениÑ?"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:850
 msgid "_Update Attendee Status"
 msgstr "_Ð?бновиÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние Ñ?Ñ?аÑ?Ñ?ника"
 
-#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Update"
 msgstr "_Ð?бновиÑ?Ñ?"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1033
 msgid "Start time:"
 msgstr "Ð?Ñ?емÑ? наÑ?ала:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:1042
+#: ../plugins/itip-formatter/itip-view.c:1044
 msgid "End time:"
 msgstr "Ð?Ñ?емÑ? завеÑ?Ñ?ениÑ?:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1062
-#: ../plugins/itip-formatter/itip-view.c:1116
+#: ../plugins/itip-formatter/itip-view.c:1064
+#: ../plugins/itip-formatter/itip-view.c:1118
 msgid "Comment:"
 msgstr "Ð?омменÑ?аÑ?ий:"
 
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1103
 msgid "Send _reply to sender"
 msgstr "Ð?Ñ?веÑ?иÑ?Ñ? оÑ?п_Ñ?авиÑ?елÑ?"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
+#: ../plugins/itip-formatter/itip-view.c:1133
 msgid "Send _updates to attendees"
 msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? о_бновлениÑ? к Ñ?Ñ?аÑ?Ñ?никам"
 
-#: ../plugins/itip-formatter/itip-view.c:1140
+#: ../plugins/itip-formatter/itip-view.c:1142
 msgid "_Apply to all instances"
 msgstr "Ð?_Ñ?имениÑ?Ñ? ко вÑ?ем запиÑ?Ñ?м"
 
-#: ../plugins/itip-formatter/itip-view.c:1149
+#: ../plugins/itip-formatter/itip-view.c:1151
 msgid "Show time as _free"
 msgstr "Ð?оказаÑ?Ñ? вÑ?емÑ? как _Ñ?вободное"
 
-#: ../plugins/itip-formatter/itip-view.c:1152
+#: ../plugins/itip-formatter/itip-view.c:1154
 msgid "_Preserve my reminder"
 msgstr "_СоÑ?Ñ?анÑ?Ñ?Ñ? Ñ?игналÑ?"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1158
+#: ../plugins/itip-formatter/itip-view.c:1160
 msgid "_Inherit reminder"
 msgstr "Ð?аÑ?_ледоваÑ?Ñ? напоминание"
 
-#: ../plugins/itip-formatter/itip-view.c:1912
-msgid "_Tasks :"
-msgstr "_Ð?адаÑ?и :"
-
 #: ../plugins/itip-formatter/itip-view.c:1914
-msgid "Memos :"
-msgstr "Ð?амеÑ?ки :"
+msgid "_Memos:"
+msgstr "_Ð?амеÑ?ки:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
+#, fuzzy
+msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Ð?Ñ?обÑ?ажаеÑ? Ñ?аÑ?Ñ?и text/calendar в Ñ?ообÑ?ениÑ?Ñ?."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
@@ -19247,8 +18026,7 @@ msgid "This meeting has been delegated"
 msgstr "ЭÑ?о Ñ?обÑ?ание бÑ?ло поÑ?Ñ?Ñ?ено"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr ""
 "ЭÑ?оÑ? оÑ?веÑ? пÑ?иÑ?ел не оÑ? Ñ?екÑ?Ñ?его Ñ?Ñ?аÑ?Ñ?ника. Ð?обавиÑ?Ñ? оÑ?пÑ?авиÑ?елÑ? как "
 "Ñ?Ñ?аÑ?Ñ?ника?"
@@ -19258,13 +18036,13 @@ msgid "Proxy _Logout"
 msgstr "_Ð?Ñ?клÑ?Ñ?ение оÑ? пÑ?окÑ?и"
 
 #: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "Ð?озволÑ?еÑ? запÑ?еÑ?аÑ?Ñ? Ñ?Ñ?Ñ?Ñ?нÑ?е запиÑ?и."
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
 msgid "Disable Account"
 msgstr "Ð?апÑ?еÑ? Ñ?Ñ?Ñ?Ñ?ной запиÑ?и"
 
+#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
+msgid "Disable an account by right-clicking on it in the folder tree."
+msgstr ""
+
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "Ð?одаваÑ?Ñ? звÑ?ковой Ñ?игнал или воÑ?пÑ?оизводиÑ?Ñ? звÑ?ковой Ñ?айл"
@@ -19307,8 +18085,7 @@ msgstr "Ð?Ñ?плÑ?ваÑ?Ñ?ие Ñ?ообÑ?ениÑ? вмеÑ?Ñ?е Ñ?о знаÑ?ко
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr ""
-"Ð?звеÑ?аеÑ? полÑ?зоваÑ?елÑ? о поÑ?влении новой поÑ?Ñ?Ñ? знаÑ?ком в облаÑ?Ñ?и Ñ?ведомлений."
+msgstr "Ð?звеÑ?аеÑ? полÑ?зоваÑ?елÑ? о поÑ?влении новой поÑ?Ñ?Ñ? знаÑ?ком в облаÑ?Ñ?и Ñ?ведомлений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Sound file name to be played."
@@ -19328,8 +18105,7 @@ msgstr ""
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Whether show message over the icon when new messages arrive."
-msgstr ""
-"Ð?адо ли показÑ?ваÑ?Ñ? Ñ?ообÑ?ение над знаÑ?ком пÑ?и поÑ?Ñ?Ñ?плении новÑ?Ñ? Ñ?ообÑ?ений."
+msgstr "Ð?адо ли показÑ?ваÑ?Ñ? Ñ?ообÑ?ение над знаÑ?ком пÑ?и поÑ?Ñ?Ñ?плении новÑ?Ñ? Ñ?ообÑ?ений."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether the icon should blink or not."
@@ -19339,20 +18115,20 @@ msgstr "Ð?олжен ли знаÑ?Ñ?к мигаÑ?Ñ? или неÑ?."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Ð?адо ли оповеÑ?аÑ?Ñ? о новÑ?Ñ? Ñ?ообÑ?ениÑ?Ñ? Ñ?олÑ?ко в папке Ð?Ñ?одÑ?Ñ?ие."
 
-#: ../plugins/mail-notification/mail-notification.c:260
+#: ../plugins/mail-notification/mail-notification.c:245
 msgid "Generate a _D-Bus message"
 msgstr "Ð?енеÑ?иÑ?оваÑ?Ñ? Ñ?ообÑ?ение D-Bus"
 
-#: ../plugins/mail-notification/mail-notification.c:383
+#: ../plugins/mail-notification/mail-notification.c:368
 msgid "Evolution's Mail Notification"
 msgstr "Уведомление о новой поÑ?Ñ?е Evolution"
 
-#: ../plugins/mail-notification/mail-notification.c:404
+#: ../plugins/mail-notification/mail-notification.c:389
 msgid "Mail Notification Properties"
 msgstr "СвойÑ?Ñ?ва Ñ?ведомлениÑ? о новой поÑ?Ñ?е"
 
 #. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:483
+#: ../plugins/mail-notification/mail-notification.c:498
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -19370,7 +18146,7 @@ msgstr[2] ""
 "Ð?Ñ? полÑ?Ñ?или %d новÑ?Ñ? Ñ?ообÑ?ений\n"
 "в %s."
 
-#: ../plugins/mail-notification/mail-notification.c:488
+#: ../plugins/mail-notification/mail-notification.c:503
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19378,85 +18154,158 @@ msgstr[0] "Ð?Ñ? полÑ?Ñ?или %d новое Ñ?ообÑ?ение."
 msgstr[1] "Ð?Ñ? полÑ?Ñ?или %d новÑ?Ñ? Ñ?ообÑ?ениÑ?."
 msgstr[2] "Ð?Ñ? полÑ?Ñ?или %d новÑ?Ñ? Ñ?ообÑ?ений."
 
-#: ../plugins/mail-notification/mail-notification.c:505
-#: ../plugins/mail-notification/mail-notification.c:510
+#: ../plugins/mail-notification/mail-notification.c:520
+#: ../plugins/mail-notification/mail-notification.c:525
 msgid "New email"
 msgstr "Ð?овое пиÑ?Ñ?мо"
 
-#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:588
 msgid "Show icon in _notification area"
 msgstr "Ð?ока_зÑ?ваÑ?Ñ? знаÑ?ок в облаÑ?Ñ?и Ñ?ведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:573
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "B_link icon in notification area"
 msgstr "Ð?еÑ?_Ñ?аÑ?Ñ? знаÑ?ком в облаÑ?Ñ?и Ñ?ведомлений"
 
-#: ../plugins/mail-notification/mail-notification.c:575
+#: ../plugins/mail-notification/mail-notification.c:593
 msgid "Popup _message together with the icon"
 msgstr "Ð?оказ_Ñ?ваÑ?Ñ? вÑ?плÑ?ваÑ?Ñ?ее Ñ?ообÑ?ение вмеÑ?Ñ?е Ñ?о знаÑ?ком"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:774
 msgid "_Play sound when new messages arrive"
 msgstr "_Ð?оÑ?пÑ?оизводиÑ?Ñ? звÑ?к пÑ?и пÑ?иÑ?оде новой поÑ?Ñ?Ñ?"
 
-#: ../plugins/mail-notification/mail-notification.c:762
+#: ../plugins/mail-notification/mail-notification.c:780
 msgid "_Beep"
 msgstr "Ð?о_даваÑ?Ñ? гÑ?док"
 
-#: ../plugins/mail-notification/mail-notification.c:763
+#: ../plugins/mail-notification/mail-notification.c:781
 msgid "Play _sound file"
 msgstr "Ð?Ñ?о_игÑ?Ñ?ваÑ?Ñ? звÑ?ковой Ñ?айл"
 
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Specify _filename:"
 msgstr "Ð?мÑ? _Ñ?айла:"
 
-#: ../plugins/mail-notification/mail-notification.c:775
+#: ../plugins/mail-notification/mail-notification.c:793
 msgid "Select sound file"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? звÑ?ковой Ñ?айл"
 
-#: ../plugins/mail-notification/mail-notification.c:776
+#: ../plugins/mail-notification/mail-notification.c:794
 msgid "Pl_ay"
 msgstr "Ð?оÑ?_пÑ?оизвеÑ?Ñ?и"
 
-#: ../plugins/mail-notification/mail-notification.c:833
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Notify new messages for _Inbox only"
 msgstr "Ð?пове_Ñ?аÑ?Ñ? о новÑ?Ñ? Ñ?ообÑ?ениÑ?Ñ? Ñ?олÑ?ко во «Ð?Ñ?одÑ?Ñ?иÑ?»"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Уведомление о новой поÑ?Ñ?е"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "УведомлÑ?еÑ? о полÑ?Ñ?ении новÑ?Ñ? поÑ?Ñ?овÑ?Ñ? Ñ?ообÑ?ений."
+
+#: ../plugins/mail-to-task/mail-to-task.c:376
+#, c-format
 msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
 msgstr ""
-"СоздаÑ?Ñ? Ñ?ообÑ?ение D-Bus или извеÑ?аеÑ? полÑ?зоваÑ?елÑ? знаÑ?ком и Ñ?ообÑ?ением в "
-"облаÑ?Ñ?и Ñ?ведомлений пÑ?и поÑ?Ñ?Ñ?плении нового Ñ?ообÑ?ениÑ?."
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid "Mail Notification"
-msgstr "Уведомление о новой поÑ?Ñ?е"
+#: ../plugins/mail-to-task/mail-to-task.c:379
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:382
+#, c-format
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
 msgstr ""
-"Ð?одÑ?лÑ?, коÑ?оÑ?Ñ?й позволÑ?еÑ? Ñ?оздаваÑ?Ñ? Ñ?обÑ?аниÑ? из Ñ?одеÑ?жимого поÑ?Ñ?ового "
-"Ñ?ообÑ?ениÑ?."
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ? в Ñ?обÑ?ание"
+#: ../plugins/mail-to-task/mail-to-task.c:399
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "СообÑ?ение в Ñ?обÑ?ание"
+#: ../plugins/mail-to-task/mail-to-task.c:402
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:405
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:423
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:429
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:435
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:494
+msgid "[No Summary]"
+msgstr "[Ð?еÑ? Ñ?водки]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:505
+msgid "Invalid object returned from a server"
+msgstr "Ð?евеÑ?нÑ?й обÑ?екÑ? полÑ?Ñ?ен оÑ? Ñ?еÑ?веÑ?а"
+
+#: ../plugins/mail-to-task/mail-to-task.c:570
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "Ð?Ñ?и обÑ?абоÑ?ке пÑ?оизоÑ?ла оÑ?ибка: %s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:599
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? календаÑ?Ñ?. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:606
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Ð?Ñ?бÑ?аннÑ?й иÑ?Ñ?оÑ?ник доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?, поÑ?Ñ?омÑ? вÑ? не можеÑ?е "
+"Ñ?оздаваÑ?Ñ? в нÑ?м Ñ?обÑ?Ñ?иÑ?. Ð?Ñ?беÑ?иÑ?е, пожалÑ?йÑ?Ñ?а, дÑ?Ñ?гой иÑ?Ñ?оÑ?ник."
+
+#: ../plugins/mail-to-task/mail-to-task.c:609
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19464,25 +18313,62 @@ msgstr ""
 "Ð?Ñ?бÑ?аннÑ?й иÑ?Ñ?оÑ?ник доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?, поÑ?Ñ?омÑ? вÑ? не можеÑ?е "
 "Ñ?оздаваÑ?Ñ? в нÑ?м задаÑ?и. Ð?Ñ?беÑ?иÑ?е, пожалÑ?йÑ?Ñ?а, дÑ?Ñ?гой иÑ?Ñ?оÑ?ник."
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:612
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
 msgstr ""
-"Ð?одÑ?лÑ?, коÑ?оÑ?Ñ?й позволÑ?еÑ? Ñ?оздание задаÑ? из Ñ?одеÑ?жимого поÑ?Ñ?ового Ñ?ообÑ?ениÑ?."
+"Ð?Ñ?бÑ?аннÑ?й иÑ?Ñ?оÑ?ник доÑ?Ñ?Ñ?пен Ñ?олÑ?ко длÑ? Ñ?Ñ?ениÑ?, поÑ?Ñ?омÑ? вÑ? не можеÑ?е "
+"Ñ?оздаваÑ?Ñ? в нÑ?м замеÑ?ки. Ð?Ñ?беÑ?иÑ?е, пожалÑ?йÑ?Ñ?а, дÑ?Ñ?гой иÑ?Ñ?оÑ?ник."
+
+#: ../plugins/mail-to-task/mail-to-task.c:821
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "Ð?е Ñ?далоÑ?Ñ? полÑ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок иÑ?Ñ?оÑ?ников. %s"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ? вÑ?деленное Ñ?ообÑ?ение в задаÑ?Ñ?."
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "Ð?Ñ?ео_бÑ?азоваÑ?Ñ? в задаÑ?Ñ?"
+msgid "Create a Mem_o"
+msgstr "СоздаÑ?Ñ? за_меÑ?кÑ?"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "СообÑ?ение в задаÑ?Ñ?"
-
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "Ð?Ñ?еобÑ?азоваÑ?Ñ? вÑ?деленное Ñ?ообÑ?ение в новÑ?Ñ? задаÑ?Ñ?"
+msgid "Create a _Meeting"
+msgstr "СоздаÑ?Ñ? _Ñ?обÑ?ание"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:4
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:3
+msgid "Create a _Task"
+msgstr "СоздаÑ?Ñ? _задаÑ?Ñ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:5
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:8
+msgid "Create an _Event"
+msgstr " _Ñ?обÑ?Ñ?ие"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:6
+msgid "Mail-to-Task"
+msgstr "СообÑ?ение-в-задаÑ?Ñ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:4
+msgid "Create a new event from the selected message"
+msgstr "СоздаÑ?Ñ? новое Ñ?обÑ?Ñ?ие из вÑ?деленного Ñ?ообÑ?ениÑ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:5
+msgid "Create a new meeting from the selected message"
+msgstr "СоздаÑ?Ñ? новое Ñ?обÑ?ание из вÑ?деленного Ñ?ообÑ?ениÑ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:6
+msgid "Create a new memo from the selected message"
+msgstr "СоздаÑ?Ñ? новÑ?Ñ? замеÑ?кÑ? из вÑ?деленного Ñ?ообÑ?ениÑ?"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:7
+msgid "Create a new task from the selected message"
+msgstr "СоздаÑ?Ñ? новÑ?Ñ? задаÑ?Ñ? из вÑ?деленного Ñ?ообÑ?ениÑ?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
@@ -19506,11 +18392,10 @@ msgid "Mailing _List"
 msgstr "СпиÑ?ок _Ñ?аÑ?Ñ?Ñ?лки"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
 msgstr ""
 "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? дейÑ?Ñ?виÑ? длÑ? оÑ?новнÑ?Ñ? команд Ñ?пиÑ?ков Ñ?аÑ?Ñ?Ñ?лки (подпиÑ?ка, "
-"оÑ?пиÑ?ка, ...)."
+"оÑ?пиÑ?ка и Ñ?.д)."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
@@ -19592,8 +18477,7 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr ""
-"Ð?аголовок Ñ?ообÑ?ениÑ? не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии, необÑ?одимой длÑ? Ñ?Ñ?ого дейÑ?Ñ?виÑ?."
+msgstr "Ð?аголовок Ñ?ообÑ?ениÑ? не Ñ?одеÑ?жиÑ? инÑ?оÑ?маÑ?ии, необÑ?одимой длÑ? Ñ?Ñ?ого дейÑ?Ñ?виÑ?."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
@@ -19609,8 +18493,7 @@ msgstr "СвÑ?заÑ?Ñ?Ñ?Ñ? Ñ? _владелÑ?Ñ?ем Ñ?пиÑ?ка"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"СвÑ?заÑ?Ñ?Ñ?Ñ? Ñ? владелÑ?Ñ?ем Ñ?пиÑ?ка Ñ?аÑ?Ñ?Ñ?лки, коÑ?оÑ?омÑ? пÑ?инадлежиÑ? Ñ?Ñ?о Ñ?ообÑ?ение"
+msgstr "СвÑ?заÑ?Ñ?Ñ?Ñ? Ñ? владелÑ?Ñ?ем Ñ?пиÑ?ка Ñ?аÑ?Ñ?Ñ?лки, коÑ?оÑ?омÑ? пÑ?инадлежиÑ? Ñ?Ñ?о Ñ?ообÑ?ение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
@@ -19632,8 +18515,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-"Ð?пÑ?бликоваÑ?Ñ? Ñ?ообÑ?ение в Ñ?пиÑ?ке Ñ?аÑ?Ñ?Ñ?лки, коÑ?оÑ?омÑ? пÑ?инадлежиÑ? Ñ?Ñ?о Ñ?ообÑ?ение"
+msgstr "Ð?пÑ?бликоваÑ?Ñ? Ñ?ообÑ?ение в Ñ?пиÑ?ке Ñ?аÑ?Ñ?Ñ?лки, коÑ?оÑ?омÑ? пÑ?инадлежиÑ? Ñ?Ñ?о Ñ?ообÑ?ение"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
@@ -19667,13 +18549,13 @@ msgstr ""
 "Ð?омеÑ?иÑ?Ñ? Ñ?ообÑ?ениÑ? пÑ?оÑ?иÑ?аннÑ?ми Ñ?олÑ?ко в Ñ?екÑ?Ñ?ей папкаÑ? или в папке и во "
 "вÑ?еÑ? подпапкаÑ??"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "в Ñ?екÑ?Ñ?ей папке и во вл_оженнÑ?Ñ? папкаÑ?"
+#: ../plugins/mark-all-read/mark-all-read.c:166
+msgid "In Current Folder and _Subfolders"
+msgstr "Ð? Ñ?екÑ?Ñ?ей папке и во вл_оженнÑ?Ñ? папкаÑ?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "Ñ?олÑ?ко в Ñ?_екÑ?Ñ?ей папке"
+#: ../plugins/mark-all-read/mark-all-read.c:180
+msgid "In Current _Folder Only"
+msgstr "ТолÑ?ко в Ñ?_екÑ?Ñ?ей папке"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
@@ -19684,20 +18566,20 @@ msgid "Mark Me_ssages as Read"
 msgstr "Ð?омеÑ?иÑ?Ñ? Ñ?ообÑ?_ениÑ? как пÑ?оÑ?иÑ?аннÑ?е"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "Ð?Ñ?полÑ?зÑ?еÑ?Ñ?Ñ?, Ñ?Ñ?обÑ? помеÑ?иÑ?Ñ? вÑ?е Ñ?ообÑ?ениÑ? в папке как пÑ?оÑ?иÑ?аннÑ?е"
+msgid "Mark all messages in a folder as read."
+msgstr "Ð?омеÑ?иÑ?Ñ? вÑ?е Ñ?ообÑ?ениÑ? в папке как пÑ?оÑ?иÑ?аннÑ?е."
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "Ð?одÑ?лÑ?, коÑ?оÑ?Ñ?й Ñ?еализÑ?еÑ? поддеÑ?жкÑ? модÑ?лей Mono."
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
 msgid "Mono Loader"
 msgstr "Ð?агÑ?Ñ?зÑ?ик Mono"
 
+#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
+msgid "Support plugins written in Mono."
+msgstr "Ð?оддеÑ?жка модÑ?лей, напиÑ?аннÑ?Ñ? Ñ? иÑ?полÑ?зованием Mono."
+
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "Ð?одÑ?лÑ? длÑ? Ñ?пÑ?авлениÑ? дÑ?Ñ?гими модÑ?лÑ?ми"
+msgid "Manage your Evolution plugins."
+msgstr "УпÑ?авление модÑ?лÑ?ми Evolution"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
@@ -19734,27 +18616,19 @@ msgstr "Ð?бзоÑ?"
 msgid "Plugin"
 msgstr "Ð?одÑ?лÑ?"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"ТеÑ?Ñ?овÑ?й модÑ?лÑ?, коÑ?оÑ?Ñ?й демонÑ?Ñ?Ñ?иÑ?Ñ?еÑ? модÑ?лÑ? Ñ?оÑ?маÑ?Ñ?еÑ?а, позволÑ?Ñ?Ñ?ий "
-"запÑ?еÑ?иÑ?Ñ? HTML-Ñ?ообÑ?ениÑ?.\n"
-"\n"
-"ЭÑ?оÑ? модÑ?лÑ? - неподдеÑ?живаемÑ?й демонÑ?Ñ?Ñ?аÑ?ионнÑ?й код.\n"
-
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "Режим обÑ?Ñ?ного Ñ?екÑ?Ñ?а"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "Ð?Ñ?едпоÑ?иÑ?аÑ?Ñ? обÑ?Ñ?нÑ?й Ñ?екÑ?Ñ?"
 
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "Ð?Ñ?оÑ?маÑ?Ñ?иваÑ?Ñ? поÑ?Ñ?овÑ?е Ñ?ообÑ?ениÑ? в виде пÑ?оÑ?Ñ?ого Ñ?екÑ?Ñ?а, даже еÑ?ли они Ñ?одеÑ?жаÑ? HTML."
+
 #: ../plugins/prefer-plain/prefer-plain.c:189
 msgid "Show HTML if present"
 msgstr "Ð?оказÑ?ваÑ?Ñ? HTML, еÑ?ли еÑ?Ñ?Ñ?"
@@ -19776,8 +18650,8 @@ msgid "Evolution Profiler"
 msgstr "Ð?Ñ?оÑ?айлеÑ? Evolution"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "Ð?едеÑ? жÑ?Ñ?нал Ñ?обÑ?Ñ?ий пÑ?оÑ?илиÑ?ованиÑ? даннÑ?Ñ?"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19792,44 +18666,75 @@ msgid "Outlook personal folders (.pst)"
 msgstr "Ð?еÑ?Ñ?оналÑ?наÑ? папка Outlook (.pst)"
 
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:315
 msgid "_Address Book"
 msgstr "Ð?_дÑ?еÑ?наÑ? книга"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:325
+#: ../plugins/pst-import/pst-importer.c:322
 msgid "A_ppointments"
 msgstr "Ð?Ñ?_Ñ?Ñ?еÑ?и"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:337
+#: ../plugins/pst-import/pst-importer.c:334
 msgid "_Journal entries"
 msgstr "_Ð?апиÑ?и жÑ?Ñ?нала"
 
-#: ../plugins/pst-import/pst-importer.c:352
+#: ../plugins/pst-import/pst-importer.c:349
 msgid "Importing Outlook data"
 msgstr "Ð?мпоÑ?Ñ? даннÑ?Ñ? Outlook"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "Ð?Ñ?едоÑ?Ñ?авлÑ?еÑ? возможноÑ?Ñ?Ñ? пÑ?бликаÑ?ии календаÑ?ей на Ð?еб"
-
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "Ð?Ñ?бликаÑ?иÑ? календаÑ?ей"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "Ð?дÑ?еÑ?а"
 
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Publish calendars to the web."
+msgstr "Ð?Ñ?бликоваÑ?Ñ? календаÑ?и в СеÑ?и."
+
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "_Ð?Ñ?бликоваÑ?Ñ? Ñ?ведениÑ? календаÑ?Ñ?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:95
+#: ../plugins/publish-calendar/publish-calendar.c:337
+#, c-format
+msgid "Could not open %s:"
+msgstr "Ð?е Ñ?далоÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:97
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? %s: Ð?еизвеÑ?Ñ?наÑ? оÑ?ибка"
+
+#: ../plugins/publish-calendar/publish-calendar.c:117
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr "Ð?Ñ?оизоÑ?ла оÑ?ибка пÑ?и пÑ?бликаÑ?ии на %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:119
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr "Ð?Ñ?бликаÑ?иÑ? на %s завеÑ?Ñ?илаÑ?Ñ? Ñ?Ñ?пеÑ?но"
+
+#: ../plugins/publish-calendar/publish-calendar.c:164
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "Ð?Ñ?ибка подклÑ?Ñ?ениÑ? %s:"
+
+#: ../plugins/publish-calendar/publish-calendar.c:624
 msgid "Are you sure you want to remove this location?"
 msgstr "Ð?Ñ? дейÑ?Ñ?виÑ?елÑ?но Ñ?оÑ?иÑ?е Ñ?далиÑ?Ñ? Ñ?Ñ?оÑ? Ñ?еÑ?Ñ?Ñ?Ñ??"
 
+#: ../plugins/publish-calendar/publish-calendar.c:788
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?оздаÑ?Ñ? Ñ?ообÑ?ение."
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:2
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">Ð?дÑ?еÑ?</span>"
@@ -19886,27 +18791,41 @@ msgstr ""
 msgid "Service _type:"
 msgstr "_Тип Ñ?еÑ?виÑ?а:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+msgid "Time _duration:"
+msgstr "Ð?_Ñ?одолжиÑ?елÑ?ноÑ?Ñ?Ñ?:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
 msgid "_File:"
 msgstr "_Файл:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Password:"
 msgstr "_Ð?аÑ?олÑ?:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Publish as:"
 msgstr "_Ð?Ñ?бликоваÑ?Ñ? как:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
 msgid "_Remember password"
 msgstr "_Ð?апомниÑ?Ñ? паÑ?олÑ?"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid "_Username:"
 msgstr "_Ð?мÑ? полÑ?зоваÑ?елÑ?:"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+msgid ""
+"days\n"
+"weeks\n"
+"months"
+msgstr ""
+"дни\n"
+"недели\n"
+"меÑ?Ñ?Ñ?Ñ?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:32
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -19914,11 +18833,17 @@ msgstr ""
 "iCal\n"
 "Cвободен/занÑ?Ñ?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? опÑ?биковаÑ?Ñ? календаÑ?Ñ?: модÑ?лÑ? календаÑ?Ñ? более не Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:481
 msgid "New Location"
 msgstr "Ð?овÑ?й адÑ?еÑ?"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:483
 msgid "Edit Location"
 msgstr "Ð?Ñ?авка адÑ?еÑ?а"
 
@@ -19946,177 +18871,135 @@ msgstr "Ð?одÑ?лÑ?, коÑ?оÑ?Ñ?й загÑ?Ñ?жаеÑ? дÑ?Ñ?гие модÑ?л
 msgid "Python Loader"
 msgstr "Ð?агÑ?Ñ?зÑ?ик Python"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "SpamAssassin (вÑ?Ñ?Ñ?оеннÑ?й)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "SpamAssassin не найден, код: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Ð?Ñ?ибка Ñ?озданиÑ? канала: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Ð?Ñ?ибка поÑ?ле веÑ?ки: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Ð?оÑ?еÑ?ний пÑ?оÑ?еÑ?Ñ? SpamAssassin не оÑ?веÑ?аеÑ?, завеÑ?Ñ?ение..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Ð?жидание доÑ?еÑ?него пÑ?оÑ?еÑ?Ñ?а SpamAssassin пÑ?еÑ?вано, завеÑ?Ñ?ение..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Ð?Ñ?ибка канала длÑ? SpamAssassin, код оÑ?ибки: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:509
 #, c-format
 msgid "SpamAssassin is not available."
 msgstr "SpamAssassin недоÑ?Ñ?Ñ?пен."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:906
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "ЭÑ?о Ñ?делаеÑ? SpamAssassin более надÑ?жнÑ?м, но и более медленнÑ?м"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:912
 msgid "I_nclude remote tests"
 msgstr "Ð?_клÑ?Ñ?иÑ?Ñ? Ñ?далÑ?ннÑ?е Ñ?еÑ?Ñ?Ñ?"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr ""
-"ФилÑ?Ñ?Ñ?Ñ?еÑ? нежелаÑ?елÑ?нÑ?е Ñ?ообÑ?ениÑ? пÑ?и помоÑ?и SpamAsassin. Ð?лÑ? Ñ?Ñ?ого модÑ?лÑ? "
-"Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ?, Ñ?Ñ?обÑ? SpamAssassin бÑ?л Ñ?Ñ?Ñ?ановлен."
+msgid "Filter junk messages using SpamAssassin."
+msgstr "ФилÑ?Ñ?Ñ?оваÑ?Ñ? нежелаÑ?елÑ?нÑ?е Ñ?ообÑ?ениÑ? пÑ?и помоÑ?и SpamAssassin."
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? SpamAssassin"
+msgid "SpamAssassin Junk Filter"
+msgstr "ФилÑ?Ñ?Ñ? Ñ?пама SpamAssassin"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "ФилÑ?Ñ?Ñ?аÑ?иÑ? Ñ?пама Ñ?еÑ?ез SpamAssassin"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "Ð?одÑ?лÑ? длÑ? Ñ?оÑ?Ñ?анениÑ? вÑ?еÑ? вложений или Ñ?аÑ?Ñ?ей Ñ?ообÑ?ениÑ? одновÑ?еменно."
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "СоÑ?Ñ?анениÑ?Ñ? вложениÑ?"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вложениÑ?..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?е вложениÑ?"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "Ð?Ñ?бÑ?аÑ?Ñ? базовое имÑ? длÑ? Ñ?оÑ?Ñ?анениÑ?"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "Тип MIME"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "СоÑ?Ñ?аниÑ?Ñ?"
+msgid "SpamAssassin Options"
+msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? SpamAssassin"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%d/%m/%Y %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Description List"
 msgstr "СпиÑ?ок опиÑ?аний"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Categories List"
 msgstr "СпиÑ?ок каÑ?егоÑ?ий"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Comment List"
 msgstr "СпиÑ?ок комменÑ?аÑ?иев"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "Создано"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Contact List"
 msgstr "СпиÑ?ок конÑ?акÑ?ов"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "Start"
 msgstr "Ð?аÑ?ало"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "End"
 msgstr "Ð?онеÑ?"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "percent Done"
 msgstr "пÑ?оÑ?енÑ? вÑ?полнениÑ?"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:370
 msgid "Attendees List"
 msgstr "СпиÑ?ок Ñ?Ñ?аÑ?Ñ?ников"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Modified"
 msgstr "Ð?зменено"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "Ð?ополниÑ?елÑ?нÑ?е паÑ?амеÑ?Ñ?Ñ? Ñ?оÑ?маÑ?а CSV"
+#: ../plugins/save-calendar/csv-format.c:523
+msgid "A_dvanced options for the CSV format"
+msgstr "_Ð?ополниÑ?елÑ?нÑ?е паÑ?амеÑ?Ñ?Ñ? Ñ?оÑ?маÑ?а CSV"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "Ð?Ñ?едваÑ?Ñ?Ñ?Ñ? заголовок"
+#: ../plugins/save-calendar/csv-format.c:530
+msgid "Prepend a _header"
+msgstr "Ð?Ñ?едваÑ?Ñ?Ñ?Ñ? за_головок"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "РазделиÑ?елÑ? знаÑ?ений:"
+#: ../plugins/save-calendar/csv-format.c:539
+msgid "_Value delimiter:"
+msgstr "РазделиÑ?елÑ? _знаÑ?ений:"
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "РазделиÑ?елÑ? запиÑ?и:"
+#: ../plugins/save-calendar/csv-format.c:546
+msgid "_Record delimiter:"
+msgstr "_РазделиÑ?елÑ? запиÑ?и:"
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "Ð?нкапÑ?Ñ?лиÑ?оваÑ?Ñ? знаÑ?ениÑ? в:"
+#: ../plugins/save-calendar/csv-format.c:553
+msgid "_Encapsulate values with:"
+msgstr "_Ð?нкапÑ?Ñ?лиÑ?оваÑ?Ñ? знаÑ?ениÑ? в:"
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:575
 msgid "Comma separated value format (.csv)"
 msgstr "Ð?наÑ?ениÑ?, Ñ?азделеннÑ?е запÑ?Ñ?Ñ?ми (.csv)"
 
@@ -20125,8 +19008,8 @@ msgid "Save Selected"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?деленное"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "СоÑ?Ñ?анÑ?еÑ? вÑ?деленнÑ?й календаÑ?Ñ? или Ñ?пиÑ?ок задаÑ? на диÑ?к."
+msgid "Save a calendar or task list to disk."
+msgstr "СоÑ?Ñ?аниÑ?Ñ? календаÑ?Ñ? или Ñ?пиÑ?ок задаÑ? на диÑ?к."
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
@@ -20141,21 +19024,25 @@ msgstr "_СоÑ?Ñ?аниÑ?Ñ? на диÑ?к"
 msgid "%FT%T"
 msgstr "%d/%m/%Y %T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:372
 msgid "RDF format (.rdf)"
 msgstr "ФоÑ?маÑ? RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:104
+msgid "_Format:"
+msgstr "_ФоÑ?маÑ?:"
+
+#: ../plugins/save-calendar/save-calendar.c:165
 msgid "Select destination file"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл назнаÑ?ениÑ?"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "Ð?Ñ?боÑ? одного иÑ?Ñ?оÑ?ника"
+msgid "Quickly select a single calendar or task list for viewing."
+msgstr "Ð?Ñ?Ñ?Ñ?Ñ?о вÑ?бÑ?аÑ?Ñ? один календаÑ?Ñ? или иÑ?Ñ?оÑ?ник задаÑ? длÑ? пÑ?оÑ?моÑ?Ñ?а."
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "Ð?Ñ?биÑ?аеÑ? один календаÑ?Ñ? или иÑ?Ñ?оÑ?ник задаÑ? длÑ? пÑ?оÑ?моÑ?Ñ?а."
+msgid "Select One Source"
+msgstr "Ð?Ñ?беÑ?иÑ?е один иÑ?Ñ?оÑ?ник"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
@@ -20177,15 +19064,15 @@ msgstr "Ð?омогаеÑ? вам вÑ?полниÑ?Ñ? наÑ?алÑ?нÑ?Ñ? наÑ?Ñ?Ñ?
 msgid "Setup Assistant"
 msgstr "Ð?омоÑ?ник по Ñ?Ñ?Ñ?ановке"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Ð?омоÑ?ник по Ñ?Ñ?Ñ?ановке Evolution"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "Ð?обÑ?о пожаловаÑ?Ñ?"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -20197,37 +19084,35 @@ msgstr ""
 "из дÑ?Ñ?гиÑ? пÑ?иложений. \n"
 "Ð?ажмиÑ?е «Ð?алее» длÑ? пÑ?одолжениÑ?. "
 
-#: ../plugins/startup-wizard/startup-wizard.c:135
+#: ../plugins/startup-wizard/startup-wizard.c:115
 msgid "Importing files"
 msgstr "Ð?мпоÑ?Ñ? Ñ?айлов"
 
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../plugins/startup-wizard/startup-wizard.c:117
+#: ../shell/e-shell-importer.c:138
 msgid "Please select the information that you would like to import:"
 msgstr "Ð?ожалÑ?йÑ?Ñ?а, Ñ?кажиÑ?е, какÑ?Ñ? инÑ?оÑ?маÑ?иÑ? вÑ? Ñ?оÑ?иÑ?е импоÑ?Ñ?иÑ?оваÑ?Ñ?:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:132
+#: ../shell/e-shell-importer.c:419
 #, c-format
 msgid "From %s:"
 msgstr "Ð?з %s:"
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
+#: ../plugins/startup-wizard/startup-wizard.c:203
+#: ../shell/e-shell-importer.c:548
 #, c-format
 msgid "Importing data."
 msgstr "Ð?мпоÑ?Ñ? даннÑ?Ñ?."
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:205
+#: ../shell/e-shell-importer.c:562
 msgid "Please wait"
-msgstr "Ð?одождиÑ?е пожалÑ?йÑ?Ñ?а"
+msgstr "Ð?одождиÑ?е, пожалÑ?йÑ?Ñ?а"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr ""
-"УказÑ?ваеÑ?, должен ли алгоÑ?иÑ?м подÑ?ивки Ñ?ообÑ?ений оÑ?каÑ?Ñ?ваÑ?Ñ?Ñ?Ñ? до подÑ?ивки по "
-"Ñ?еме."
+msgid "Sort mail message threads by subject."
+msgstr "СоÑ?Ñ?иÑ?оваÑ?Ñ? Ñ?ообÑ?ениÑ? по полÑ? «Тема»."
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -20250,15 +19135,15 @@ msgstr ""
 "СпиÑ?ок паÑ? клÑ?Ñ?евое Ñ?лово/знаÑ?ение модÑ?лÑ? Ñ?аблонов длÑ? заменÑ? в Ñ?еле "
 "Ñ?ообÑ?ениÑ?."
 
-#: ../plugins/templates/templates.c:603
+#: ../plugins/templates/templates.c:601
 msgid "No title"
 msgstr "Ð?еÑ? заголовка"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:709
 msgid "Save as _Template"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как _Ñ?аблон"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:711
 msgid "Save as Template"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? как Ñ?аблон"
 
@@ -20267,31 +19152,63 @@ msgid "Drafts based template plugin"
 msgstr "Ð?одÑ?лÑ? Ñ?аблонов на оÑ?нове Ñ?еÑ?новиков"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "Ð?Ñ?оÑ?Ñ?ой модÑ?лÑ?, иÑ?полÑ?зÑ?Ñ?Ñ?ий yTNEF длÑ? Ñ?аÑ?Ñ?иÑ?Ñ?овки вложений TNEF."
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "Ð?екодиÑ?оваÑ?Ñ? вложениÑ? TNEF (winmail.dat) оÑ? Microsoft Outlook."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "РаÑ?Ñ?иÑ?Ñ?овка вложений TNEF"
+msgid "TNEF Decoder"
+msgstr "Ð?екодеÑ? TNEF"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+msgid "Inline vCards"
+msgstr "Ð?Ñ?Ñ?Ñ?оенное оÑ?обÑ?ажение vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? каÑ?Ñ?оÑ?ки vCard непоÑ?Ñ?едÑ?Ñ?венно в поÑ?Ñ?овÑ?Ñ? Ñ?ообÑ?ениÑ?."
+
+#: ../plugins/vcard-inline/vcard-inline.c:159
+#: ../plugins/vcard-inline/vcard-inline.c:243
+msgid "Show Full vCard"
+msgstr "Ð?оказÑ?ваÑ?Ñ? вÑ?Ñ? каÑ?Ñ?оÑ?кÑ?"
+
+#: ../plugins/vcard-inline/vcard-inline.c:162
+msgid "Show Compact vCard"
+msgstr "Ð?оказÑ?ваÑ?Ñ? компакÑ?нÑ?Ñ? каÑ?Ñ?оÑ?кÑ?"
+
+#: ../plugins/vcard-inline/vcard-inline.c:222
+msgid "There is one other contact."
+msgstr "Ð?мееÑ?Ñ?Ñ? еÑ?е один конÑ?акÑ?."
+
+#: ../plugins/vcard-inline/vcard-inline.c:231
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гой конÑ?акÑ?."
+msgstr[1] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гиÑ? конÑ?акÑ?а."
+msgstr[2] "Ð?мееÑ?Ñ?Ñ? %d дÑ?Ñ?гиÑ? конÑ?акÑ?ов."
+
+#: ../plugins/vcard-inline/vcard-inline.c:252
+msgid "Save in Address Book"
+msgstr "СоÑ?Ñ?аниÑ?Ñ? в Ð?дÑ?еÑ?ной Ð?ниге"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "Ð?одÑ?лÑ? длÑ? наÑ?Ñ?Ñ?ойки конÑ?акÑ?ов WebDAV."
+msgid "Add WebDAV contacts to Evolution."
+msgstr "Ð?обавиÑ?Ñ? конÑ?акÑ?Ñ? WebDAV к Evolution"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "Ð?онÑ?акÑ?Ñ? WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:96
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:107
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:337
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:364
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Ð?збегаÑ?Ñ? IfMatch (Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? длÑ? Ñ?еÑ?веÑ?а Apache веÑ?Ñ?ии < 2.2.8)"
 
@@ -20340,10 +19257,8 @@ msgid "Default window width"
 msgstr "ШиÑ?ина окна по Ñ?молÑ?аниÑ?"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:8
-msgid ""
-"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
-"Ð?клÑ?Ñ?аеÑ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па к Ð?нÑ?еÑ?неÑ? по пÑ?оÑ?околÑ? HTTP/HTTPS."
+msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr "Ð?клÑ?Ñ?аеÑ? наÑ?Ñ?Ñ?ойки пÑ?окÑ?и длÑ? доÑ?Ñ?Ñ?па к Ð?нÑ?еÑ?неÑ? по пÑ?оÑ?околÑ? HTTP/HTTPS."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "HTTP proxy host name"
@@ -20380,45 +19295,62 @@ msgstr ""
 "gnome2_private/."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
-msgid "Last upgraded configuration version"
-msgstr "Ð?еÑ?Ñ?иÑ? поÑ?ледней обновленной конÑ?игÑ?Ñ?аÑ?ии"
+msgid "Initial attachment view"
+msgstr "Ð?Ñ?Ñ?однÑ?й вид панели вложений"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
+msgid "Initial file chooser folder"
+msgstr "Ð?Ñ?Ñ?однаÑ? папка вÑ?боÑ?а Ñ?айлов"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "Ð?Ñ?Ñ?однаÑ? папка диалога GtkFileChooser."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr "Ð?аÑ?алÑ?ное знаÑ?ение Ñ?леменÑ?ов панели вложений. «0» - знаÑ?ки, «1» - Ñ?пиÑ?ок."
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Last upgraded configuration version"
+msgstr "Ð?еÑ?Ñ?иÑ? поÑ?ледней обновленной конÑ?игÑ?Ñ?аÑ?ии"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 "СпиÑ?ок пÑ?Ñ?ей длÑ? папок, коÑ?оÑ?Ñ?е бÑ?дÑ?Ñ? Ñ?инÑ?Ñ?онизиÑ?оваÑ?Ñ?Ñ?Ñ? на диÑ?к длÑ? "
 "авÑ?ономной Ñ?абоÑ?Ñ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Non-proxy hosts"
 msgstr "УзлÑ? длÑ? доÑ?Ñ?Ñ?па без пÑ?окÑ?и"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Password to pass as authentication when doing HTTP proxying."
 msgstr "Ð?аÑ?олÑ? длÑ? пÑ?овеÑ?ки подлинноÑ?Ñ?и на пÑ?окÑ?и."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Proxy configuration mode"
 msgstr "Режим наÑ?Ñ?Ñ?ойки пÑ?окÑ?и"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "SOCKS proxy host name"
 msgstr "Ð?мÑ? Ñ?зла пÑ?окÑ?и SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "SOCKS proxy port"
 msgstr "Ð?оÑ?Ñ? пÑ?окÑ?и SOCKS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Secure HTTP proxy host name"
 msgstr "Ð?мÑ? Ñ?зла пÑ?окÑ?и HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Secure HTTP proxy port"
 msgstr "Ð?оÑ?Ñ? пÑ?окÑ?и HTTPS"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -20430,23 +19362,23 @@ msgstr ""
 "«иÑ?полÑ?зоваÑ?Ñ? заданнÑ?е наÑ?Ñ?Ñ?ойки» и «иÑ?полÑ?зоваÑ?Ñ? Ñ?еÑ?Ñ?Ñ?Ñ? длÑ? авÑ?омаÑ?иÑ?еÑ?кой "
 "конÑ?игÑ?Ñ?аÑ?ии»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Sidebar is visible"
 msgstr "Ð?оковаÑ? панелÑ? видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Skip development warning dialog"
 msgstr "Ð?Ñ?опÑ?Ñ?каÑ?Ñ? диалог пÑ?едÑ?пÑ?еждениÑ? о Ñ?еÑ?Ñ?овой веÑ?Ñ?ии"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:31 ../shell/main.c:489
 msgid "Start in offline mode"
 msgstr "Ð?апÑ?Ñ?к в авÑ?ономном Ñ?ежиме"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Statusbar is visible"
 msgstr "Ð?анелÑ? Ñ?оÑ?Ñ?оÑ?ниÑ? видима"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
@@ -20454,19 +19386,19 @@ msgstr ""
 "Ð?еÑ?Ñ?иÑ? конÑ?игÑ?Ñ?аÑ?ии Evolution, Ñ? Ñ?Ñ?овнÑ?ми major/minor/configuration "
 "(напÑ?имеÑ?, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "The default height for the main window, in pixels."
 msgstr "Ð?Ñ?Ñ?оÑ?а оÑ?новного окна по Ñ?молÑ?аниÑ?, в пикÑ?елаÑ?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid "The default width for the main window, in pixels."
 msgstr "ШиÑ?ина оÑ?новного окна по Ñ?молÑ?аниÑ?, в пикÑ?елаÑ?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "The default width for the sidebar, in pixels."
 msgstr "ШиÑ?ина боковой панели по Ñ?молÑ?аниÑ?, в пикÑ?елаÑ?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:37
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -20474,19 +19406,19 @@ msgstr ""
 "Ð?еÑ?Ñ?иÑ? поÑ?ледней обновленной веÑ?Ñ?ии Evolution, Ñ? Ñ?Ñ?овнÑ?ми major/minor/"
 "configuration (напÑ?имеÑ?, «2.6.0»)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The machine name to proxy HTTP through."
 msgstr "Ð?мÑ? Ñ?зла пÑ?окÑ?и пÑ?оÑ?окола HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The machine name to proxy secure HTTP through."
 msgstr "Ð?мÑ? Ñ?зла пÑ?окÑ?и пÑ?оÑ?окола HTTPS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The machine name to proxy socks through."
 msgstr "Ð?мÑ? Ñ?зла пÑ?окÑ?и пÑ?оÑ?окола SOCKS."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
@@ -20494,7 +19426,7 @@ msgstr ""
 "Ð?оÑ?Ñ? на пÑ?окÑ?и Ñ?зле, опÑ?еделÑ?нном клÑ?Ñ?ом «/apps/evolution/shell/"
 "network_config/http_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
@@ -20502,7 +19434,7 @@ msgstr ""
 "Ð?оÑ?Ñ? на пÑ?окÑ?и Ñ?зле, опÑ?еделÑ?нном клÑ?Ñ?ом «/apps/evolution/shell/"
 "network_config/secure_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
@@ -20510,7 +19442,7 @@ msgstr ""
 "Ð?оÑ?Ñ? на пÑ?окÑ?и Ñ?зле, опÑ?еделÑ?нном клÑ?Ñ?ом «/apps/evolution/shell/"
 "network_config/socks_host»."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -20520,7 +19452,7 @@ msgstr ""
 "Ñ?Ñ?Ñ?ановлено знаÑ?ение «toolbar», Ñ?Ñ?илÑ? кнопок Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?еÑ? Ñ?иÑ?Ñ?емнÑ?м "
 "паÑ?амеÑ?Ñ?ам Ñ?Ñ?едÑ? GNOME."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -20532,61 +19464,59 @@ msgstr ""
 "могÑ?Ñ? иÑ?олÑ?зоваÑ?Ñ? Ñ?аблонÑ? как *.foo.com, адÑ?еÑ?ами IP (и IPv4 и IPv6) и "
 "адÑ?еÑ?ами Ñ?еÑ?ей Ñ? маÑ?кой (напÑ?имеÑ?, 192.168.0.0/24)."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "Toolbar is visible"
 msgstr "Ð?анелÑ? инÑ?Ñ?Ñ?Ñ?менÑ?ов видимаÑ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid "URL that provides proxy configuration values."
 msgstr "URL длÑ? полÑ?Ñ?ениÑ? паÑ?амеÑ?Ñ?ов наÑ?Ñ?Ñ?ойки пÑ?окÑ?и."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid "Use HTTP proxy"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? пÑ?окÑ?и HTTP"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid "User name to pass as authentication when doing HTTP proxying."
 msgstr ""
 "Ð?мÑ? полÑ?зоваÑ?елÑ? длÑ? пÑ?оÑ?ождениÑ? пÑ?овеÑ?ки подлинноÑ?Ñ?и пÑ?и подклÑ?Ñ?ении к "
 "пÑ?окÑ?и HTTP."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Ð?Ñ?ли Ñ?Ñ?оÑ? клÑ?Ñ? Ñ?Ñ?Ñ?ановлен, Evolution бÑ?деÑ? запÑ?Ñ?каÑ?Ñ?Ñ?Ñ? в авÑ?ономном Ñ?ежиме."
+msgstr "Ð?Ñ?ли Ñ?Ñ?оÑ? клÑ?Ñ? Ñ?Ñ?Ñ?ановлен, Evolution бÑ?деÑ? запÑ?Ñ?каÑ?Ñ?Ñ?Ñ? в авÑ?ономном Ñ?ежиме."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 msgid "Whether or not the window should be maximized."
 msgstr "Ð?олжнÑ? ли окно бÑ?Ñ?Ñ? макÑ?имизиÑ?ованнÑ?м."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Whether the sidebar should be visible."
 msgstr "Ð?олжна ли боковаÑ? панелÑ? бÑ?Ñ?Ñ? видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "Whether the status bar should be visible."
 msgstr "Ð?олжна ли панелÑ? Ñ?оÑ?Ñ?оÑ?ниÑ? бÑ?Ñ?Ñ? видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether the toolbar should be visible."
 msgstr "Ð?олжна ли панелÑ? инÑ?Ñ?Ñ?Ñ?менÑ?ов бÑ?Ñ?Ñ? видимой."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.h:55
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr ""
 "Ð?Ñ?ли Ñ?Ñ?оÑ? клÑ?Ñ? Ñ?Ñ?Ñ?ановлен, диалог пÑ?едÑ?пÑ?еждениÑ? в Ñ?еÑ?Ñ?овÑ?Ñ? веÑ?Ñ?иÑ?Ñ? "
 "Evolution не оÑ?обÑ?ажаеÑ?Ñ?Ñ?."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the window buttons should be visible."
 msgstr "Ð?олжнÑ? ли бÑ?Ñ?Ñ? видимÑ?ми кнопки окон."
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Window button style"
 msgstr "СÑ?илÑ? кнопок окон"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Window buttons are visible"
 msgstr "Ð?нопки окон видимÑ?"
 
@@ -20602,22 +19532,21 @@ msgstr "Ð?кÑ?ивнÑ?е Ñ?оединениÑ?"
 msgid "Click OK to close these connections and go offline"
 msgstr "Ð?ажмиÑ?е OK длÑ? закÑ?Ñ?Ñ?иÑ? Ñ?оединениÑ? и пеÑ?еÑ?ода на Ñ?абоÑ?Ñ? вне Ñ?еÑ?и"
 
-#: ../shell/e-shell-importer.c:131
+#: ../shell/e-shell-importer.c:128
 msgid "Choose the type of importer to run:"
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?ип импоÑ?Ñ?еÑ?а длÑ? запÑ?Ñ?ка:"
 
-#: ../shell/e-shell-importer.c:134
+#: ../shell/e-shell-importer.c:131
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
-msgstr ""
-"Ð?Ñ?беÑ?иÑ?е Ñ?айл, импоÑ?Ñ?иÑ?Ñ?емÑ?й вами в Evolution и вÑ?беÑ?иÑ?е Ñ?ип Ñ?айла из Ñ?пиÑ?ка."
+msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?айл, импоÑ?Ñ?иÑ?Ñ?емÑ?й вами в Evolution и вÑ?беÑ?иÑ?е Ñ?ип Ñ?айла из Ñ?пиÑ?ка."
 
-#: ../shell/e-shell-importer.c:138
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the destination for this import"
 msgstr "Ð?Ñ?беÑ?иÑ?е назнаÑ?ение длÑ? Ñ?Ñ?ого импоÑ?Ñ?а"
 
-#: ../shell/e-shell-importer.c:144
+#: ../shell/e-shell-importer.c:141
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -20630,58 +19559,62 @@ msgstr ""
 "импоÑ?Ñ?иÑ?оваÑ?Ñ?. Ð?Ñ?ли вÑ? Ñ?оÑ?иÑ?е попÑ?обоваÑ?Ñ? еÑ?е Ñ?аз,\n"
 "нажмиÑ?е клавиÑ?Ñ? «Ð?азад».\n"
 
-#: ../shell/e-shell-importer.c:282
+#: ../shell/e-shell-importer.c:295
 msgid "F_ilename:"
 msgstr "_Ð?мÑ? Ñ?айла:"
 
-#: ../shell/e-shell-importer.c:287
+#: ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?айл"
 
-#: ../shell/e-shell-importer.c:296
+#: ../shell/e-shell-importer.c:309
 msgid "File _type:"
 msgstr "_Тип Ñ?айла:"
 
-#: ../shell/e-shell-importer.c:332
+#: ../shell/e-shell-importer.c:357
 msgid "Import data and settings from _older programs"
 msgstr "Ð?мпоÑ?Ñ? даннÑ?Ñ? и наÑ?Ñ?Ñ?оек из _Ñ?Ñ?аÑ?Ñ?Ñ? пÑ?огÑ?амм"
 
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:360
 msgid "Import a _single file"
 msgstr "Ð?мпоÑ?Ñ? _одного Ñ?айла"
 
-#: ../shell/e-shell-settings-dialog.c:313
+#: ../shell/e-shell-importer.c:743
+msgid "_Import"
+msgstr "_Ð?мпоÑ?Ñ?"
+
+#: ../shell/e-shell-settings-dialog.c:312
 msgid "Evolution Preferences"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? Evolution"
 
 #. To translators: This is the window title and %s is the
 #. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
+#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:324
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window-commands.c:75
+#: ../shell/e-shell-window-commands.c:69
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ð?оÑ?оже, Ñ?Ñ?илиÑ?а GNOME Pilot не Ñ?Ñ?Ñ?ановлена в Ñ?Ñ?ой Ñ?иÑ?Ñ?еме"
 
-#: ../shell/e-shell-window-commands.c:83
+#: ../shell/e-shell-window-commands.c:78
 #, c-format
-msgid "Error executing %s."
-msgstr "Ð?Ñ?ибка вÑ?полнениÑ? %s."
+msgid "Error executing %s. (%s)"
+msgstr "Ð?Ñ?ибка вÑ?полнениÑ? %s. (%s)"
 
-#: ../shell/e-shell-window-commands.c:139
+#: ../shell/e-shell-window-commands.c:135
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не Ñ?Ñ?Ñ?ановлен."
 
-#: ../shell/e-shell-window-commands.c:142
+#: ../shell/e-shell-window-commands.c:138
 msgid "Bug buddy could not be run."
 msgstr "Ð?е Ñ?далоÑ?Ñ? запÑ?Ñ?Ñ?иÑ?Ñ? Bug buddy."
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-commands.c:1026
 msgid "translator-credits"
 msgstr ""
 "Valek Filippov <frob df ru>\n"
@@ -20689,23 +19622,23 @@ msgstr ""
 "Leonid Kanter <leon asplinux ru>\n"
 "Michael Yakhontov <mvy asplinux ru>"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-commands.c:1037
 msgid "Evolution Website"
 msgstr "Ð?еб-Ñ?айÑ? Evolution"
 
-#: ../shell/e-shell-window-commands.c:1170
+#: ../shell/e-shell-window-commands.c:1251
 msgid "_Work Online"
 msgstr "Ð?еÑ?ейÑ?и в Ñ?еÑ?евой Ñ?ежим"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:1264 ../ui/evolution.xml.h:57
 msgid "_Work Offline"
 msgstr "Ð?в_Ñ?ономнаÑ? Ñ?абоÑ?а"
 
-#: ../shell/e-shell-window-commands.c:1196
+#: ../shell/e-shell-window-commands.c:1277
 msgid "Work Offline"
 msgstr "Ð?еÑ?ейÑ?и в Ñ?ежим Ñ?абоÑ?Ñ? вне Ñ?еÑ?и"
 
-#: ../shell/e-shell-window.c:377
+#: ../shell/e-shell-window.c:372
 msgid ""
 "Evolution is currently online.\n"
 "Click on this button to work offline."
@@ -20714,11 +19647,11 @@ msgstr ""
 "Ð?ажмиÑ?е на Ñ?Ñ?Ñ? кнопкÑ? длÑ? пеÑ?еÑ?ода\n"
 "в авÑ?ономнÑ?й Ñ?ежим."
 
-#: ../shell/e-shell-window.c:384
+#: ../shell/e-shell-window.c:379
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution наÑ?одиÑ?Ñ?Ñ? в пÑ?оÑ?еÑ?Ñ?е пеÑ?еÑ?ода в авÑ?ономнÑ?й Ñ?ежим Ñ?абоÑ?Ñ?."
 
-#: ../shell/e-shell-window.c:391
+#: ../shell/e-shell-window.c:386
 msgid ""
 "Evolution is currently offline.\n"
 "Click on this button to work online."
@@ -20726,52 +19659,52 @@ msgstr ""
 "Evolution Ñ?ейÑ?аÑ? Ñ?абоÑ?аеÑ? в авÑ?ономном Ñ?ежиме.\n"
 "Ð?ажмиÑ?е на Ñ?Ñ?Ñ? кнопкÑ? длÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?и."
 
-#: ../shell/e-shell-window.c:785
+#: ../shell/e-shell-window.c:778
 #, c-format
 msgid "Switch to %s"
 msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в %s"
 
-#: ../shell/e-shell.c:640
+#: ../shell/e-shell.c:634
 msgid "Unknown system error."
 msgstr "Ð?еизвеÑ?Ñ?наÑ? Ñ?иÑ?Ñ?емнаÑ? оÑ?ибка."
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
+#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
 #, c-format
 msgid "%ld KB"
 msgstr "%ld Ð?Ð?"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
+#: ../shell/e-shell.c:1251 ../widgets/misc/e-cell-date-edit.c:320
 msgid "OK"
 msgstr "Ð?к"
 
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1253
 msgid "Invalid arguments"
 msgstr "Ð?едопÑ?Ñ?Ñ?имÑ?е аÑ?гÑ?менÑ?Ñ?"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1255
 msgid "Cannot register on OAF"
 msgstr "Ð?е Ñ?далоÑ?Ñ? заÑ?егиÑ?Ñ?Ñ?иÑ?оваÑ?Ñ? в OAF"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1257
 msgid "Configuration Database not found"
 msgstr "Ð?аза даннÑ?Ñ? наÑ?Ñ?Ñ?оек не найдена"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-user-creatable-items-handler.c:674
+#: ../shell/e-user-creatable-items-handler.c:684
+#: ../shell/e-user-creatable-items-handler.c:689
 msgid "New"
 msgstr "СоздаÑ?Ñ?"
 
-#: ../shell/test/evolution-test-component.c:105
+#: ../shell/test/evolution-test-component.c:103
 msgid "New Test"
 msgstr "Ð?овÑ?й Ñ?еÑ?Ñ?"
 
-#: ../shell/test/evolution-test-component.c:106
+#: ../shell/test/evolution-test-component.c:104
 msgctxt "New"
 msgid "_Test"
 msgstr "Ð?Ñ?ов_еÑ?ка"
 
-#: ../shell/test/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:105
 msgid "Create a new test item"
 msgstr "СоздаÑ?Ñ? новÑ?й Ñ?еÑ?Ñ?овÑ?й Ñ?леменÑ?"
 
@@ -20814,7 +19747,7 @@ msgstr ""
 "внеÑ?ниÑ? Ñ?айлов в Evolution."
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20850,7 +19783,7 @@ msgstr ""
 "Ð?адеемÑ?Ñ?, Ñ?Ñ?о вам понÑ?авиÑ?Ñ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ? наÑ?его Ñ?Ñ?Ñ?да,\n"
 "и Ñ? неÑ?еÑ?пением ждем ваÑ?ей помоÑ?и!\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20858,43 +19791,43 @@ msgstr ""
 "С благодаÑ?ноÑ?Ñ?Ñ?Ñ?\n"
 "команда Evolution\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "Ð?е напоминаÑ?Ñ? болÑ?Ñ?е"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:487
 msgid "Start Evolution activating the specified component"
 msgstr "Ð?апÑ?Ñ?к Evolution Ñ? акÑ?ивиÑ?ованием Ñ?казанного компоненÑ?а"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:491
 msgid "Start in online mode"
 msgstr "Ð?апÑ?Ñ?к в Ñ?ежиме подклÑ?Ñ?ениÑ? к инÑ?еÑ?неÑ?Ñ?"
 
-#: ../shell/main.c:488
+#: ../shell/main.c:494
 msgid "Forcibly shut down all Evolution components"
 msgstr "Ð?Ñ?инÑ?диÑ?елÑ?ное завеÑ?Ñ?ение Ñ?абоÑ?Ñ? вÑ?еÑ? компоненÑ?ов Evolution"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:498
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Ð?Ñ?инÑ?диÑ?елÑ?наÑ? повÑ?оÑ?наÑ? мигÑ?аÑ?иÑ? Ñ? Evolution 1.4"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:501
 msgid "Send the debugging output of all components to a file."
 msgstr "Ð?апиÑ?Ñ?ваÑ?Ñ? оÑ?ладоÑ?нÑ?й вÑ?вод вÑ?еÑ? компоненÑ?ов в Ñ?айл."
 
-#: ../shell/main.c:497
+#: ../shell/main.c:503
 msgid "Disable loading of any plugins."
 msgstr "Ð?апÑ?еÑ?иÑ?Ñ? загÑ?Ñ?зкÑ? лÑ?бÑ?Ñ? модÑ?лей."
 
-#: ../shell/main.c:499
+#: ../shell/main.c:505
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Ð?Ñ?клÑ?Ñ?иÑ?Ñ? облаÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?а поÑ?Ñ?Ñ?, конÑ?акÑ?ов и задаÑ?."
 
-#: ../shell/main.c:586
+#: ../shell/main.c:614
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Ð?оÑ?Ñ?овÑ?й клиенÑ? и ежедневник Evolution"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:642
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21051,7 +19984,7 @@ msgstr ""
 "\n"
 "Ð?змениÑ?Ñ? довеÑ?ие Ñ?еÑ?Ñ?иÑ?икаÑ?а:"
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:150
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21060,7 +19993,7 @@ msgstr ""
 "Ð?оÑ?колÑ?кÑ? вÑ? довеÑ?Ñ?еÑ?е поÑ?Ñ?авÑ?икÑ? Ñ?Ñ?ого Ñ?еÑ?Ñ?иÑ?икаÑ?а, вÑ? довеÑ?Ñ?еÑ?е Ñ?акже и "
 "аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ?и Ñ?Ñ?ого Ñ?еÑ?Ñ?иÑ?икаÑ?а, еÑ?ли Ñ?Ñ?Ñ? не оÑ?меÑ?ено инаÑ?е"
 
-#: ../smime/gui/cert-trust-dialog.c:155
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21070,8 +20003,8 @@ msgstr ""
 "аÑ?Ñ?енÑ?иÑ?ноÑ?Ñ?и Ñ?Ñ?ого Ñ?еÑ?Ñ?иÑ?икаÑ?а, еÑ?ли здеÑ?Ñ? не Ñ?казано инаÑ?е"
 
 #: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:609
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:611
 msgid "Select a certificate to import..."
 msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? длÑ? импоÑ?Ñ?а..."
 
@@ -21079,41 +20012,41 @@ msgstr "Ð?Ñ?беÑ?иÑ?е Ñ?еÑ?Ñ?иÑ?икаÑ? длÑ? импоÑ?Ñ?а..."
 msgid "All PKCS12 files"
 msgstr "Ð?Ñ?е Ñ?айлÑ? PKCS12"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:396
-#: ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:625
 msgid "All files"
 msgstr "Ð?Ñ?е Ñ?айлÑ?"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:486
-#: ../smime/gui/certificate-manager.c:711
+#: ../smime/gui/certificate-manager.c:275
+#: ../smime/gui/certificate-manager.c:488
+#: ../smime/gui/certificate-manager.c:713
 msgid "Certificate Name"
 msgstr "Ð?мÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:504
+#: ../smime/gui/certificate-manager.c:284
+#: ../smime/gui/certificate-manager.c:506
 msgid "Purposes"
 msgstr "Ð?азнаÑ?ениÑ?"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:293 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "СеÑ?ийнÑ?й номеÑ?"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:301
 msgid "Expires"
 msgstr "Ð?оден до"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:392
 msgid "All email certificate files"
 msgstr "Ð?Ñ?е Ñ?айлÑ? Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?ами поÑ?Ñ?Ñ?"
 
-#: ../smime/gui/certificate-manager.c:495
+#: ../smime/gui/certificate-manager.c:497
 msgid "E-Mail Address"
 msgstr "ЭлекÑ?Ñ?оннаÑ? поÑ?Ñ?а"
 
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:620
 msgid "All CA certificate files"
 msgstr "Ð?Ñ?е Ñ?айлÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов CA"
 
@@ -21216,7 +20149,7 @@ msgstr ""
 "вам необÑ?одимо пÑ?оÑ?моÑ?Ñ?еÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?, его полиÑ?икÑ? и пÑ?оÑ?едÑ?Ñ?Ñ? (еÑ?ли "
 "доÑ?Ñ?Ñ?пнÑ?)."
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ?"
 
@@ -21292,11 +20225,11 @@ msgstr "Ð?одÑ?азделение оÑ?ганизаÑ?ии (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Ð?Ñ?пеÑ?аÑ?ок SHA1"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? клиенÑ?а SSL"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?еÑ?веÑ?е SSL"
 
@@ -21325,16 +20258,14 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "У ваÑ? еÑ?Ñ?Ñ? иденÑ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ?ие ваÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ? оÑ? Ñ?ледÑ?Ñ?Ñ?иÑ? оÑ?ганизаÑ?ий:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "У ваÑ? в Ñ?айле имеÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?, коÑ?оÑ?Ñ?е иденÑ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ? Ñ?ледÑ?Ñ?Ñ?иÑ? "
 "поÑ?Ñ?авÑ?иков:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
-msgstr ""
-"У ваÑ? в Ñ?айле имеÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?, коÑ?оÑ?Ñ?е иденÑ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ? Ñ?ледÑ?Ñ?Ñ?иÑ? лиÑ?:"
+msgstr "У ваÑ? в Ñ?айле имеÑ?Ñ?Ñ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?, коÑ?оÑ?Ñ?е иденÑ?иÑ?иÑ?иÑ?Ñ?Ñ?Ñ? Ñ?ледÑ?Ñ?Ñ?иÑ? лиÑ?:"
 
 #: ../smime/gui/smime-ui.glade.h:46
 msgid "Your Certificates"
@@ -21345,7 +20276,7 @@ msgid "_Edit CA Trust"
 msgstr "_Ð?змениÑ?Ñ? довеÑ?ие поÑ?Ñ?авÑ?икÑ?"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?"
 
@@ -21354,161 +20285,161 @@ msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "Ð?одпиÑ?аÑ?Ñ?"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "Ð?аÑ?иÑ?Ñ?оваÑ?Ñ?"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "Ð?еÑ?Ñ?иÑ?"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "Ð?еÑ?Ñ?иÑ? 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "Ð?еÑ?Ñ?иÑ? 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "Ð?еÑ?Ñ?иÑ? 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 Ñ? Ñ?иÑ?Ñ?ованием RSA"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 Ñ? Ñ?иÑ?Ñ?ованием RSA"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 Ñ? Ñ?иÑ?Ñ?ованием RSA"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 Ñ?иÑ?Ñ?ование RSA"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "Ð?Ñ?полÑ?зование клÑ?Ñ?а Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Тип Ñ?еÑ?Ñ?иÑ?икаÑ?а Netscape"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? клÑ?Ñ?а поÑ?Ñ?авÑ?ика"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? обÑ?екÑ?а (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "Ð?денÑ?иÑ?икаÑ?оÑ? алгоÑ?иÑ?ма"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "Ð?аÑ?амеÑ?Ñ?Ñ? алгоÑ?иÑ?ма"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "Ð?пиÑ?ание пÑ?блиÑ?ного клÑ?Ñ?а пÑ?едмеÑ?а"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "Ð?лгоÑ?иÑ?м пÑ?блиÑ?ного клÑ?Ñ?а пÑ?едмеÑ?а"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "Ð?Ñ?блиÑ?нÑ?й клÑ?Ñ? Ñ?емÑ?"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "Ð?Ñ?ибка: не Ñ?далоÑ?Ñ? обÑ?абоÑ?аÑ?Ñ? Ñ?аÑ?Ñ?иÑ?ение"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "Ð?бÑ?екÑ? подпиÑ?ан"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "Ð?оÑ?Ñ?авÑ?ик Ñ?еÑ?Ñ?иÑ?икаÑ?а SSL"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "Ð?оÑ?Ñ?авÑ?ик Ñ?еÑ?Ñ?иÑ?икаÑ?а Ñ?лекÑ?Ñ?онной поÑ?Ñ?Ñ?"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "Ð?одпиÑ?Ñ?вание"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "Ð?еÑ? оÑ?каза"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "ШиÑ?Ñ?ование клÑ?Ñ?а"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "ШиÑ?Ñ?ование даннÑ?Ñ?"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "СоглаÑ?ение клÑ?Ñ?а"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "СеÑ?Ñ?иÑ?икаÑ? подпиÑ?ан"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL подпиÑ?ан"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "Ð?Ñ?иÑ?иÑ?но"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "Ð?е кÑ?иÑ?иÑ?но"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "РаÑ?Ñ?иÑ?ениÑ?"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "Ð?лгоÑ?иÑ?м подпиÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "Ð?оÑ?Ñ?авÑ?ик"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "УникалÑ?нÑ?й ID поÑ?Ñ?авÑ?ика"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "УникалÑ?нÑ?й ID Ñ?емÑ?"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "Ð?наÑ?ение подпиÑ?и Ñ?еÑ?Ñ?иÑ?икаÑ?а"
 
@@ -21656,7 +20587,7 @@ msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?деленнÑ?е конÑ?акÑ?Ñ? как VCard"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? конÑ?акÑ?Ñ? из вÑ?деленной папки в Ñ?оÑ?маÑ?е vCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2721
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2719
 msgid "Select All"
 msgstr "Ð?Ñ?делиÑ?Ñ? вÑ?е"
 
@@ -21790,7 +20721,7 @@ msgid "Month"
 msgstr "Ð?еÑ?Ñ?Ñ?"
 
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
+#: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Ð?пеÑ?Ñ?д"
 
@@ -21798,8 +20729,8 @@ msgstr "Ð?пеÑ?Ñ?д"
 msgid "Previews the calendar to be printed"
 msgstr "Ð?оÑ?моÑ?Ñ?еÑ?Ñ? на вид календаÑ?Ñ? на пеÑ?аÑ?и"
 
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
+#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:70
+#: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Ð?азад"
 
@@ -22031,8 +20962,7 @@ msgid "Hide _Read Messages"
 msgstr "СкÑ?Ñ?Ñ?Ñ? п_Ñ?оÑ?иÑ?аннÑ?е Ñ?ообÑ?ениÑ?"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+msgid "Hide deleted messages rather than displaying them with a line through them"
 msgstr "СкÑ?Ñ?ваÑ?Ñ? Ñ?ообÑ?ениÑ?, помеÑ?еннÑ?е как Ñ?далÑ?ннÑ?е, вмеÑ?Ñ?о иÑ? пеÑ?еÑ?еÑ?киваниÑ?"
 
 #: ../ui/evolution-mail-list.xml.h:16
@@ -22111,7 +21041,7 @@ msgstr "Ð?оказÑ?ваÑ?Ñ? подÑ?иÑ?Ñ?е по Ñ?еме Ñ?ообÑ?ениÑ? 
 msgid "_Group By Threads"
 msgstr "_Ð?Ñ?Ñ?ппиÑ?оваÑ?Ñ? по подÑ?ивкам"
 
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:111
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "Сооб_Ñ?ение"
@@ -22366,199 +21296,183 @@ msgid "Paste messages from the clipboard"
 msgstr "Ð?Ñ?Ñ?авиÑ?Ñ? Ñ?ообÑ?ениÑ? из бÑ?Ñ?еÑ?а обмена"
 
 #: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "Ð?омеÑ?Ñ?иÑ?Ñ? но_вое Ñ?ообÑ?ение в папкÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "Ð?о_меÑ?Ñ?иÑ?Ñ? оÑ?веÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "Ð?омеÑ?Ñ?иÑ?Ñ? Ñ?ообÑ?ение в пÑ?блиÑ?нÑ?Ñ? папкÑ?"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "Ð?омеÑ?Ñ?иÑ?Ñ? оÑ?веÑ? на Ñ?ообÑ?ение в пÑ?блиÑ?ной папке"
-
-#: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
 msgstr "Ð?Ñ?едÑ?дÑ?Ñ?емÑ? важномÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Preview the message to be printed"
 msgstr "Ð?оÑ?моÑ?Ñ?еÑ?Ñ? вид Ñ?ообÑ?ениÑ? на пеÑ?аÑ?и"
 
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:73
 msgid "Print this message"
 msgstr "Ð?апеÑ?аÑ?аÑ?Ñ? Ñ?Ñ?о Ñ?ообÑ?ение"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:74
 msgid "Re_direct"
 msgstr "Ð?е_Ñ?енапÑ?авиÑ?Ñ?"
 
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:75
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ð?еÑ?еÑ?лаÑ?Ñ? вÑ?бÑ?анное Ñ?ообÑ?ение комÑ?-либо оÑ? Ñ?воего имени"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:80
 msgid "Reset the text to its original size"
 msgstr "УÑ?Ñ?ановиÑ?Ñ? Ñ?азмеÑ? Ñ?екÑ?Ñ?а в иÑ?Ñ?однÑ?й"
 
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Save the selected messages as a text file"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? вÑ?деленнÑ?е Ñ?ообÑ?ениÑ? в Ñ?екÑ?Ñ?овом Ñ?айле"
 
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Search Folder from Mailing _List..."
 msgstr "Ð?апкÑ? поиÑ?ка по Ñ?пиÑ?кÑ? _Ñ?аÑ?Ñ?Ñ?лки..."
 
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Search Folder from Recipien_ts..."
 msgstr "Ð?апкÑ? поиÑ?ка по полÑ?_Ñ?аÑ?елÑ?м..."
 
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Search Folder from S_ubject..."
 msgstr "Ð?апкÑ? поиÑ?ка по _Ñ?еме..."
 
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Sen_der..."
 msgstr "Ð?апкÑ? поиÑ?ка по _оÑ?пÑ?авиÑ?елÑ?..."
 
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search for text in the body of the displayed message"
 msgstr "Ð?оиÑ?к в Ñ?екÑ?Ñ?е оÑ?обÑ?ажаемого Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Select _All Text"
 msgstr "_Ð?Ñ?делиÑ?Ñ? веÑ?Ñ? Ñ?екÑ?Ñ?"
 
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Select all the text in a message"
 msgstr "Ð?Ñ?делиÑ?Ñ? веÑ?Ñ? Ñ?екÑ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:89 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аниÑ?Ñ? длÑ? ваÑ?его Ñ?екÑ?Ñ?его пÑ?инÑ?еÑ?а"
 
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Ð?оказÑ?ваÑ?Ñ? мигаÑ?Ñ?ий кÑ?Ñ?Ñ?оÑ? в Ñ?еле оÑ?обÑ?ажаемÑ?Ñ? Ñ?ообÑ?ений"
 
-#: ../ui/evolution-mail-message.xml.h:95
+#: ../ui/evolution-mail-message.xml.h:91
 msgid "Show messages with all email headers"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? Ñ?ообÑ?ениÑ? Ñ?о вÑ?еми заголовками"
 
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Show the raw email source of the message"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? полнÑ?й иÑ?Ñ?однÑ?й Ñ?екÑ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:93
 msgid "Undelete the selected messages"
 msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? вÑ?деленнÑ?е Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Uni_mportant"
 msgstr "_Ð?еважное"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Zoom _Out"
 msgstr "У_менÑ?Ñ?иÑ?Ñ?"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "_Attached"
 msgstr "_Ð?ложение"
 
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "_Caret Mode"
 msgstr "Режим _каÑ?еÑ?ки"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "_Clear Flag"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ? оÑ?меÑ?кÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Delete Message"
 msgstr "_УдалиÑ?Ñ? Ñ?ообÑ?ение"
 
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../ui/evolution-mail-message.xml.h:103
 msgid "_Find in Message..."
 msgstr "_Ð?оиÑ?к в Ñ?ообÑ?ении..."
 
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:104
 msgid "_Flag Completed"
 msgstr "_Ð?Ñ?меÑ?ка «Ð?авеÑ?Ñ?ено»"
 
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:106
 msgid "_Go To"
 msgstr "Ð?е_Ñ?ейÑ?и к"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Important"
 msgstr "_Ð?ажное"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Inline"
 msgstr "Ð?_Ñ?Ñ?Ñ?оенное"
 
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Junk"
 msgstr "_Спам"
 
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Load Images"
 msgstr "_Ð?агÑ?Ñ?зиÑ?Ñ? изобÑ?ажениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Message Source"
 msgstr "_Ð?Ñ?Ñ?однÑ?й Ñ?екÑ?Ñ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Next Message"
 msgstr "_СледÑ?Ñ?Ñ?емÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:115
 msgid "_Normal Size"
 msgstr "Ð?бÑ?Ñ?нÑ?й Ñ?азмеÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Not Junk"
 msgstr "_Ð?е Ñ?пам"
 
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:117
 msgid "_Open in New Window"
 msgstr "_Ð?Ñ?кÑ?Ñ?Ñ?Ñ? в новом окне"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Previous Message"
 msgstr "_Ð?Ñ?едÑ?дÑ?Ñ?емÑ? Ñ?ообÑ?ениÑ?"
 
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Quoted"
 msgstr "_ЦиÑ?иÑ?ование"
 
 #. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Read"
 msgstr "_ЧÑ?ение"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Save Message..."
 msgstr "_СоÑ?Ñ?аниÑ?Ñ? Ñ?ообÑ?ение..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Undelete Message"
 msgstr "Ð?_оÑ?Ñ?Ñ?ановиÑ?Ñ? Ñ?ообÑ?ение"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:126
 msgid "_Unread"
 msgstr "_Ð?епÑ?оÑ?иÑ?ано"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Zoom"
 msgstr "_Ð?аÑ?Ñ?Ñ?аб"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Zoom In"
 msgstr "У_велиÑ?иÑ?Ñ?"
 
@@ -22919,11 +21833,11 @@ msgid "With _Status"
 msgstr "С _Ñ?оÑ?Ñ?оÑ?нием"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:428
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:430
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:432
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:771
 msgid "UTC"
 msgstr "UTC"
 
@@ -22953,19 +21867,19 @@ msgstr ""
 "Ñ?аÑ?овой поÑ?Ñ?.\n"
 "Ð?Ñ?полÑ?зÑ?йÑ?е пÑ?авÑ?Ñ? кнопкÑ? длÑ? Ñ?менÑ?Ñ?ениÑ? облаÑ?Ñ?и."
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "Ð?оллекÑ?иÑ?"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:356
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ð?пÑ?еделиÑ?Ñ? обзоÑ?Ñ? длÑ? %s"
 
+#: ../widgets/menus/gal-define-views-dialog.c:364
 #: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
 msgid "Define Views"
 msgstr "Ð?пÑ?еделиÑ?Ñ? обзоÑ?Ñ?"
 
@@ -22975,17 +21889,16 @@ msgid "Define Views for \"%s\""
 msgstr "Ð?пÑ?еделиÑ?Ñ? обзоÑ?Ñ? длÑ? «%s»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "ТаблиÑ?а"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "Ð?Ñ?имеÑ?"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:281
 msgid "Save Current View"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?екÑ?Ñ?ий обзоÑ?"
 
@@ -22998,17 +21911,17 @@ msgid "_Replace existing view"
 msgstr "_Ð?амениÑ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий обзоÑ?"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
+#: ../widgets/menus/gal-view-instance.c:580
+#: ../widgets/menus/gal-view-menus.c:365
 msgid "Custom View"
 msgstr "Ð?ид полÑ?зоваÑ?елÑ?"
 
-#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-instance.c:581
 msgid "Save Custom View"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? паÑ?амеÑ?Ñ?Ñ? обзоÑ?а"
 
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
+#: ../widgets/menus/gal-view-instance.c:585
+#: ../widgets/menus/gal-view-menus.c:388
 msgid "Define Views..."
 msgstr "РежимÑ? пÑ?оÑ?моÑ?Ñ?а..."
 
@@ -23016,32 +21929,32 @@ msgstr "РежимÑ? пÑ?оÑ?моÑ?Ñ?а..."
 msgid "C_urrent View"
 msgstr "Тек_Ñ?Ñ?ий вид"
 
-#: ../widgets/menus/gal-view-menus.c:328
+#: ../widgets/menus/gal-view-menus.c:327
 #, c-format
 msgid "Select View: %s"
 msgstr "Ð?Ñ?боÑ? обзоÑ?а: %s"
 
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-menus.c:370
 msgid "Current view is a customized view"
 msgstr "ТекÑ?Ñ?ий обзоÑ? наÑ?Ñ?Ñ?оен полÑ?зоваÑ?елем"
 
-#: ../widgets/menus/gal-view-menus.c:377
+#: ../widgets/menus/gal-view-menus.c:374
 msgid "Save Custom View..."
 msgstr "СоÑ?Ñ?аниÑ?Ñ? вид полÑ?зоваÑ?елÑ?..."
 
-#: ../widgets/menus/gal-view-menus.c:382
+#: ../widgets/menus/gal-view-menus.c:379
 msgid "Save current custom view"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?екÑ?Ñ?ий обзоÑ?"
 
-#: ../widgets/menus/gal-view-menus.c:396
+#: ../widgets/menus/gal-view-menus.c:393
 msgid "Create or edit views"
 msgstr "СоздаÑ?Ñ? или наÑ?Ñ?Ñ?оиÑ?Ñ? обзоÑ?"
 
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "ФабÑ?ика"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:103
 msgid "Define New View"
 msgstr "Ð?пÑ?еделиÑ?Ñ? новÑ?й обзоÑ?"
 
@@ -23057,64 +21970,168 @@ msgstr "Тип обзоÑ?а"
 msgid "Type of view:"
 msgstr "Тип обзоÑ?а:"
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "Ð?анелÑ? вложений"
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "Ð?ложенное Ñ?ообÑ?ение"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment-store.c:636
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+msgid "A load operation is already in progress"
+msgstr "Ð?агÑ?Ñ?зка Ñ?же идÑ?Ñ?"
+
+#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+msgid "A save operation is already in progress"
+msgstr "СоÑ?Ñ?анение Ñ?же идÑ?Ñ?"
+
+#: ../widgets/misc/e-attachment.c:1923
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ð?е Ñ?далоÑ?Ñ? загÑ?Ñ?зиÑ?Ñ? «%s»"
+
+#: ../widgets/misc/e-attachment.c:1926
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? загÑ?Ñ?зиÑ?Ñ? вложение"
+
+#: ../widgets/misc/e-attachment.c:2190
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? «%s»"
+
+#: ../widgets/misc/e-attachment.c:2193
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ? вложение"
+
+#: ../widgets/misc/e-attachment.c:2635
+msgid "Attachment contents not loaded"
+msgstr "СодеÑ?жимое вложениÑ? не загÑ?Ñ?жено"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
+#: ../widgets/misc/e-attachment.c:2712
 #, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? Ñ?айл %s: %s"
+msgid "Could not save '%s'"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? «%s»"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
+#: ../widgets/misc/e-attachment.c:2715
 #, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Ð?е Ñ?далоÑ?Ñ? вложиÑ?Ñ? Ñ?айл %s: не обÑ?Ñ?нÑ?й Ñ?айл"
+msgid "Could not save the attachment"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? Ñ?оÑ?Ñ?аниÑ?Ñ? вложение"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "СвойÑ?Ñ?ва вложениÑ?"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "Ð?мÑ? Ñ?айла:"
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "_Ð?мÑ? Ñ?айла:"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
 msgstr "Тип MIME:"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "Ð?Ñ?едполагаÑ?Ñ? авÑ?омаÑ?иÑ?еÑ?кое оÑ?обÑ?ажение вложениÑ?"
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "Ð?е Ñ?даÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? как Ñ?он"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? вложение"
+msgstr[1] "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? вложениÑ?"
+msgstr[2] "Ð?е Ñ?далоÑ?Ñ? оÑ?пÑ?авиÑ?Ñ? вложениÑ?"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "_Ð?Ñ?пÑ?авиÑ?Ñ? к..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+msgid "Send the selected attachments somewhere"
+msgstr "Ð?Ñ?пÑ?авиÑ?Ñ? вÑ?деленнÑ?е вложениÑ? кÑ?да-либо"
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "Ð?агÑ?Ñ?зка"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "СоÑ?Ñ?анение"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "СкÑ?Ñ?Ñ?Ñ? панелÑ? _вложений"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "Ð?оказаÑ?Ñ? панелÑ? _вложений"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "Ð?обавиÑ?Ñ? вложение"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "Ð?_ложиÑ?Ñ?"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "СоÑ?Ñ?анениÑ?Ñ? вложение"
+msgstr[1] "СоÑ?Ñ?анениÑ?Ñ? вложениÑ?"
+msgstr[2] "СоÑ?Ñ?анениÑ?Ñ? вложениÑ?"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "С_оÑ?Ñ?аниÑ?Ñ? вÑ?е"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "_Ð?обавиÑ?Ñ? вложение..."
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? в пÑ?огÑ?амме «%s»"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Ð?Ñ?кÑ?Ñ?Ñ?Ñ? Ñ?Ñ?о вложение в %s"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "Ð?алендаÑ?Ñ? меÑ?Ñ?Ñ?а"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3641
-#: ../widgets/text/e-text.c:3642
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "ЦвеÑ? заполнениÑ?"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3648
-#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3656
-#: ../widgets/text/e-text.c:3657
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "ЦвеÑ? заполнениÑ?"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3663
-#: ../widgets/text/e-text.c:3664
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "Ð?Ñ?нкÑ?иÑ? заполнениÑ?"
 
@@ -23138,26 +22155,25 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:1004
+#: ../widgets/misc/e-canvas-vbox.c:89 ../widgets/misc/e-reflow.c:1414
+#: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "Ð?инималÑ?наÑ? Ñ?иÑ?ина"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1005
+#: ../widgets/misc/e-canvas-vbox.c:90 ../widgets/misc/e-reflow.c:1415
+#: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "Ð?инималÑ?наÑ? Ñ?иÑ?ина"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
+#: ../widgets/misc/e-cell-date-edit.c:296
 msgid "Now"
 msgstr "СейÑ?аÑ?"
 
@@ -23166,7 +22182,7 @@ msgstr "СейÑ?аÑ?"
 msgid "The time must be in the format: %s"
 msgstr "Ð?Ñ?емÑ? должно бÑ?Ñ?Ñ? в Ñ?оÑ?маÑ?е: %s"
 
-#: ../widgets/misc/e-cell-percent.c:77
+#: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ð?наÑ?ение пÑ?оÑ?енÑ?а должно бÑ?Ñ?Ñ? междÑ? 0 и 100, вклÑ?Ñ?иÑ?елÑ?но"
 
@@ -23265,149 +22281,93 @@ msgstr "Ð?Ñ?Ñ?гаÑ?..."
 msgid "Ch_aracter Encoding"
 msgstr "Ð?о_диÑ?овка Ñ?имволов"
 
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:295
 msgid "Date and Time"
 msgstr "Ð?аÑ?а и вÑ?емÑ?"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:315
 msgid "Text entry to input date"
 msgstr "Ð?оле длÑ? Ñ?екÑ?Ñ?ового ввода даÑ?Ñ?"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:337
 msgid "Click this button to show a calendar"
 msgstr "Ð?ажмиÑ?е Ñ?Ñ?Ñ? кнопкÑ? длÑ? оÑ?обÑ?ажениÑ? календаÑ?Ñ?"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:379
 msgid "Drop-down combination box to select time"
 msgstr "Ð?Ñ?падаÑ?Ñ?ий Ñ?пиÑ?ок длÑ? вÑ?боÑ?а вÑ?емени"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:455
 msgid "No_w"
 msgstr "Сей_Ñ?аÑ?"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:461
 msgid "_Today"
 msgstr "_СегоднÑ?"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#: ../widgets/misc/e-dateedit.c:1583
 msgid "Invalid Date Value"
 msgstr "Ð?евеÑ?ное знаÑ?ение даÑ?Ñ?"
 
-#: ../widgets/misc/e-dateedit.c:1666
+#: ../widgets/misc/e-dateedit.c:1613
 msgid "Invalid Time Value"
 msgstr "Ð?евеÑ?ное знаÑ?ение вÑ?емени"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "РаÑ?Ñ?иÑ?еннÑ?й"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "РаÑ?Ñ?иÑ?ен ли Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "ТекÑ?Ñ? меÑ?ки Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? подÑ?еÑ?кивание"
-
-#: ../widgets/misc/e-expander.c:199
-msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr ""
-"Ð?Ñ?ли Ñ?Ñ?Ñ?ановлено, подÑ?еÑ?кивание в Ñ?екÑ?Ñ?е ознаÑ?аеÑ?, Ñ?Ñ?о Ñ?ледÑ?Ñ?Ñ?ий Ñ?имвол "
-"бÑ?деÑ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? как мнемониÑ?еÑ?кий клавиаÑ?Ñ?Ñ?нÑ?й Ñ?Ñ?коÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во междÑ? меÑ?кой и доÑ?еÑ?ним Ñ?леменÑ?ом"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "Ð?иджеÑ? меÑ?ки"
-
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "Ð?иджеÑ?, оÑ?обÑ?ажаемÑ?й на меÑ?Ñ?е обÑ?Ñ?ной меÑ?ки Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "РазмеÑ? Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "РазмеÑ? Ñ?Ñ?Ñ?елки Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во индикаÑ?оÑ?а"
-
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "Ð?Ñ?оÑ?Ñ?Ñ?анÑ?Ñ?во вокÑ?Ñ?г Ñ?Ñ?Ñ?елки Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
-
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:125 ../widgets/misc/e-filter-bar.c:180
-#: ../widgets/misc/e-filter-bar.c:308 ../widgets/misc/e-filter-bar.c:750
+#: ../widgets/misc/e-filter-bar.c:123 ../widgets/misc/e-filter-bar.c:178
+#: ../widgets/misc/e-filter-bar.c:306 ../widgets/misc/e-filter-bar.c:737
 msgid "Advanced Search"
 msgstr "РаÑ?Ñ?иÑ?еннÑ?й поиÑ?к"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:231
+#: ../widgets/misc/e-filter-bar.c:229
 msgid "Save Search"
 msgstr "СоÑ?Ñ?аниÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?Ñ? поиÑ?ка"
 
-#: ../widgets/misc/e-filter-bar.c:268
+#: ../widgets/misc/e-filter-bar.c:266
 msgid "_Searches"
 msgstr "_Ð?оиÑ?ки"
 
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:268
 msgid "Searches"
 msgstr "Ð?оиÑ?ки"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
+#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:110
 msgid "_Save Search..."
 msgstr "_СоÑ?Ñ?аниÑ?Ñ? Ñ?езÑ?лÑ?Ñ?аÑ?Ñ? поиÑ?ка..."
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:111
 msgid "_Edit Saved Searches..."
 msgstr "_Ð?змениÑ?Ñ? Ñ?оÑ?Ñ?аненнÑ?е Ñ?езÑ?лÑ?Ñ?аÑ?Ñ? поиÑ?ка..."
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:112
 msgid "_Advanced Search..."
 msgstr "_РаÑ?Ñ?иÑ?еннÑ?й поиÑ?к..."
 
 # This translation and below will be used
 # in search bar in main window, so it should
 # be shorter
-#: ../widgets/misc/e-filter-bar.h:107
+#: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "вÑ?ей поÑ?Ñ?е"
 
-#: ../widgets/misc/e-filter-bar.h:108
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "Current Account"
 msgstr "Ñ?Ñ?Ñ?Ñ?ной запиÑ?и"
 
-#: ../widgets/misc/e-filter-bar.h:109
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "Ñ?екÑ?Ñ?ей папке"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "Ñ?ообÑ?ении"
-
-#: ../widgets/misc/e-image-chooser.c:169
+#: ../widgets/misc/e-image-chooser.c:168
 msgid "Choose Image"
 msgstr "Ð?Ñ?беÑ?иÑ?е изобÑ?ажение"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "Ð?аÑ?Ñ?а миÑ?а"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -23423,102 +22383,101 @@ msgstr "Ð? Ñ?еÑ?и"
 msgid "The button state is online"
 msgstr "СоÑ?Ñ?оÑ?ние кнопки - «в Ñ?еÑ?и»"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "СинÑ?Ñ?онизиÑ?оваÑ?Ñ? Ñ?:"
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "СинÑ?Ñ?онизиÑ?оваÑ?Ñ? лиÑ?нÑ?е запиÑ?и:"
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "Ð?аÑ?егоÑ?ии:"
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
+#: ../widgets/misc/e-reflow.c:1435 ../widgets/misc/e-reflow.c:1436
 msgid "Empty message"
 msgstr "Ð?Ñ?Ñ?Ñ?ое Ñ?ообÑ?ение"
 
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
 msgid "Reflow model"
 msgstr "Reflow model"
 
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Column width"
 msgstr "ШиÑ?ина Ñ?Ñ?олбÑ?а"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
+#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:1021
 msgid "Search"
 msgstr "Ð?оиÑ?к"
 
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
+#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
+#: ../widgets/misc/e-search-bar.c:505
 msgid "Click here to change the search type"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? измениÑ?Ñ? Ñ?ип поиÑ?ка"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:637
 msgid "_Search"
 msgstr "Ð?_оиÑ?к"
 
-#: ../widgets/misc/e-search-bar.c:609
+#: ../widgets/misc/e-search-bar.c:643
 msgid "_Find Now"
 msgstr "_Ð?айÑ?и Ñ?ейÑ?аÑ?"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:644
 msgid "_Clear"
 msgstr "Ð?_Ñ?иÑ?Ñ?иÑ?Ñ?"
 
-#: ../widgets/misc/e-search-bar.c:865
+#: ../widgets/misc/e-search-bar.c:899
 msgid "Item ID"
 msgstr "ID Ñ?леменÑ?а"
 
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3563
-#: ../widgets/text/e-text.c:3564
+#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3556
 msgid "Text"
 msgstr "ТекÑ?Ñ?"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
+#: ../widgets/misc/e-search-bar.c:1053
 msgid "Sho_w: "
 msgstr "Ð?о_казаÑ?Ñ?: "
 
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
+#: ../widgets/misc/e-search-bar.c:1072
 msgid "Sear_ch: "
 msgstr "_Ð?Ñ?каÑ?Ñ?: "
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
+#: ../widgets/misc/e-search-bar.c:1088
 msgid " i_n "
 msgstr " в "
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "СÑ?Ñ?ока Ñ? кÑ?Ñ?Ñ?оÑ?ом"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "СÑ?олбеÑ? Ñ? кÑ?Ñ?Ñ?оÑ?ом"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "СоÑ?Ñ?иÑ?овÑ?ик"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "Режим вÑ?делениÑ?"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "Режим кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:519
 msgid "When de_leted:"
 msgstr "Ð?огда Ñ?да_лено:"
 
@@ -23542,19 +22501,19 @@ msgstr "<b>Ð?Ñ?Ñ?леживание Ñ?оÑ?Ñ?оÑ?ниÑ?</b>"
 msgid "A_uto-delete sent item"
 msgstr "Ð?_вÑ?омаÑ?иÑ?еÑ?ки Ñ?далÑ?Ñ?Ñ? оÑ?пÑ?авленнÑ?е Ñ?леменÑ?Ñ?"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Creat_e a sent item to track information"
 msgstr "_СоздаÑ?Ñ? оÑ?пÑ?авленнÑ?й Ñ?леменÑ? длÑ? оÑ?Ñ?леживаниÑ? инÑ?оÑ?маÑ?ии"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.glade.h:7
 msgid "Deli_vered and opened"
 msgstr "Ð?оÑ?Ñ?а_влено и оÑ?кÑ?Ñ?Ñ?о"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.glade.h:8
 msgid "Gene_ral Options"
 msgstr "Ð?бÑ?ие па_Ñ?амеÑ?Ñ?Ñ?"
 
-#: ../widgets/misc/e-send-options.glade.h:10
+#: ../widgets/misc/e-send-options.glade.h:9
 msgid ""
 "None\n"
 "Mail Receipt"
@@ -23562,7 +22521,7 @@ msgstr ""
 "Ð?еÑ?\n"
 "СообÑ?ение о доÑ?Ñ?авке"
 
-#: ../widgets/misc/e-send-options.glade.h:12
+#: ../widgets/misc/e-send-options.glade.h:11
 msgid ""
 "Normal\n"
 "Proprietary\n"
@@ -23578,15 +22537,15 @@ msgstr ""
 "СовеÑ?Ñ?енно Ñ?екÑ?еÑ?ное\n"
 "Ð?Ñ?клÑ?Ñ?иÑ?елÑ?но длÑ? ваÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.glade.h:17
 msgid "R_eply requested"
 msgstr "_Ð?апÑ?оÑ?ен оÑ?веÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.glade.h:19
 msgid "Sta_tus Tracking"
 msgstr "Ð?_Ñ?Ñ?леживание Ñ?оÑ?Ñ?оÑ?ниÑ?"
 
-#: ../widgets/misc/e-send-options.glade.h:21
+#: ../widgets/misc/e-send-options.glade.h:20
 msgid ""
 "Undefined\n"
 "High\n"
@@ -23598,30 +22557,34 @@ msgstr ""
 "СÑ?андаÑ?Ñ?нÑ?й\n"
 "Ð?изкий"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
 msgid "When acce_pted:"
 msgstr "_Ð?Ñ?и полÑ?Ñ?ении:"
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
 msgid "When co_mpleted:"
 msgstr "Ð?Ñ?и _завеÑ?Ñ?ении:"
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.glade.h:26
 msgid "When decli_ned:"
 msgstr "Ð?Ñ?и _оÑ?казе:"
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.glade.h:27
 msgid "Wi_thin"
 msgstr "_Ð? Ñ?еÑ?ении"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.glade.h:28
 msgid "_After:"
 msgstr "_Ð?оÑ?ле:"
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.glade.h:29
 msgid "_All information"
 msgstr "_Ð?Ñ?е Ñ?ведениÑ?"
 
+#: ../widgets/misc/e-send-options.glade.h:30
+msgid "_Classification:"
+msgstr "_Ð?лаÑ?Ñ?иÑ?икаÑ?иÑ?:"
+
 #. To translators: This means Delay the message delivery for some time
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delay message delivery"
@@ -23648,46 +22611,26 @@ msgid "_When opened:"
 msgstr "_Ð?огда оÑ?кÑ?Ñ?Ñ?о:"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
+#: ../widgets/misc/e-task-widget.c:251
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
+#: ../widgets/misc/e-task-widget.c:257
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% вÑ?полнено)"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "Ð?ажмиÑ?е, Ñ?Ñ?обÑ? пеÑ?ейÑ?и по Ñ?Ñ?Ñ?лке"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "Ð?змениÑ?Ñ? оÑ?новной Ñ?пикок каÑ?егоÑ?ий..."
-
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "ЭлеменÑ?(Ñ?) пÑ?инадлежаÑ?Ñ? Ñ?ледÑ?Ñ?Ñ?им _каÑ?егоÑ?иÑ?м:"
-
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "_Ð?оÑ?Ñ?Ñ?пнÑ?е каÑ?егоÑ?ии:"
-
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "каÑ?егоÑ?ии"
-
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "вÑ?падаÑ?Ñ?ий Ñ?пиÑ?ок"
 
-#: ../widgets/table/e-cell-date.c:63
-msgid "%l:%M %p"
-msgstr "%k:%M"
-
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "Ð?Ñ?бÑ?аннÑ?й Ñ?Ñ?олбеÑ?"
@@ -23700,23 +22643,23 @@ msgstr "СÑ?олбеÑ?, имеÑ?Ñ?ий Ñ?окÑ?Ñ?"
 msgid "Unselected Column"
 msgstr "Ð?евÑ?деленнÑ?й Ñ?Ñ?олбеÑ?"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1788
 msgid "Strikeout Column"
 msgstr "Ð?еÑ?еÑ?Ñ?Ñ?кнÑ?Ñ?Ñ?й Ñ?Ñ?олбеÑ?"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1795
 msgid "Underline Column"
 msgstr "Ð?одÑ?Ñ?Ñ?кнÑ?Ñ?Ñ?й Ñ?Ñ?олбеÑ?"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1802
 msgid "Bold Column"
 msgstr "СÑ?олбеÑ? Ñ? жиÑ?нÑ?м Ñ?екÑ?Ñ?ом"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1809
 msgid "Color Column"
 msgstr "ЦвеÑ?ной Ñ?Ñ?олбеÑ?"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1823
 msgid "BG Color Column"
 msgstr "ЦвеÑ? Ñ?она Ñ?Ñ?олбÑ?а"
 
@@ -23740,12 +22683,12 @@ msgstr "Ð?ез Ñ?оÑ?Ñ?иÑ?овки"
 msgid "No grouping"
 msgstr "Ð?ез гÑ?Ñ?ппиÑ?ованиÑ?"
 
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:642
 #: ../widgets/table/e-table-config.glade.h:11
 msgid "Show Fields"
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? полÑ?"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:663
 msgid "Available Fields"
 msgstr "Ð?оÑ?Ñ?Ñ?пнÑ?е полÑ?"
 
@@ -23754,7 +22697,7 @@ msgid "A_vailable Fields:"
 msgstr "_Ð?оÑ?Ñ?Ñ?пнÑ?е полÑ?:"
 
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Ascending"
 msgstr "Ð?озÑ?аÑ?Ñ?аÑ?Ñ?аÑ?"
 
@@ -23767,7 +22710,7 @@ msgid "Clear _All"
 msgstr "Ð?Ñ?иÑ?Ñ?иÑ?Ñ? _вÑ?е"
 
 #: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Descending"
 msgstr "УбÑ?ваÑ?Ñ?аÑ?"
 
@@ -23827,21 +22770,7 @@ msgstr "_Ð?Ñ?обÑ?ажаÑ?Ñ? Ñ?Ñ?и полÑ? в поÑ?Ñ?дке:"
 msgid "_Sort..."
 msgstr "_СоÑ?Ñ?иÑ?оваÑ?Ñ?..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "Ð?од Ñ?еÑ?нологии DnD"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "Ð?олнÑ?й заголовок"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?олбеÑ?..."
 
@@ -23857,7 +22786,7 @@ msgstr ""
 "ЧÑ?обÑ? добавиÑ?Ñ? Ñ?Ñ?олбеÑ? в ваÑ?Ñ? Ñ?аблиÑ?Ñ?,\n"
 "пеÑ?еÑ?аÑ?иÑ?е его в нÑ?жное меÑ?Ñ?о."
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
@@ -23865,7 +22794,7 @@ msgstr[0] "%s : %s (%d Ñ?леменÑ?)"
 msgstr[1] "%s : %s (%d Ñ?лемена)"
 msgstr[2] "%s : %s (%d Ñ?леменÑ?ов)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -23873,297 +22802,293 @@ msgstr[0] "%s (%d Ñ?леменÑ?)"
 msgstr[1] "%s (%d Ñ?леменÑ?а)"
 msgstr[2] "%s (%d Ñ?леменÑ?ов)"
 
-#: ../widgets/table/e-table-group-container.c:927
-#: ../widgets/table/e-table-group-container.c:928
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "Ð?лÑ?Ñ?еÑ?наÑ?ивнÑ?е Ñ?веÑ?а Ñ?Ñ?Ñ?оки"
 
-#: ../widgets/table/e-table-group-container.c:934
-#: ../widgets/table/e-table-group-container.c:935
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Ð?оÑ?изонÑ?алÑ?наÑ? Ñ?аблиÑ?а длÑ? Ñ?иÑ?ованиÑ?"
 
-#: ../widgets/table/e-table-group-container.c:941
-#: ../widgets/table/e-table-group-container.c:942
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Ð?еÑ?Ñ?икалÑ?наÑ? Ñ?аблиÑ?а длÑ? Ñ?иÑ?ованиÑ?"
 
-#: ../widgets/table/e-table-group-container.c:948
-#: ../widgets/table/e-table-group-container.c:949
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "ФокÑ?Ñ? Ñ?иÑ?ованиÑ?"
 
-#: ../widgets/table/e-table-group-container.c:955
-#: ../widgets/table/e-table-group-container.c:956
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "Режим кÑ?Ñ?Ñ?оÑ?а"
 
-#: ../widgets/table/e-table-group-container.c:962
-#: ../widgets/table/e-table-group-container.c:963
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "Ð?оделÑ? вÑ?делениÑ?"
 
-#: ../widgets/table/e-table-group-container.c:969
-#: ../widgets/table/e-table-group-container.c:970
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3324 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "Ð?оÑ?ог длинÑ?"
 
-#: ../widgets/table/e-table-group-container.c:976
-#: ../widgets/table/e-table-group-container.c:977
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3331 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "Ð?бÑ?аÑ? вÑ?Ñ?оÑ?а Ñ?Ñ?Ñ?оки"
 
-#: ../widgets/table/e-table-group-container.c:983
-#: ../widgets/table/e-table-group-container.c:984
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
 #: ../widgets/table/e-table-group-leaf.c:656
 #: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "Ð?амоÑ?ожена"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1449
 msgid "Customize Current View"
 msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? Ñ?екÑ?Ñ?ий вид"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1469
 msgid "Sort _Ascending"
 msgstr "Ð?озÑ?аÑ?_Ñ?аÑ?Ñ?аÑ? Ñ?оÑ?Ñ?иÑ?овка"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Descending"
 msgstr "УбÑ?в_аÑ?Ñ?аÑ? Ñ?оÑ?Ñ?иÑ?овка"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "_Unsort"
 msgstr "_Ð?ез Ñ?оÑ?Ñ?иÑ?овки"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1473
 msgid "Group By This _Field"
 msgstr "Ð?Ñ?Ñ?ппиÑ?оваÑ?Ñ? по Ñ?Ñ?омÑ? _полÑ?"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By _Box"
 msgstr "_Ð?Ñ?Ñ?ппиÑ?оваÑ?Ñ? по Ñ?Ñ?икÑ?"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1476
 msgid "Remove This _Column"
 msgstr "УбÑ?аÑ?Ñ? Ñ?Ñ?оÑ? Ñ?Ñ?ол_беÑ?"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Add a C_olumn..."
 msgstr "Ð?обавиÑ?Ñ? Ñ?Ñ?олб_еÑ?..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1479
 msgid "A_lignment"
 msgstr "Ð?Ñ?Ñ?_авнивание"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "B_est Fit"
 msgstr "Ð?Ñ?Ñ?_Ñ?ее заполнение"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "Format Column_s..."
 msgstr "ФоÑ?маÑ? Ñ?Ñ?олбÑ?о_в..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1483
 msgid "Custo_mize Current View..."
 msgstr "Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? Ñ?е_кÑ?Ñ?ий вид..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1539
 msgid "_Sort By"
 msgstr "_СоÑ?Ñ?иÑ?оваÑ?Ñ? по"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1557
 msgid "_Custom"
 msgstr "_Ð?Ñ?Ñ?гой"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "Ð?пиÑ?ание Ñ?Ñ?иÑ?Ñ?а"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "Ð?нÑ?оÑ?маÑ?иÑ? по Ñ?оÑ?Ñ?иÑ?овке"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Ð?еÑ?ево"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "Ð?аголовок Ñ?аблиÑ?Ñ?"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "Ð?оделÑ? Ñ?аблиÑ?Ñ?"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "СÑ?Ñ?ока Ñ? кÑ?Ñ?Ñ?оÑ?ом"
 
-#: ../widgets/table/e-table.c:3338 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "Ð?нÑ?оÑ?маÑ?иÑ? по Ñ?оÑ?Ñ?иÑ?овке"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "Ð?Ñ?егда иÑ?каÑ?Ñ?"
 
-#: ../widgets/table/e-table.c:3345
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? Ñ?елÑ?ок длÑ? добавлениÑ?"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "Ð?еÑ?ево"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Ð?дапÑ?еÑ? Ñ?аблиÑ? ETree"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "РеÑ?Ñ?о-вид"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "Ð?Ñ?обÑ?ажаÑ?Ñ? линии и Ñ?аÑ?Ñ?иÑ?иÑ?ели +/-."
 
-#: ../widgets/text/e-text.c:2733
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "РазмеÑ? Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "РазмеÑ? Ñ?Ñ?Ñ?елки Ñ?аÑ?Ñ?иÑ?иÑ?елÑ?"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "Ð?еÑ?одÑ? ввода"
 
-#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "Ð?Ñ?оÑ?еÑ?Ñ?оÑ? Ñ?обÑ?Ñ?ий"
 
-#: ../widgets/text/e-text.c:3570 ../widgets/text/e-text.c:3571
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "Ð?иÑ?нÑ?й"
 
-#: ../widgets/text/e-text.c:3577 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "Ð?еÑ?еÑ?Ñ?Ñ?кнÑ?Ñ?Ñ?й"
 
-#: ../widgets/text/e-text.c:3584 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "ЯкоÑ?Ñ?"
 
-#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "Ð?Ñ?Ñ?авнивание"
 
-#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "ШиÑ?ина оÑ?Ñ?еÑ?ениÑ?"
 
-#: ../widgets/text/e-text.c:3606 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "Ð?Ñ?Ñ?оÑ?а оÑ?Ñ?еÑ?ениÑ?"
 
-#: ../widgets/text/e-text.c:3613 ../widgets/text/e-text.c:3614
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "Ð?Ñ?Ñ?еÑ?ение"
 
-#: ../widgets/text/e-text.c:3620 ../widgets/text/e-text.c:3621
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "Ð?аполнÑ?Ñ?Ñ? облаÑ?Ñ?Ñ? оÑ?Ñ?еÑ?ениÑ?"
 
-#: ../widgets/text/e-text.c:3627 ../widgets/text/e-text.c:3628
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "СмеÑ?ение по оÑ?и X"
 
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "СмеÑ?ение по оÑ?и Y"
 
-#: ../widgets/text/e-text.c:3670 ../widgets/text/e-text.c:3671
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "ШиÑ?ина Ñ?екÑ?Ñ?а"
 
-#: ../widgets/text/e-text.c:3677 ../widgets/text/e-text.c:3678
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "Ð?Ñ?Ñ?оÑ?а Ñ?екÑ?Ñ?а"
 
-#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? многоÑ?оÑ?ие"
 
-#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "Ð?ногоÑ?оÑ?ие"
 
-#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "Ð?еÑ?еноÑ? Ñ?Ñ?Ñ?ок"
 
-#: ../widgets/text/e-text.c:3713 ../widgets/text/e-text.c:3714
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "СимволÑ? Ñ?азÑ?Ñ?ва"
 
-#: ../widgets/text/e-text.c:3720 ../widgets/text/e-text.c:3721
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "Ð?акÑ?ималÑ?ное Ñ?иÑ?ло Ñ?Ñ?Ñ?ок"
 
-#: ../widgets/text/e-text.c:3742 ../widgets/text/e-text.c:3743
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "РиÑ?оваÑ?Ñ? гÑ?аниÑ?Ñ?"
 
-#: ../widgets/text/e-text.c:3749 ../widgets/text/e-text.c:3750
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "Ð?опÑ?Ñ?каÑ?Ñ? Ñ?имволÑ? новой Ñ?Ñ?Ñ?оки"
 
-#: ../widgets/text/e-text.c:3756 ../widgets/text/e-text.c:3757
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "РиÑ?оваÑ?Ñ? Ñ?он"
 
-#: ../widgets/text/e-text.c:3763 ../widgets/text/e-text.c:3764
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "РиÑ?оваÑ?Ñ? кнопки"
 
-#: ../widgets/text/e-text.c:3770 ../widgets/text/e-text.c:3771
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "Ð?озиÑ?иÑ? кÑ?Ñ?Ñ?оÑ?а"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3780
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "Ð?онÑ?екÑ?Ñ? меÑ?ода ввода (IM)"
 
-#: ../widgets/text/e-text.c:3786 ../widgets/text/e-text.c:3787
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "Ð?бÑ?абаÑ?Ñ?ваÑ?Ñ? вÑ?плÑ?ваÑ?Ñ?ие окна"
 
-#~ msgid "Novell Groupwise"
-#~ msgstr "Novell Groupwise"
-
-#~ msgid ""
-#~ "[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
-#~ msgstr "[СекÑ?еÑ?ноÑ?Ñ?Ñ?=Ð?иÑ?ное;Ð?онÑ?иденÑ?иалÑ?но;СекÑ?еÑ?но;СÑ?Ñ?ого Ñ?екÑ?еÑ?но]"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]