[evolution] Updated Serbian translation

From: Miloš Popović <mpopovic src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Serbian translation
Date: Wed, 22 Sep 2010 13:42:05 +0000 (UTC)
commit 6d09dba02b7dfaa982965051fd49d4474603ec70
Author: MiloÅ¡ PopoviÄ? <mpopovic src gnome org>
Date:   Wed Sep 22 15:33:54 2010 +0200

    Updated Serbian translation

 po/sr.po       |12854 +++++++++++++++++++++++++++++---------------------------
 po/sr latin po |12854 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 13122 insertions(+), 12586 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 537f2c4..60e8e15 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -5,28 +5,39 @@
 #
 # Maintainer: Ð?Ð³Ð¾Ñ? Ð?ÐµÑ?Ñ?Ð¾Ñ?Ð¾Ð²Ð¸Ñ? <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by Ð?Ð³Ð¾Ñ? Ð?ÐµÑ?Ñ?Ð¾Ñ?Ð¾Ð²Ð¸Ñ? <igor prevod org>
+# Ð?Ð¸Ð»Ð¾Ñ? Ð?Ð¾Ð¿Ð¾Ð²Ð¸Ñ? <gpopac gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-03-22 17:33+0000\n"
-"PO-Revision-Date: 2010-03-22 21:34+0100\n"
-"Last-Translator: Ð?Ð³Ð¾Ñ? Ð?ÐµÑ?Ñ?Ð¾Ñ?Ð¾Ð²Ð¸Ñ? <igor prevod org>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-08-12 05:37+0000\n"
+"PO-Revision-Date: 2010-09-22 15:01+0200\n"
+"Last-Translator: Ð?Ð¸Ð»Ð¾Ñ? Ð?Ð¾Ð¿Ð¾Ð²Ð¸Ñ? <gpopac gmail com>\n"
+"Language-Team: Serbian <gnom prevod 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=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶Ð°Ð½ Ð¸Ð·Ð¼ÐµÐ½Ð°Ð¼Ð°. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ñ?Ð° Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"Ð?Ð´Ñ?ÐµÑ?Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶Ð°Ð½ Ð¸Ð·Ð¼ÐµÐ½Ð°Ð¼Ð°. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ "
+"Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ñ?Ð° Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? Ñ?Ð° Ð¾Ð²Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼ Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð½Ð¾Ð²Ñ? ÐºÐ°Ñ?Ñ?Ñ? Ñ?Ð° Ð¸Ñ?Ñ?Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? Ñ?Ð° Ð¾Ð²Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼ Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð½Ð¾Ð²Ñ? ÐºÐ°Ñ?Ñ?Ñ? Ñ?Ð° "
+"Ð¸Ñ?Ñ?Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -45,8 +56,14 @@ msgid "Category editor not available."
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð½ÐµÑ?Ð° Ð¸ Ð´Ð° Ð»Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ. Ð?Ðµ Ð·Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð° Ð±Ð¸Ñ?Ð½Ð° Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°Ð¼Ð°; Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ? Ð²ÐµÐ»Ð¸ÐºÐ° Ñ?Ð»Ð¾Ð²Ð° Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð°."
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð½ÐµÑ?Ð° Ð¸ Ð´Ð° Ð»Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ð½Ð°Ñ?Ð¸Ð½ "
+"Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ. Ð?Ðµ Ð·Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð° Ð±Ð¸Ñ?Ð½Ð° Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°Ð¼Ð°; Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ? "
+"Ð²ÐµÐ»Ð¸ÐºÐ° Ñ?Ð»Ð¾Ð²Ð° Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð°."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -57,163 +74,172 @@ msgid "Could not remove address book."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "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. Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐºÐ¸ Ð´Ñ?Ñ?Ð³Ð¸ GroupWise ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?Ñ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð´Ð¾Ð±Ð¸Ð»Ð¸ GroupWise Ñ?ÐµÑ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ?Ð° Ð»Ð¸Ñ?Ð½Ð¸Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°."
+msgid ""
+"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. "
+"Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐºÐ¸ Ð´Ñ?Ñ?Ð³Ð¸ GroupWise ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?Ñ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð´Ð¾Ð±Ð¸Ð»Ð¸ "
+"GroupWise Ñ?ÐµÑ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ?Ð° Ð»Ð¸Ñ?Ð½Ð¸Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? â??{0}â???"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#| msgid "Do not delete"
+msgid "Do _Not Delete"
+msgstr "Ð?Ðµ _Ð±Ñ?Ð¸Ñ?Ð¸"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð²Ð°Ñ?Ñ? {0} Ñ? {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "Ð?Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ GroupWise Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ð½Ð¸Ñ?Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ð¾ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ Ñ?ÐµÐ¼Ð¾Ð¼ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "Ð?Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½ÐµÐºÐµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ð½ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ð´Ð¸Ñ?Ð¸"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸Ð½ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¾ Ð´Ð° Ñ?Ð°Ð´Ð¸."
 
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Ð¡Ð»Ð¸ÐºÐ° ÐºÐ¾Ñ?Ñ? Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?ÐµÐ²ÐµÐ»Ð¸ÐºÐ°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð¾Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ?"
-
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-msgstr "Ð?Ð²Ð°Ñ? LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ð¼Ð¾Ð¶Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? LDAP-Ð° ÐºÐ¾Ñ?Ð° Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¾Ð²Ñ? Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?, Ð¸Ð»Ð¸ Ñ?Ðµ Ð»Ð¾Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½. Ð?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?."
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Ð¡Ð»Ð¸ÐºÐ° ÐºÐ¾Ñ?Ñ? Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?ÐµÐ²ÐµÐ»Ð¸ÐºÐ°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð¾Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ð¸ "
+"Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ?"
 
-# Ð¼Ð°Ð»Ð¾ Ð°Ð¾Ñ?Ð¸Ñ?Ñ?Ð° ;-)
 #: ../addressbook/addressbook.error.xml.h:22
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Ð?Ð²Ð°Ñ? LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ð¼Ð¾Ð¶Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? LDAP-Ð° ÐºÐ¾Ñ?Ð° Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¾Ð²Ñ? "
+"Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?, Ð¸Ð»Ð¸ Ñ?Ðµ Ð»Ð¾Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½. Ð?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ðµ Ð·Ð° "
+"Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?."
+
+# Ð¼Ð°Ð»Ð¾ Ð°Ð¾Ñ?Ð¸Ñ?Ñ?Ð° ;-)
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Ð?Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ñ?Ð²Ð¾Ñ?ÐµÐ½."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?."
 
-#: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr "Ð¡ÐµÑ?Ð²ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ?Ðµ Ð¸Ð»Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ð¸Ð»Ð¸ Ñ?Ðµ Ñ?ÐµÐ³Ð¾Ð²Ð¾ Ð¸Ð¼Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ð½ÐµÑ?Ð¾ Ð¸Ð»Ð¸ Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð° Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Ð¡ÐµÑ?Ð²ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ?Ðµ Ð¸Ð»Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ð¸Ð»Ð¸ Ñ?Ðµ Ñ?ÐµÐ³Ð¾Ð²Ð¾ Ð¸Ð¼Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ð½ÐµÑ?Ð¾ Ð¸Ð»Ð¸ "
+"Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð° Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°."
 
 # Ð¼Ð°Ð»Ð¾ Ð°Ð¾Ñ?Ð¸Ñ?Ñ?Ð° ;-)
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Ð?Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ð?Ð²Ð°Ñ? Ñ?ÐµÑ?Ð²ÐµÑ? Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° LDAPv3 Ñ?ÐµÐ¼Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "Ð?ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð°."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ?"
 
-#: ../addressbook/addressbook.error.xml.h:31
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "Ð?Ð¾ÐºÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð¸Ð· Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ? Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ð»Ð¸ Ñ?Ðµ Ð¾Ð½ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¸Ð· Ð¸Ð·Ð²Ð¾Ñ?Ð°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð°Ðº Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°?"
-
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-msgstr "Ð?Ð¾Ð²ÐµÐ·Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð° Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? Ñ?Ð°Ð´Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð?Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð±Ñ?Ð´Ðµ Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ?"
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Ð?Ð¾ÐºÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð´Ð° Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð¸Ð· Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ? Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ð»Ð¸ Ñ?Ðµ Ð¾Ð½ Ð½Ðµ "
+"Ð¼Ð¾Ð¶Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¸Ð· Ð¸Ð·Ð²Ð¾Ñ?Ð°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð°Ðº Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð°?"
 
 #: ../addressbook/addressbook.error.xml.h:33
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"Ð?Ð¾Ð²ÐµÐ·Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð° Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? "
+"Ñ?Ð°Ð´Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð?Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð±Ñ?Ð´Ðµ Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ?"
+
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Ð?ÐµÐ¼Ð°Ñ?Ðµ Ð´Ð¾Ð²Ð¾Ñ?Ð½Ð° Ð¾Ð²Ð»Ð°Ñ?Ñ?ÐµÑ?Ð° Ð´Ð° Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð· Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°."
 
-#: ../addressbook/addressbook.error.xml.h:34
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð¾Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¾Ð²Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ?"
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:36
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸ Ð·Ð° {0} Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸ Ð´Ð¾Ðº Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ."
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Ð?Ð´Ð±Ð°Ñ?Ð¸"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "_Ð?Ðµ Ñ?Ñ?Ð²Ð°Ñ?"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "Ð?_Ñ?Ð¾Ð¼ÐµÐ½Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°ÐºÐ¾ ÐºÐ°ÐºÐ¾ Ñ?Ðµ"
 
-# bug: we don't want this translated
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42
-#: ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-# bug: we don't want this translatable
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ñ?ÐºÐ¾Ð³ Ð±Ð»Ð¾ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð° Ð¿Ð¸Ð»Ð¾Ñ?Ð°"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "_Ð?Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ð°:"
 
@@ -224,264 +250,238 @@ msgstr "_Ð?Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ð°:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986
-#: ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:123
 msgid "Birthday"
 msgstr "_Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#| msgid "Blog"
+msgid "Blog:"
+msgstr "Ð?Ð»Ð¾Ð³:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ð?Ð°_Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408
-#: ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Ð?-Ð¿Ð¾Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "Ð?Ñ?Ð½Ð¾ _Ð¸Ð¼Ðµ..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Ð?Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "Ð?Ð¸Ñ?Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Ð¡Ð»Ð¸ÐºÐ°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Ð?Ñ?Ð·Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Ð?Ð¾Ñ?Ð°Ð¾"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð°Ð½Ð¾Ð²Ð°Ñ?Ð°"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Ð Ð°Ð·Ð½Ð¾"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Ð?Ð°_Ð´Ð¸Ð¼Ð°Ðº:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Ð?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ðµ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Ð?Ð¸Ð´ÐµÐ¾ Ñ?Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Ð?ÐµÐ± Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Ð?ÐµÐ± Ð»Ð¾Ð³:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#| msgid "Web Addresses"
+msgid "Web addresses"
+msgstr "Ð?ÐµÐ± Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Ð?Ð¾Ñ?Ð°Ð¾"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Ð?Ð´Ñ?ÐµÑ?Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_Ð?Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#| msgid "Blog"
+msgid "_Blog:"
+msgstr "_Ð?Ð»Ð¾Ð³:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_Ð?Ñ?Ð°Ð´:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "Ð?Ñ?_ÐµÐ´Ñ?Ð·ÐµÑ?Ðµ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_Ð?Ñ?Ð¶Ð°Ð²Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "_Ð?Ð´ÐµÑ?ÐµÑ?Ðµ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "Ð¡Ð¼ÐµÑ?Ñ?Ð¸ _Ð¿Ð¾Ð´:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "Ð¡_Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "_Ð?Ð¸Ñ?Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Ð Ñ?ÐºÐ¾Ð²Ð¾Ð´Ð¸Ð»Ð°Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_Ð?Ð°Ð½Ñ?ÐµÐ»Ð°Ñ?Ð¸Ñ?Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_Ð?Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð±Ñ?Ð¾Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_Ð?Ð°Ð½Ð¸Ð¼Ð°Ñ?Ðµ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "Ð¡_Ñ?Ð¿Ñ?Ñ?Ð¶Ð½Ð¸Ðº:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_Ð ÐµÐ¿Ñ?Ð±Ð»Ð¸ÐºÐ°/Ð¿Ð¾ÐºÑ?Ð°Ñ?Ð¸Ð½Ð°:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Ð?Ð²Ð°Ñ?Ðµ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Ð?Ð¸Ð´ÐµÐ¾ Ñ?Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ?:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "_Ð?ÐµÐ»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð° HTML Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Ð?ÐµÐ± Ð»Ð¾Ð³:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Ð?Ð´Ðµ:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "Ð?Ð¾Ñ?_Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð±Ñ?Ð¾Ñ?:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174
-#: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Ð?Ð¼Ðµ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659
-#: ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Ð?Ð·Ð¼ÐµÐ½Ñ?Ð¸Ð²Ð¾"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -523,7 +523,7 @@ msgid "Skype"
 msgstr "Ð¡ÐºÐ°Ñ?Ð¿"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
@@ -535,45 +535,21 @@ msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 msgid "Error removing contact"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð° ÐºÑ?Ð¸Ð³Ð°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° ÐºÑ?Ð¸Ð³Ð°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Ð?Ðµ Ð½Ð¾Ð²Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð¿Ð¸Ñ?"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Ð?Ð±Ð°Ð²ÐµÐ·Ð½Ð° Ð¿Ð¾Ñ?Ð°"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Ð?Ñ?Ð¾Ð¼ÐµÑ?ÐµÐ½Ð¾"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»Ð¸ÐºÑ? Ð·Ð° Ð¾Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "_Ð?ÐµÐ· Ñ?Ð»Ð¸ÐºÐµ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -581,58 +557,46 @@ msgstr ""
 "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ? Ð½Ð¸Ñ?Ñ? Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ?? Ð¸Ð¼Ð° Ð½ÐµÐ²Ð°Ð¶ÐµÑ?Ð¸ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ?? Ð¸Ð¼Ð° Ð½ÐµÐ²Ð°Ð¶ÐµÑ?Ð¸ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ?? Ñ?Ðµ Ð¿Ñ?Ð°Ð·Ð°Ð½"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Ð?Ñ?Ð·Ð¾ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Ð£Ñ?ÐµÐ´Ð¸ Ð¿Ð¾Ñ?Ð¿Ñ?Ð½Ð¾"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Ð?Ð¼Ðµ Ð¸ Ð¿Ñ?ÐµÐ·Ð¸Ð¼Ðµ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "Ð?-_Ð¿Ð¾Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218
-#: ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Ð¨ÐºÐ¾Ñ?ÐºÐ°"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219
-#: ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ð° EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Ð?Ñ?"
@@ -699,7 +663,7 @@ msgid "_Suffix:"
 msgstr "_Ð¡Ñ?Ñ?Ð¸ÐºÑ?:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
@@ -716,7 +680,7 @@ msgid "_List name:"
 msgstr "Ð?Ð¼Ðµ _Ð»Ð¸Ñ?Ñ?Ðµ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "Ð?Ð·Ð°Ð±_ÐµÑ?Ð¸..."
 
@@ -724,39 +688,27 @@ msgstr "Ð?Ð·Ð°Ð±_ÐµÑ?Ð¸..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ð£ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ? Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ²Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ñ? Ð´Ð¾Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ñ?:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "Ð§Ð»Ð°Ð½Ð¾Ð²Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "_Ð§Ð»Ð°Ð½Ð¾Ð²Ð¸"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Ð?Ñ?Ð¸Ð³Ð°"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Ð?Ðµ Ð½Ð¾Ð²Ð° Ð»Ð¸Ñ?Ñ?Ð°"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÑ?ÐµÐ½ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?:"
@@ -771,8 +723,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Ð?Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½ Ð´Ñ?Ð¿Ð»Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
-msgstr "Ð?Ð¼Ðµ Ð¸Ð»Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð° Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸.  Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð³Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"Ð?Ð¼Ðµ Ð¸Ð»Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð° Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ? Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸.  "
+"Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð³Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -791,139 +747,113 @@ msgstr ""
 "Ñ? Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸.  Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Ð?Ñ?Ð¸Ð¿Ð¾Ñ?Ð¸"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Ð?Ñ?Ð¸Ð¿Ð¾Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Ð?Ð¾Ñ?Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "Ð?-Ð¿Ð¾Ñ?Ñ?Ð° Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Ð?Ð¼Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Ð?ÐµÐ¼Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 msgstr[1] "%d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 msgstr[2] "%d ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°"
+msgstr[3] "%d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° ÐºÑ?Ð¸Ð³Ðµ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Ð£Ð¿Ð¸Ñ?"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð¿Ñ?ÐµÐºÐ¸Ð½Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053
-#: ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817
-#: ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Ð?Ð¾Ð´ÐµÐ»"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸ ÐºÐ°Ñ?Ñ?Ðµ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "Ð¡ÐµÑ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070
-#: ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?ÐºÐ¾Ñ?ÐºÐµ"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ñ??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ñ? (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ??"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -932,11 +862,11 @@ msgstr ""
 "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ %d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ?Ðµ Ñ?Ð°ÐºÐ¾Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ %d Ð½Ð¾Ð²Ð¸Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°.\n"
 "Ð?Ð° Ð»Ð¸ Ð·Ð°Ð¸Ñ?Ñ?Ð° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶ÐµÑ?Ðµ Ñ?Ð²Ðµ Ð¾Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "_Ð?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
@@ -970,7 +900,7 @@ msgid "Car Phone"
 msgstr "Ð¢ÐµÐ»ÐµÑ?Ð¾Ð½ Ñ? ÐºÐ¾Ð»Ð¸Ð¼Ð°"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../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
@@ -1071,7 +1001,7 @@ 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:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Ð£Ð»Ð¾Ð³Ð°"
@@ -1096,7 +1026,6 @@ msgid "Telex"
 msgstr "Ð¢ÐµÐ»ÐµÐºÑ?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Ð¢Ð¸Ñ?Ñ?Ð»Ð°"
 
@@ -1108,65 +1037,7 @@ msgstr "Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ð°"
 msgid "Web Site"
 msgstr "Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð°"
 
-#: ../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/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891
-#: ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483
-#: ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../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/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897
-#: ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../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:136
-msgid "Field"
-msgstr "Ð?Ð¾Ñ?Ðµ"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Ð?Ð¼Ðµ Ð¿Ð¾Ñ?Ð°"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÑ?Ð° Ð´Ñ?Ð¶Ð¸Ð½Ð° Ð¸Ð¼ÐµÐ½Ð° Ð¿Ð¾Ñ?Ð°"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ðµ"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1176,7 +1047,7 @@ msgstr ""
 "\n"
 "Ð¢Ñ?Ð°Ð¶Ð¸Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1190,7 +1061,7 @@ msgstr ""
 "\n"
 "Ð¸Ð»Ð¸ ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð²Ð°Ð¿Ñ?Ñ? Ð¾Ð²Ð´Ðµ Ð·Ð° Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð½Ð¾Ð²Ð¾Ð³ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1204,7 +1075,7 @@ msgstr ""
 "\n"
 "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð²Ð°Ð¿Ñ?Ñ? Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð² ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1214,7 +1085,7 @@ msgstr ""
 "\n"
 "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1224,10 +1095,6 @@ msgstr ""
 "\n"
 "Ð?ÐµÐ¼Ð° Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Ð?Ð´Ð°Ð¿Ñ?ÐµÑ?"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Ð?Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°"
@@ -1237,18 +1104,10 @@ msgid "Home Email"
 msgstr "Ð?Ñ?Ñ?Ð½Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Ð?Ñ?Ñ?Ð³Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Ð?Ð¼Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ?"
-
 # note(slobo): message thread, Ð½Ð¸Ð· --> Ð±Ð¾Ñ?Ð¸ Ð¿Ñ?ÐµÐ²Ð¾Ð´ Ñ?Ðµ Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð°
 # note(slobo): Ð¿Ð¾Ð½ÐµÐ³Ð´Ðµ Ñ?Ð°Ð¼ Ð·Ð° summary ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ð¾ --> â??Ñ? ÐºÑ?Ð°Ñ?ÐºÐ¸Ð¼ Ñ?Ñ?Ñ?Ð°Ð¼Ð°â??
 # note(slobo): Ð·Ð° memo Ñ?Ð°Ð¼ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ð¾ --> Ð±ÐµÐ»ÐµÑ?ÐºÐµ
@@ -1259,7 +1118,7 @@ msgstr "Ð?Ð¼Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ?"
 # note(slobo): spam , Ð?Ñ?Ð±Ñ?Ðµ --> Ð?ÐµÐ¶ÐµÑ?ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?Ð°
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
@@ -1271,13 +1130,14 @@ msgstr "Ð?Ð¾Ð²Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 msgid "New Contact List"
 msgstr "Ð?Ð¾Ð²Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° %s Ð¸Ð¼Ð° %d ÐºÐ°Ñ?Ñ?Ñ?"
 msgstr[1] "Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° %s Ð¸Ð¼Ð° %d ÐºÐ°Ñ?Ñ?Ðµ"
 msgstr[2] "Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° %s Ð¸Ð¼Ð° %d ÐºÐ°Ñ?Ñ?Ð¸"
+msgstr[3] "Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° %s Ð¸Ð¼Ð° %d ÐºÐ°Ñ?Ñ?Ñ?"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
@@ -1300,17 +1160,17 @@ msgid "Copy _Email Address"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? _Ð°Ð´Ñ?ÐµÑ?Ñ?"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð·Ð°..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "Ð¨Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½Ð° Ð¾Ð²Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?"
 
@@ -1346,22 +1206,22 @@ msgid "Video Chat"
 msgstr "_Ð?Ð¸Ð´ÐµÐ¾ Ñ?Ð°Ð·Ð³Ð¾Ð²Ð¾Ñ?:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
@@ -1392,22 +1252,19 @@ msgstr "_Ð?ÐµÐ± Ð»Ð¾Ð³:"
 # Create the default Person task list
 # orange
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461
-#: ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¾"
@@ -1424,146 +1281,53 @@ msgstr "Ð?Ð¸Ñ?Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
 msgid "Blog"
 msgstr "Ð?Ð»Ð¾Ð³"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Ð£Ñ?Ð¿ÐµÑ?"
-
-# E_BOOK_ERROR_BUSY
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ñ?Ðµ Ð·Ð°Ñ?Ð·ÐµÑ?"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Ð?Ñ?Ñ?Ð¸Ð²Ð° Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°Ñ? Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "Ð?Ð¸Ñ?Ð½Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð½Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ð°Ð½"
-
-# E_BOOK_ERROR_URI_ALREADY_LOADED
-# E_BOOK_ERROR_PERMISSION_DENIED
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "Ð?Ð°Ð±Ñ?Ð°Ñ?ÐµÐ½ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "Ð?Ð? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Ð?Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð» Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739
-#: ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð´Ñ?Ñ?Ñ?Ð°Ñ?Ð¸"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð¾Ð±Ð°Ð²ÐµÐ·Ð½Ð°"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½"
-
-# E_BOOK_ERROR_NO_SUCH_SOURCE
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Ð?ÐµÐ¼Ð° Ñ?Ð°ÐºÐ²Ð¾Ð³ Ð¸Ð·Ð²Ð¾Ñ?Ð°"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾ Ñ? Ñ?ÐµÐ¶Ð¸Ð¼Ñ? Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Ð?Ñ?Ñ?Ð³Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "Ð?ÐµÑ?Ð¾Ð´ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
-msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ Ð¾Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?. Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ð¾Ð½ Ð¸Ð»Ð¸ Ð½Ð¸Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ Ð¸Ð»Ð¸ Ð´Ð° Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ð·ÐµÑ? Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ. Ð£Ñ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ?Ðµ Ñ?Ð°Ð´Ð¸ Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ð° Ñ?ÐµÐ³Ð¾Ð²Ð¾Ð³ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð°."
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ Ð¾Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?. Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ð¾Ð½ Ð¸Ð»Ð¸ Ð½Ð¸Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½ Ð·Ð° "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ Ð¸Ð»Ð¸ Ð´Ð° Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ð·ÐµÑ? Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ. Ð£Ñ?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ "
+"Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ?Ðµ Ñ?Ð°Ð´Ð¸ Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ð° Ñ?ÐµÐ³Ð¾Ð²Ð¾Ð³ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð°."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°.  Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ñ?Ñ?Ð°Ñ?Ð° %s Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ð¸ Ð´Ð° Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð°."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°.  Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ñ?Ñ?Ð°Ñ?Ð° %s Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ð¸ Ð´Ð° "
+"Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð°."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr "Ð?Ð²Ð¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ¼Ð° Ñ? Ñ?ÐµÐ±Ð¸ Ð¿Ð¾Ð´Ñ?Ñ?ÐºÑ? Ð·Ð° LDAP.  Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ LDAP Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸, Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð°ÐºÐµÑ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ñ?ÐºÐ¾Ð¼ Ð·Ð° LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ¼Ð° Ñ? Ñ?ÐµÐ±Ð¸ Ð¿Ð¾Ð´Ñ?Ñ?ÐºÑ? Ð·Ð° LDAP.  Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ LDAP Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸, Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ð´Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð°ÐºÐµÑ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð° "
+"Ð¿Ð¾Ð´Ñ?Ñ?ÐºÐ¾Ð¼ Ð·Ð° LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°.  Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ñ?Ðµ Ð¸Ð»Ð¸ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ?, Ð¸Ð»Ð¸ Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½."
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°.  Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ñ?Ðµ Ð¸Ð»Ð¸ Ñ?Ð½ÐµÐ»Ð¸ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ñ? "
+"Ð°Ð´Ñ?ÐµÑ?Ñ?, Ð¸Ð»Ð¸ Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð¸ Ð³Ñ?ÐµÑ?ÐºÐµ:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1575,7 +1339,7 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?Ð¸Ð·Ð½Ð¸Ñ?Ðµ Ð¾Ð±Ð»Ð¸ÐºÑ?Ñ?Ñ?Ðµ Ñ?Ð¿Ð¸Ñ? Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ?Ð°Ñ?Ñ?Ðµ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÑ?Ðµ\n"
 "Ð±Ñ?Ð¾Ñ?Ð° Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð·Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1587,44 +1351,53 @@ msgstr ""
 "Ñ?Ð¿Ð¸Ñ? Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑ?Ð°Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¾ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÑ?Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°\n"
 "Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð¾Ð±Ñ?Ð°Ð´Ð¸ Ñ?Ð¿Ð¸Ñ?."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+#| msgid "The backend for this address book was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð¾Ð±Ñ?Ð°Ð´Ð¸ Ñ?Ð¿Ð¸Ñ?. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ?Ðµ Ð¾Ð´Ð±Ð¸Ð¾ Ð´Ð° Ð¾Ð±Ð°Ð²Ð¸ Ð¾Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+#| msgid "The backend for this address book refused to perform this query."
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð¾Ð²Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ?Ðµ Ð¾Ð´Ð±Ð¸Ð¾ Ð´Ð° Ð¾Ð±Ð°Ð²Ð¸ Ð¾Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Ð?Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+#| msgid "This query did not complete successfully."
+msgid "This query did not complete successfully. %s"
+msgstr "Ð?Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "Ð»Ð¸Ñ?Ñ?Ð°"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ?"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ?"
 
@@ -1632,55 +1405,62 @@ msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ?"
 msgid "Card View"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ñ?Ñ?Ðµ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685
-#: ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV Ð¸Ð»Ð¸ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV Ð¸ Tab Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV Ð¸Ð»Ð¸ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Ð?Ð¾Ð·Ð¸Ð»Ð° CSV Ð¸ Tab Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° CSV Ð¸Ð»Ð¸ Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸Ð½ CSV Ð¸ Tab Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP Ð¾Ð±Ð»Ð¸Ðº Ñ?Ð°Ð·Ð¼ÐµÐ½Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° LDIF Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "Ð²Ð?Ð°Ñ?Ñ?Ð° (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸Ð½ Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº Ð²Ð?Ð°Ñ?Ñ?Ð¸"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+#| msgid "Page %d of %d"
+msgid "Page %d"
+msgstr "%d. Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
+
 #: ../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
@@ -1720,16 +1500,23 @@ msgid "Export in asynchronous mode"
 msgstr "Ð?Ð·Ð²ÐµÐ·Ð¸ Ñ? Ð½ÐµÑ?Ñ?ÐºÐ»Ð°Ñ?ÐµÐ½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
-msgstr "Ð?Ñ?Ð¾Ñ? ÐºÐ°Ñ?Ñ?Ð¸ Ñ? Ñ?ÐµÐ´Ð½Ð¾Ñ? Ð¸Ð·Ð»Ð°Ð·Ð½Ð¾Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÑ?Ð¸ Ñ? Ð½ÐµÑ?Ñ?ÐºÐ»Ð°Ñ?ÐµÐ½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?, Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° 100."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Ð?Ñ?Ð¾Ñ? ÐºÐ°Ñ?Ñ?Ð¸ Ñ? Ñ?ÐµÐ´Ð½Ð¾Ñ? Ð¸Ð·Ð»Ð°Ð·Ð½Ð¾Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÑ?Ð¸ Ñ? Ð½ÐµÑ?Ñ?ÐºÐ»Ð°Ñ?ÐµÐ½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?, Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° "
+"Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "Ð?Ð Ð?Ð?"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ, ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ñ? --help Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ?Ðµ ÐºÐ°ÐºÐ¾ Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ, ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ñ? --help Ð´Ð° Ð²Ð¸Ð´Ð¸Ñ?Ðµ ÐºÐ°ÐºÐ¾ Ñ?Ðµ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
@@ -1751,21 +1538,21 @@ msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð°Ñ?Ðµ LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s (ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1773,21 +1560,45 @@ msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
-msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶Ð°Ð½ Ð¸Ð·Ð¼ÐµÐ½Ð°Ð¼Ð°. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð° Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð»Ð¾Ð¶Ð°Ð½ Ð¸Ð·Ð¼ÐµÐ½Ð°Ð¼Ð°. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ "
+"ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð° Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
-msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð³Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¼ÐµÑ?Ð°Ñ?Ð¸. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? ÐºÐ¾Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? â??{0}â?? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸ Ð½Ð¸Ñ?Ðµ Ð³Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¼ÐµÑ?Ð°Ñ?Ð¸. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ "
+"ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? ÐºÐ¾Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
-msgstr "Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ñ? Ð²ÐµÐ·Ð¸ Ñ?ÐµÐ³Ð° Ð·Ð°ÐºÐ°Ð·Ñ?Ñ?ÐµÑ?Ðµ."
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ñ? Ð²ÐµÐ·Ð¸ "
+"Ñ?ÐµÐ³Ð° Ð·Ð°ÐºÐ°Ð·Ñ?Ñ?ÐµÑ?Ðµ."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?ÐºÑ? Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ñ? Ð²ÐµÐ·Ð¸ Ñ?ÐµÐ³Ð° Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an "
+#| "idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?ÐºÑ? Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ñ? Ð²ÐµÐ·Ð¸ Ñ?ÐµÐ³Ð° "
+"Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1798,7 +1609,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Ð¡Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ñ? Ð¾Ð²Ð¾Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸ Ð±Ð¸Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¸ Ð½ÐµÑ?Ðµ Ñ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "Ð¡Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð¾Ð²Ð¸Ð¼ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð¸Ð¼Ð° Ð±Ð¸Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¸ Ð½ÐµÑ?Ðµ Ñ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸."
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1807,11 +1620,14 @@ msgstr "Ð¡Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð¾Ð²Ð¸Ð¼ Ð·Ð°Ð´Ð°Ñ?Ð¸Ð¼Ð° Ð±Ð¸Ñ?Ðµ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½
 
 # calendar:prompt-delete-appointment secondary
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Ð¡Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð¾Ð²Ð¾Ð¼ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ? Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸ Ð¸ Ð½ÐµÑ?Ðµ Ñ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸."
+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
@@ -1877,38 +1693,38 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÑ? Ð±ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°?"
+#, fuzzy
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð±ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð±ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÑ? Ð±ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
+#, fuzzy
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð±ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Ð?Ñ?Ñ?Ð¸Ð²Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ñ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? â??{0}â???"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ â??{0}â???"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° â??{0}â???"
 
@@ -1929,13 +1745,20 @@ msgid "Editor could not be loaded."
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð½."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "Ð?Ð¾Ð·Ð¸Ð²Ð½Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ð±Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ñ?Ð²Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ð±Ð¸ Ð¼Ð¾Ð³Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ð²Ð½Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ð±Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ñ?Ð²Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ð±Ð¸ Ð¼Ð¾Ð³Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ðµ Ð¾Ð²Ð°Ñ? "
+"Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
 # bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Ð?Ð¾Ð·Ð¸Ð²Ð½Ð¸Ñ?Ðµ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ñ?Ð²Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð¸ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ Ð¸Ð¼ Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ðµ."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ð²Ð½Ð¸Ñ?Ðµ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼ Ñ?Ð²Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð¸ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ Ð¸Ð¼ Ð´Ð° "
+"Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ðµ."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1949,235 +1772,207 @@ msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 msgid "Error loading task list"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ "
+"Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½."
+
 #: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð½Ð° â??{0}â??"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ "
+"Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð°."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ "
+"Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð°."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Ð¡Ð»Ð°Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¾Ñ?Ñ?Ð°Ð»Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ñ?Ð¸Ñ?Ð¾Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð±Ñ?Ð´Ðµ "
+"Ñ? Ñ?Ð¾ÐºÑ?."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ðµ Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ?, Ð¾Ñ?Ñ?Ð°Ð»Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Ð¡Ð»Ð°Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¾Ñ?Ñ?Ð°Ð»Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ñ?Ð¸Ñ?Ð¾Ð² Ñ?Ð¿Ð¸Ñ?Ð°Ðº "
+"Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð±Ñ?Ð´Ðµ Ñ? Ñ?Ð¾ÐºÑ?."
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Ð?ÐµÐ¼Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ð²Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ "
+"Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ð¸ Ñ?Ð° Ñ?Ð¸Ð¼."
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¾Ñ?Ñ?Ð°Ð»Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ñ?Ð¸Ñ?Ð¾Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð±Ñ?Ð´Ðµ Ñ? Ñ?Ð¾ÐºÑ?."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð¾Ð²Ð¸ "
+"Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ð¸ Ñ?Ð° Ñ?Ð¸Ð¼."
 
 #: ../calendar/calendar.error.xml.h:51
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¾Ñ?Ñ?Ð°Ð»Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð´Ð° Ñ?Ð¸Ñ?Ð¾Ð² Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð±Ñ?Ð´Ðµ Ñ? Ñ?Ð¾ÐºÑ?."
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ð²Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ð¸ Ñ?Ð° Ñ?Ð¸Ð¼."
-
-#: ../calendar/calendar.error.xml.h:53
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð¾Ð²Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ð¸ Ñ?Ð° Ñ?Ð¸Ð¼."
-
-#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "Ð?Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½ÐµÐºÐµ Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ð´Ð¸Ñ?Ð¸."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð¾."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ñ? Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð»Ð¸."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð¾."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ñ? Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð»Ð¸."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "Ð?Ð²Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð½Ð¸Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Ð?Ð²Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Ð?Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Ð?Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ? Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ??"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ð¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ??"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ð¼ Ð·Ð°Ð´Ð°Ñ?ÐºÑ??"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ? Ð·Ð° Ð¾Ð²Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ??"
 
 # calendar:prompt-cancel-task primary
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ð²Ð¸Ð¼ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¾Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ñ??"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ð·Ð¸Ð²Ðµ Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð°?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð°?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ? Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð°?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ? Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð°?"
 
-#: ../calendar/calendar.error.xml.h:76
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "Ð?Ð¾Ð²ÐµÐ·Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð° Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? Ñ?Ð°Ð´Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð?Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð±Ñ?Ð´Ðµ Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ?."
+#: ../calendar/calendar.error.xml.h:72
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Ð?Ð¾Ð²ÐµÐ·Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð½Ð° Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ GroupWise Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ñ?Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ? "
+"Ñ?Ð°Ð´Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð?Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ðµ Ð´Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ð±Ñ?Ð´Ðµ Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ?."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ, Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð»Ð¸."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº, Ð°Ð»Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ðµ."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº, Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð»Ð¸."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?, Ð°Ð»Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð¾Ñ? Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð»Ð¸."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸ Ð´Ð¾Ðº Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð´Ð¾Ðº Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸ Ð´Ð¾Ðº Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¾_Ð¼ÐµÐ½Ðµ"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28
-#: ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾_Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Ð?Ð¾Ð´ÐµÐ»Ð¸ Ð²Ð¸Ñ?ÐµÐ´Ð½ÐµÐ²Ð½Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ ÐµÐ²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ð°-Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ñ?ÐºÐ¾Ð³ Ð±Ð»Ð¾ÐºÐ° Ð¿Ð¸Ð»Ð¾Ñ?Ð¾Ð²Ð¾Ð³ Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¸Ð»Ð¾Ñ?Ð¾Ð²Ð¾Ð³ Ð±Ð»Ð¾ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ¾ Ñ?Ð¿Ð¸Ñ? Ð¿Ð¸Ð»Ð¾Ñ?Ð¾Ð²Ð¾Ð³ Ð±Ð»Ð¾ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð°Ð¶Ð½Ð¾Ñ?Ñ?:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¸Ð»Ð¾Ñ?Ð¾Ð²Ð¾Ð³ ToDo Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ñ?ÐºÐ¾Ð³ Ð±Ð»Ð¾ÐºÐ°"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ¾ Ñ?Ð¿Ð¸Ñ? Ñ? Ð¿Ð¸Ð»Ð¾Ñ?Ð¾Ð² Ð±Ð»Ð¾Ðº â??Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ð¸â??"
-
 # bug: plural-forms
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
@@ -2185,6 +1980,7 @@ msgid_plural "minutes"
 msgstr[0] "Ð¼Ð¸Ð½Ñ?Ñ?"
 msgstr[1] "Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgstr[2] "Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
+msgstr[3] "Ð¼Ð¸Ð½Ñ?Ñ?"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
@@ -2192,8 +1988,9 @@ msgid_plural "hours"
 msgstr[0] "Ñ?Ð°Ñ?"
 msgstr[1] "Ñ?Ð°Ñ?Ð°"
 msgstr[2] "Ñ?Ð°Ñ?Ð¸"
+msgstr[3] "Ñ?Ð°Ñ?"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°"
 
@@ -2208,10 +2005,10 @@ msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ _Ñ?Ð²Ðµ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Ð?Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð°:"
 
@@ -2224,12 +2021,11 @@ msgid "_Dismiss"
 msgstr "_Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-#: ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
@@ -2239,11 +2035,10 @@ msgid "_Snooze"
 msgstr "Ð?Ñ?Ðµ_Ð¼Ð°Ñ?Ðµ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "Ñ?Ð°Ñ?Ð¸"
 
@@ -2252,43 +2047,42 @@ msgid "location of appointment"
 msgstr "Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð° Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
 # bug: plural-forms
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-#: ../e-util/e-plugin-util.c:422
-#: ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ð¾Ð¿Ð¸Ñ?Ð°."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° Ð¾ Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð¸."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Ð?Ñ?Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¸Ñ? Ð°Ð»Ð°Ñ?Ð¼Ð°: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2300,22 +2094,24 @@ msgstr ""
 "Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ?. Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ\n"
 "Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¾Ð³Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ñ?Ð¸ Ð½Ð¾Ñ?Ð¼Ð°Ð»Ð½Ð¾ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?Ðµ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Ð?Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?. Ð?Ð²Ð°Ñ? Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½ Ð´Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼:\n"
+"Ð?Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?. Ð?Ð²Ð°Ñ? Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½ Ð´Ð° "
+"Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼:\n"
 "\n"
 "        %s\n"
 "\n"
 "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "Ð?Ðµ Ð¿Ð¸Ñ?Ð°Ñ? Ð¼Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼."
 
@@ -2324,8 +2120,7 @@ msgid "invalid time"
 msgstr "Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2333,10 +2128,10 @@ msgid_plural "%d hours"
 msgstr[0] "%d Ñ?Ð°Ñ?"
 msgstr[1] "%d Ñ?Ð°Ñ?Ð°"
 msgstr[2] "%d Ñ?Ð°Ñ?Ð¸"
+msgstr[3] "%d Ñ?Ð°Ñ?"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2344,12 +2139,12 @@ msgid_plural "%d minutes"
 msgstr[0] "%d Ð¼Ð¸Ð½Ñ?Ñ?"
 msgstr[1] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgstr[2] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
+msgstr[3] "%d Ð¼Ð¸Ð½Ñ?Ñ?"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2357,13 +2152,14 @@ msgid_plural "%d seconds"
 msgstr[0] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð°"
 msgstr[1] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 msgstr[2] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
+msgstr[3] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð°"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¸ Ð·Ð° Ð°Ð»Ð°Ñ?Ð¼"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ñ? Ñ?ÐµÐºÑ?Ð½Ð´Ð°Ð¼Ð° Ð·Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ð¸."
 
@@ -2384,488 +2180,553 @@ msgid "Calendars to run alarms for"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸ Ð·Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ðµ Ð°Ð»Ð°Ñ?Ð¼"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾ Ð´Ð° Ð±Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ð»Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°."
+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
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
-msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð?Ð°Ñ?ÐºÑ?Ñ? Ð?ÐµÑ?Ð½Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?Ð°Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ðµ Ð¿Ñ?Ð°Ð·Ð½Ð¾)."
-
-#: ../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:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "Ð¡Ð°Ð¶Ð¼Ð¸ Ð²Ð¸ÐºÐµÐ½Ð´Ðµ Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Ð?Ð¾Ñ?Ð²Ñ?Ð´Ð¸ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ðµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "Ð?Ñ?Ð¾Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð° Ð½Ð¾Ð²Ð¾Ð³ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°. -1 Ð·Ð½Ð°Ñ?Ð¸ Ð·Ð°Ñ?Ð²ÐµÐº."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸ Ð´Ð°Ð½Ðµ ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ð¸Ñ?Ñ? Ð¸ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ñ? Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð¸ Ñ?Ð°Ñ?Ð¾Ð²Ð¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ð·Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ Ð±Ñ?Ð¾Ñ? Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ðµ Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð²Ñ?Ñ?Ð½Ð¸Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð°Ð»Ð°Ñ?Ð¼Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Ð¡Ñ?ÐµÐ¿ÐµÐ½ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Ð?Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð·Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "Ð?Ð¾Ð´ÐµÐ» Ð°Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Ð¡Ñ?ÐµÐ¿ÐµÐ½ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Ð¡Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ð´Ð½Ð° Ð½ÐµÐ´ÐµÑ?Ð°, Ñ? Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¾Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¾Ð¼ Ð¾Ð±Ð»Ð¸ÐºÑ?, Ð¾Ð´ 0 Ð´Ð¾ 23."
+msgstr ""
+"Ð¡Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ð´Ð½Ð° Ð½ÐµÐ´ÐµÑ?Ð°, Ñ? Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¾Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¾Ð¼ Ð¾Ð±Ð»Ð¸ÐºÑ?, Ð¾Ð´ 0 "
+"Ð´Ð¾ 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Ð¡Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð° Ð½ÐµÐ´ÐµÑ?Ð°, Ñ? Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¾Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¾Ð¼ Ð¾Ð±Ð»Ð¸ÐºÑ?, Ð¾Ð´ 0 Ð´Ð¾ 23."
+msgstr ""
+"Ð¡Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð° Ð½ÐµÐ´ÐµÑ?Ð°, Ñ? Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¾Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¾Ð¼ Ð¾Ð±Ð»Ð¸ÐºÑ?, Ð¾Ð´ 0 Ð´Ð¾ 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ â??Ñ?Ð°Ñ?Ð½Ð¾â??, Ñ? Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ â??Ñ?Ð°Ñ?Ð½Ð¾â??, Ñ? Ð³Ð»Ð°Ð²Ð½Ð¾Ð¼ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð»Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¸ Ñ? Ð´Ð½ÐµÐ²Ð½Ð¸Ð¼ Ð¸ Ð½ÐµÐ´ÐµÑ?Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð°, Ñ? Ð¼Ð¸Ð½Ñ?Ñ?Ð¸Ð¼Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð°Ð»Ð°Ñ?Ð¼"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "Ð?Ð¸Ð²Ð¾ Ð½Ð°ÐºÐ¾Ð½ ÐºÐ¾Ñ?ÐµÐ³ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð·Ð°Ð²Ð¾Ð´Ð¸ Ñ? Ð´Ð½ÐµÐ²Ð½Ð¸Ðº."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸Ñ? Ð·Ð¾Ð½Ð° Ñ? Ð?Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð·Ð° Ð¾Ð±Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾Ð³ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Ð?Ð°Ñ?ÐºÑ?Ñ? Ð?ÐµÑ?Ð½Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Ð?Ð¾Ñ?Ð° Ð?Ð°Ñ?ÐºÑ?Ñ? Ð?ÐµÑ?Ð½Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ðµ - Ð?Ð½ÐµÐ²Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Ð?Ð¾Ñ?Ð° Ð?Ð°Ñ?ÐºÑ?Ñ? Ð?ÐµÑ?Ð½Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ðµ - Ñ?Ñ?Ð°ÐºÐ° Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
-msgstr "Ð?Ð°Ñ?Ð²ÐµÑ?Ð¸ Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸Ñ? Ð·Ð¾Ð½Ð° Ð·Ð° Ð¿Ð°Ð¼Ñ?ÐµÑ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? â??day_second_zonesâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"Ð?Ð°Ñ?Ð²ÐµÑ?Ð¸ Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸Ñ? Ð·Ð¾Ð½Ð° Ð·Ð° Ð¿Ð°Ð¼Ñ?ÐµÑ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? "
+"â??day_second_zonesâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "Ð?Ð°Ñ?Ð²ÐµÑ?Ð¸ Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¸Ñ? Ð·Ð¾Ð½Ð° Ð·Ð° Ð¿Ð°Ð¼Ñ?ÐµÑ?Ðµ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐµ (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Ð?Ð¸Ð½Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½, Ð¾Ð´ 0 Ð´Ð¾ 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Ð?Ð¸Ð½Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½, Ð¾Ð´ 0 Ð´Ð¾ 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð?ÐµÑ?ÐµÑ?Ð½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð?ÐµÑ?ÐµÑ?Ð½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Ð?Ñ?Ð¾Ñ? Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ð° Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾Ð³ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Ð?Ñ?Ð¾Ñ? Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ð° Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ ÐºÐ°Ð´Ð° Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Ð?Ð¾Ñ?Ð° Ð¿Ñ?ÐµÐºÐ¾Ñ?Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° "
+"ÐºÐ°Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° ÐºÐ°Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° "
+"Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð±ÐµÑ?ÐµÑ?ÐºÐ¸ ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ñ?Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð½Ð¾."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾."
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"Ð?Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð¸ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ?Ð¸Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð¿Ð¾ "
+"Ð´Ð°Ñ?Ñ?Ð¼Ñ?."
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "Ð?Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð¸ Ð½Ð°Ð²Ð¸Ð³Ð°Ñ?Ð¸Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð¿Ð¾ Ð´Ð°Ñ?Ñ?Ð¼Ñ?."
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° "
+"Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
+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."
+msgstr ""
+"Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° "
+"Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° ÐºÐ°Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-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."
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸, Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸ Ð´ÐµÐ»Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° ÐºÐ°Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Ð?Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¸ ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¸ Ð°Ð»Ð°Ñ?Ð¼Ð¸Ð¼Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Ð?ÐµÐ´Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ðµ Ð´Ñ?Ñ?Ð³Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ñ? Ð?Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð·Ð²Ñ?Ñ?Ð½Ð¸Ñ? Ð°Ð»Ð°Ñ?Ð¼Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾ Ð½ÐµÐ´ÐµÑ?Ð°Ð¼Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ RSVP Ð¿Ð¾Ñ?Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ Ñ?Ð»Ð¾Ð³Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð½ÐµÐ´ÐµÑ?Ð½Ð¸Ð¼ Ð¸ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð°Ð»Ð°Ñ?Ð¼Ðµ Ñ? Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð° Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ Ñ?Ð¸Ð¿Ð° Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#, fuzzy
+#| msgid "Show week number in Day and Work Week View"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? Ð´Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð·Ð° Ñ?Ð°Ð´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð´ÐµÐ»Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ? Ð?Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½Ð°. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ñ?Ð»Ð¸Ñ?Ð½Ð° Ð¾Ð½Ð¾Ñ? ÐºÐ¾Ñ?Ð° Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð° Ñ? ÐºÑ?Ñ?Ñ?Ñ? â??timezoneâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ? Ð?Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½Ð°. "
+"Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ñ?Ð»Ð¸Ñ?Ð½Ð° Ð¾Ð½Ð¾Ñ? ÐºÐ¾Ñ?Ð° Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð° Ñ? ÐºÑ?Ñ?Ñ?Ñ? â??timezoneâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° (Ñ?Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð½Ð¾)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð°Ð´Ð°Ñ?ÐºÐ° Ð·Ð° Ð´Ð°Ð½Ð°Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ð°Ð´Ñ?ÐµÑ?Ðµ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ñ? Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾, %u Ñ?Ðµ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸Ð¼ Ð´ÐµÐ»Ð¾Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ, Ð° %d Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð¼."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"Ð?Ð¾Ð´ÐµÐ» Ð°Ð´Ñ?ÐµÑ?Ðµ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ñ? Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾, %u Ñ?Ðµ "
+"Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸Ð¼ Ð´ÐµÐ»Ð¾Ð¼ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ, Ð° %d Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð¼."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° Ð·Ð¾Ð½Ð° ÐºÐ¾Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ð²Ñ?ÐµÐ¼Ðµ, ÐºÐ°Ð¾ Ð½ÐµÐ¿Ñ?ÐµÐ²ÐµÐ´ÐµÐ½Ð¾ Ð¼ÐµÑ?Ñ?Ð¾ Ð±Ð°Ð·Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð?Ð»Ñ?ÐµÐ½, ÐºÐ°Ð¾ â??Ð?Ð¼ÐµÑ?Ð¸ÐºÐ°/Ð?Ñ?Ñ?Ð¾Ñ?Ðºâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° Ð·Ð¾Ð½Ð° ÐºÐ¾Ñ?Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼ Ð¸ Ð²Ñ?ÐµÐ¼Ðµ, ÐºÐ°Ð¾ "
+"Ð½ÐµÐ¿Ñ?ÐµÐ²ÐµÐ´ÐµÐ½Ð¾ Ð¼ÐµÑ?Ñ?Ð¾ Ð±Ð°Ð·Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð?Ð»Ñ?ÐµÐ½, ÐºÐ°Ð¾ â??Ð?Ð¼ÐµÑ?Ð¸ÐºÐ°/Ð?Ñ?Ñ?Ð¾Ñ?Ðºâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸. â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸. â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸. "
+"â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸. "
+"â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°. â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°. â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°. "
+"â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°. "
+"â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "Ð?Ñ?Ñ?Ð³Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° Ð·Ð¾Ð½Ð° Ñ? Ð?Ð½ÐµÐ²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
-msgstr "Ð?Ð¾Ð¶Ðµ Ð¸Ð¼Ð°Ñ?Ð¸ Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸. 0 Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐµ. 1 Ð·Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°. 2 Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾ Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð¸ ÐºÐ²Ð°Ñ?Ð°."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"Ð?Ð¾Ð¶Ðµ Ð¸Ð¼Ð°Ñ?Ð¸ Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸. 0 Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐµ. 1 Ð·Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°. 2 Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾ "
+"Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð¸ ÐºÐ²Ð°Ñ?Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "Ð?Ð¾Ð´ÐµÐ»Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?ÐµÐ³ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ð° Ð°Ð»Ð°Ñ?Ð¼Ð°, Ñ? time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° Ð·Ð¾Ð½Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
-msgstr "Ð?Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾Ñ?Ñ? Ð´Ð¾ÐºÐ°Ñ?Ð°Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°, Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?Ñ? 0 (Ð¿Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾) Ð¸ 1 (Ð½ÐµÐ¿Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Ð?Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾Ñ?Ñ? Ð´Ð¾ÐºÐ°Ñ?Ð°Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°, Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?Ñ? 0 (Ð¿Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾) Ð¸ 1 "
+"(Ð½ÐµÐ¿Ñ?Ð¾Ð²Ð¸Ð´Ð½Ð¾)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24-Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¸ Ð¾Ð±Ð»Ð¸Ðº Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¾Ð³ â??Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¾Ð³â?? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¾Ð³ â??Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¾Ð³â?? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¾Ð³ â??Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ð½Ð¾Ð³â?? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº, â??Ð¼Ð¸Ð½Ñ?Ñ?Ð¸â??, â??Ñ?Ð°Ñ?Ð¸â?? Ð¸Ð»Ð¸ â??Ð´Ð°Ð½Ð¸â??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ ÐºÐ°Ð´Ð° Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ñ?Ð¶ÐµÑ?Ð°, â??Ð¼Ð¸Ð½Ñ?Ñ?Ð¸â??, â??Ñ?Ð°Ñ?Ð¸â?? Ð¸Ð»Ð¸ â??Ð´Ð°Ð½Ð¸â??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ ÐºÐ°Ð´Ð° Ñ?Ð°ÐºÑ?Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ñ?Ð¶ÐµÑ?Ð°, â??Ð¼Ð¸Ð½Ñ?Ñ?Ð¸â??, â??Ñ?Ð°Ñ?Ð¸â?? Ð¸Ð»Ð¸ â??Ð´Ð°Ð½Ð¸â??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¾Ð½Ðµ ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð° Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸."
+msgstr ""
+"Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¾Ð½Ðµ ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð° Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "Ð?Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð½ÐµÐ´ÐµÑ?Ðµ"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Ð?Ð°Ð½ ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ´ÐµÑ?Ð°, Ð¾Ð´ Ð½ÐµÐ´ÐµÑ?Ðµ (0) Ð´Ð¾ Ñ?Ñ?Ð±Ð¾Ñ?Ðµ (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ñ? Ð·Ð¾Ð½Ñ? Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð°Ð»Ð°Ñ?Ð¼Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ñ?Ð²Ñ?Ð´Ñ? Ð·Ð° Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð° Ð¸Ð»Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ñ?Ð²Ñ?Ð´Ñ? Ð¿Ñ?Ð¸ Ð¸Ð·Ð±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ñ?Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð° Ð¸Ð»Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ð°Ð¶Ð¼Ðµ Ð²Ð¸ÐºÐµÐ½Ð´Ðµ Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, ÐºÐ¾Ñ?Ð¸ Ñ?Ñ?Ð±Ð¾Ñ?Ñ? Ð¸ Ð½ÐµÐ´ÐµÑ?Ñ? Ñ?Ñ?Ð°Ð²Ñ?Ð° Ñ? Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ? Ñ?Ð°Ð´Ð½Ðµ Ð½ÐµÐ´ÐµÑ?Ðµ."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ð°Ð¶Ð¼Ðµ Ð²Ð¸ÐºÐµÐ½Ð´Ðµ Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?, ÐºÐ¾Ñ?Ð¸ Ñ?Ñ?Ð±Ð¾Ñ?Ñ? Ð¸ Ð½ÐµÐ´ÐµÑ?Ñ? Ñ?Ñ?Ð°Ð²Ñ?Ð° Ñ? "
+"Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ? Ñ?Ð°Ð´Ð½Ðµ Ð½ÐµÐ´ÐµÑ?Ðµ."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ñ? Ð½ÐµÐ´ÐµÑ?Ð½Ð¸Ð¼ Ð¸ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð°."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ñ? Ð½ÐµÐ´ÐµÑ?Ð½Ð¸Ð¼ Ð¸ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? Ð¸Ñ?Ñ?Ñ?Ñ?Ð° Ð?Ð°Ñ?ÐºÑ?Ñ? Ð?ÐµÑ?Ð½Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ñ? (Ð½Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ð°ÐºÑ?Ð¸Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾ Ð½ÐµÐ´ÐµÑ?Ð°Ð¼Ð°, Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¼ÐµÑ?ÐµÑ?Ð¸Ð¼Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº Ð·Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ RSVP Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ñ?Ð° Ñ?Ð»Ð¾Ð³Ð¾Ð¼ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ñ?Ð° Ñ?Ð»Ð¾Ð³Ð¾Ð¼ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ñ? Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ð¾Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¾Ð¼ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?, Ñ?Ð¼ÐµÑ?Ñ?Ð¾ am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ñ?Ð¸Ð¿Ð° Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°/Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°/Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð° Ð·Ð° Ð´Ð°Ð½ Ð¸ Ñ?Ð°Ð´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#, fuzzy
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð´ÐµÐ»Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "Ð Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½Ð¸"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Ð§Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Ð?Ð¸Ð½Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Ð§Ð°Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Ð?Ð¸Ð½Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½"
 
@@ -2889,16 +2750,13 @@ msgstr "Ð?ÐµÐ´ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 msgid "Month View"
 msgstr "Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Ð?Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð·Ð¸"
 
@@ -2908,135 +2766,109 @@ msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð·Ð¸"
 msgid "Attendee"
 msgstr "_Ð£Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560
-#: ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Ð?Ð¾Ð²ÐµÑ?Ñ?Ð¸Ð²Ð¾"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Ð?Ð¿Ð¸Ñ?"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Ð?Ð¿Ð¸Ñ?Ð¸"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ð?Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "Ð?ÐµÑ?Ñ?Ð¾"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../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:234
-#: ../calendar/gui/e-cal-model.c:558
-#: ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Ð?Ð¸Ñ?Ð½Ð¾"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549
-#: ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Ð?Ð°Ð²Ð½Ð¾"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "Ð£Ñ?ÐµÑ?Ñ?Ð°Ð»Ð¾Ñ?Ñ?"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../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:363
 msgid "Summary"
 msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 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:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../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:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "Ð½Ð¸Ñ?Ðµ"
 
@@ -3069,6 +2901,7 @@ msgid "Add Alarm"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð°Ð»Ð°Ñ?Ð¼"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Ð?Ð»Ð°Ñ?Ð¼"
 
@@ -3084,8 +2917,7 @@ msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½ Ð·Ð²Ñ?Ðº Ð°Ð»Ð°Ñ?Ð¼Ð°"
 msgid "Mes_sage:"
 msgstr "Ð?Ð¾_Ñ?Ñ?ÐºÐ°:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
 
@@ -3125,20 +2957,20 @@ msgstr "Ð¿Ð¾Ñ?Ð»Ðµ"
 msgid "before"
 msgstr "Ð¿Ñ?Ðµ"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "Ð´Ð°Ð½(Ð¸)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:424
-#: ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "Ð´Ð°Ð½Ð°"
 
@@ -3146,20 +2978,21 @@ msgstr "Ð´Ð°Ð½Ð°"
 msgid "end of appointment"
 msgstr "ÐºÑ?Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð¾Ñ? Ð½Ð° Ñ?Ð²Ð°ÐºÐ¸Ñ?"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "Ñ?Ð°Ñ?(Ð¸)"
 
 # bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "Ð¼Ð¸Ð½Ñ?Ñ?(Ð¸)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¸ Ð¿Ð¾Ñ?ÐµÑ?Ð°Ðº"
 
@@ -3173,7 +3006,7 @@ msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "Ð?Ð»Ð°Ñ?Ð¼Ð¸"
 
@@ -3183,30 +3016,32 @@ msgstr "Ð?Ð»Ð°Ñ?Ð¼Ð¸"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸ Ð·Ð° ÐºÐ¾Ñ?Ðµ Ð·Ð²Ð¾Ð½Ð¸ Ñ?Ð°Ñ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¸ Ð´Ð°Ñ?Ñ?Ð¼:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#| msgid "Time and date:"
+msgid "Ti_me and date:"
+msgstr "_Ð?Ñ?ÐµÐ¼Ðµ Ð¸ Ð´Ð°Ñ?Ñ?Ð¼:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Ð¡Ð°Ð¼Ð¾ Ð´Ð°Ñ?Ñ?Ð¼:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#| msgid "Date only:"
+msgid "_Date only:"
+msgstr "Ð¡Ð°Ð¼Ð¾ _Ð´Ð°Ñ?Ñ?Ð¼:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3242,14 +3077,13 @@ msgstr "30 Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgid "60 minutes"
 msgstr "60 Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
-#: ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ð´Ð°Ñ?Ñ?Ð¼/Ð²Ñ?ÐµÐ¼Ðµ"
 
@@ -3274,21 +3108,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð°Ð»Ð°Ñ?Ð¼Ðµ Ñ?Ð°Ð¼Ð¾ Ñ? _Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Ð?ÐµÑ?Ð°Ðº"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../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.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "Ð?Ð¿Ñ?Ñ?Ðµ"
 
@@ -3302,7 +3135,7 @@ msgid "Minutes"
 msgstr "Ð?Ð¸Ð½Ñ?Ñ?Ð¸"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Ð?Ð¾Ð½ÐµÐ´ÐµÑ?Ð°Ðº"
@@ -3316,189 +3149,197 @@ msgstr "Ð?Ð¾Ð½ÐµÐ´ÐµÑ?Ð°Ðº"
 #. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Ð?Ð¸Ñ?Ð° Ð±Ð¾Ñ?Ñ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "Ð?_ÐµÐ´"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Ð¡Ñ?Ð±Ð¾Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Ð?Ñ?Ð¸_ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾ Ð½ÐµÐ´ÐµÑ?Ð°Ð¼Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Ð?Ñ?Ñ?_Ð³Ð° Ð·Ð¾Ð½Ð°:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ð·Ð° Ð·Ð²Ñ?Ñ?Ð½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Ð?Ñ?Ð¸_ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð´ÐµÐ»Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ _Ð±Ñ?Ð¾Ñ? Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð·Ð° Ð´Ð°Ð½ Ð¸ Ñ?Ð°Ð´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#| msgid "Show week _numbers in date navigator"
+msgid "Show week _numbers"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ð½ÐµÐ´ÐµÑ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Ð?ÐµÐ´ÐµÑ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "Ð?_Ð°Ð´Ð°Ñ?Ð¸ Ð·Ð° Ð´Ð°Ð½Ð°Ñ?:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "Ð£_Ñ?Ð¾"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "Ð?Ð¾Ð´ÐµÐ»:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Ð§ÐµÑ?Ð²Ñ?Ñ?Ð°Ðº"
 
 # note(slobo): Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ?ÐµÐ±Ð° Ñ?Ð¾Ðº
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° _Ð·Ð¾Ð½Ð°:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "Ð?Ð±Ð»Ð¸Ðº Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Ð£Ñ?Ð¾Ñ?Ð°Ðº"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ? _Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Ð¡Ñ?ÐµÐ´Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð½_ÐµÐ´ÐµÑ?Ðµ:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Ð Ð°Ð´Ð½Ð° Ð½ÐµÐ´ÐµÑ?Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "Ð Ð°Ð´Ð½Ð¸ Ð´Ð°Ð½Ð¸:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¸ (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 - Ñ?Ð°Ñ?Ð¾Ð²Ð½Ð¸"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Ð¢Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ñ?Ð²Ñ?Ð´Ñ? Ð·Ð° Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ð²ÐºÐ¸"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "_Ð¡Ð°Ð¶Ð¼Ð¸ Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº _Ð´Ð°Ð½Ð°:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "_Ð?ÐµÑ?"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "_Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ð»Ðµ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "_Ð?Ð¾Ð½"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "_Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "_Ð¡Ñ?Ð±"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "_Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð° Ð²Ñ?ÐµÐ¼ÐµÐ½Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ñ? Ð½ÐµÐ´ÐµÑ?Ð½Ð¸Ð¼ Ð¸ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð¸Ð¼Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "Ð?Ð¾Ð´ÐµÐ»Ðµ _Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "_Ð£Ñ?Ð¾"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "_Ð¡Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "Ð¿Ñ?Ðµ Ñ?Ð²Ð°ÐºÐµ Ð³Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ/Ñ?Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½Ð°"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "Ð¿Ñ?Ðµ Ñ?Ð²Ð°ÐºÐ¾Ð³ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°"
 
@@ -3507,13 +3348,12 @@ msgid "Type:"
 msgstr "Ð¢Ð¸Ð¿:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Ð¢Ð¸Ð¿:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3532,35 +3372,35 @@ msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð»Ð¾ÐºÐ°
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Ð?Ð¾Ñ?_Ð°:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Ð?Ð¾Ð²Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "Ð?Ð¾_Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Ð?Ð¾Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
@@ -3613,281 +3453,241 @@ msgstr "%s  Ð?Ð¸Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ð½Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ, Ð¾Ñ?Ð²ÐµÐ¶Ð¸Ñ?Ð¸ Ñ?Ñ?Ðµ
 msgid "Validation error: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " Ð·Ð° "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202
-#: ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Ð?Ð¾ "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204
-#: ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Ð?Ð¾ "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "Ð£Ñ?ÐµÐ´Ð¸ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Ð?Ð¾Ð´ÐµÑ?ÐµÐ½ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "Ð?ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "Ð?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð¸ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ñ? Ñ?Ñ?Ð°Ð²ÐºÑ??"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115
-#: ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387
-#: ../widgets/misc/e-web-view.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
-#: ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108
-#: ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129
-#: ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð±Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð·Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974
-#: ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122
-#: ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002
-#: ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136
-#: ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ñ?Ð°Ð² Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "Ð?Ð·Ð½Ð°_ÐºÐ°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023
-#: ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "Ð?Ð°Ñ?Ð¾_Ñ?ÐµÐºÐ°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "_Ð?Ð¾Ð¼Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "_Ð£Ð¼ÐµÑ?Ð½Ð¸"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051
-#: ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "Ð?_Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Ð?Ñ?Ð¸Ð»Ð¾Ð³..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð¶Ð¸Ñ?Ðµ Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "Ð?Ð°_Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ° _Ð·Ð¾Ð½Ð°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "_Ð?Ð°Ð²Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ñ?Ð°Ð²Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "Ð?_Ð¸Ñ?Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð»Ð¸Ñ?Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "Ð?Ð¾Ð²Ðµ_Ñ?Ñ?Ð¸Ð²Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð¿Ð¾Ð²ÐµÑ?Ñ?Ð¸Ð²Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "_Ð£Ð»Ð¾Ð³Ð° Ð¿Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ Ð£Ð»Ð¾Ð³Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ RSVP Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "_Ð¡Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð¿Ð¾Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "_Ð¢Ð¸Ð¿ Ð¿Ð¾Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½ Ñ?Ð¸Ð¿ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ð¸Ñ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "Ð¡ÐºÐ¾Ñ?Ð°Ñ?Ñ?Ð¸ _Ð´Ð¾ÐºÑ?Ð¼ÐµÐ½Ñ?Ð¸"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð¶Ð¸"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð½Ð°Ñ?Ð¸Ñ?ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ? Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ðµ Ð°ÐºÐ¾ Ð±Ñ?Ð´Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
+msgstr ""
+"Ð?Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð½Ð°Ñ?Ð¸Ñ?ÐµÐ½Ðµ Ð½Ð° Ð¾Ð²Ð¾Ñ? Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ðµ Ð°ÐºÐ¾ Ð±Ñ?Ð´Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ðµ Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
@@ -3895,52 +3695,81 @@ msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¾Ð²Ñ? Ñ?Ñ?Ð°Ð²ÐºÑ? Ð¸Ð· Ñ?Ð²Ð¸Ñ? Ð¾Ñ?Ñ?Ð°Ð»Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸Ñ? Ñ?Ð°Ð½Ð´Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ð·Ð±Ð¾Ð³ corba Ð³Ñ?ÐµÑ?ÐºÐµ"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ð·Ð±Ð¾Ð³ corba Ð³Ñ?ÐµÑ?ÐºÐµ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, fuzzy, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð·Ð±Ð¾Ð³ corba Ð³Ñ?ÐµÑ?ÐºÐµ"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, fuzzy, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð·Ð±Ð¾Ð³ corba Ð³Ñ?ÐµÑ?ÐºÐµ"
+#, fuzzy, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, fuzzy, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?ÐµÑ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?ÐµÑ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?ÐµÑ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?ÐµÑ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, fuzzy, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to an error: %s"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, fuzzy, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to an error: %s"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½ Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, fuzzy, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to an error: %s"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, fuzzy, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to an error: %s"
 msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð° Ñ?Ñ?Ð»ÐµÐ´ Ð³Ñ?ÐµÑ?ÐºÐµ"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
@@ -3955,133 +3784,150 @@ msgstr "Ð?ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ñ? Ð½Ð°:"
 msgid "Enter Delegate"
 msgstr "Ð£Ð½ÐµÑ?Ð¸ Ð´ÐµÐ»ÐµÐ³Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "Ð?Ð»Ð°_Ñ?Ð¼Ð¸"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð¸Ð»Ð¸ Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð°Ð»Ð°Ñ?Ð¼ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð¾ _Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð¾ Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "_Ð?Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Ð?ÐµÐºÐ° Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Ð£Ð¼ÐµÑ?Ð½Ð¸ Ð½Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "Ð¦ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°_Ñ?"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð¾Ð·Ð²Ð¾Ñ?Ð°Ð²Ð° Ñ?ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð¾ _Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð¾ Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "Ð¡_Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾:"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð·Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð¾Ð²Ðµ Ñ?Ñ?ÐµÑ?Ð½Ð¸ÐºÐµ"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð°_Ð½Ð¾"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "Ð£Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:578
+#, fuzzy
+#| msgid "Print this message"
+msgid "Print this event"
+msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ñ?Ðµ Ñ? Ð¿Ñ?Ð¾Ñ?Ð»Ð¾Ñ?Ñ?Ð¸"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
+msgstr ""
+"Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ñ?Ð½Ð¾ Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ð½Ð¸Ñ?Ñ?Ðµ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Ð?Ð²Ð°Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð¸Ð¼Ð° Ð°Ð»Ð°Ñ?Ð¼Ðµ"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Ð?Ñ?_Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "Ð?ÐµÐ»ÐµÐ³Ð°Ñ?_Ð¸"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "Ð£Ñ?_ÐµÑ?Ð½Ð¸Ñ?Ð¸"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð±ÐµÐ· Ð´Ð°Ñ?Ñ?Ð¼Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð±ÐµÐ· Ð´Ð°Ñ?Ñ?Ð¼Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ? Ð²Ð¸Ñ?Ðµ Ð½ÐµÐ¼Ð° Ð½Ð°Ð»Ð¾Ð³."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "Ð?Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½ Ñ?Ðµ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ñ?ÐµÐ´Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð°Ð½."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° â??%sâ??."
@@ -4092,38 +3938,41 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° â??%sâ??."
 #. 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Ð?ÐµÐ»Ñ?Ñ?ÐµÑ?Ðµ Ñ? Ð¸Ð¼Ðµ %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d Ð´Ð°Ð½ Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[1] "%d Ð´Ð°Ð½Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[2] "%d Ð´Ð°Ð½Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
+msgstr[3] "%d Ð´Ð°Ð½ Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d Ñ?Ð°Ñ? Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[1] "%d Ñ?Ð°Ñ?Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[2] "%d Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
+msgstr[3] "%d Ñ?Ð°Ñ? Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d Ð¼Ð¸Ð½Ñ?Ñ? Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[1] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 msgstr[2] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
+msgstr[3] "%d Ð¼Ð¸Ð½Ñ?Ñ? Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸"
 
@@ -4133,103 +3982,111 @@ msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "1 Ð´Ð°Ð½ Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "1 Ñ?Ð°Ñ? Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "15 Ð¼Ð¸Ð½Ñ?Ñ?Ð° Ð¿Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾Ð³ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "Ð£Ñ?_ÐµÑ?Ð½Ð¸Ñ?Ð¸..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "Ð£Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½ Ð°Ð»Ð°Ñ?Ð¼:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "Ð?Ð¿Ð¸Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "Ð¡Ð°Ð¶Ðµ_Ñ?Ð°Ðº:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "_Ð?Ð»Ð°Ñ?Ð¼"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Ð?Ð¿Ð¸Ñ?:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Ð?Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð°:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#| msgid "Summary:"
+msgid "_Summary:"
+msgstr "_Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº:"
+
 # note(slobo): Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ?ÐµÐ±Ð° Ñ?Ð¾Ðº
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "_Ð?Ñ?ÐµÐ¼Ðµ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "Ð·Ð°"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "Ð´Ð¾"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109
-#: ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+#, fuzzy
+#| msgid "Print the list of memos"
+msgid "Print this memo"
+msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐµ Ñ?Ðµ Ñ? Ð¿Ñ?Ð¾Ñ?Ð»Ð¾Ñ?Ñ?Ð¸"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÑ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÑ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ñ?Ð½Ð¾ Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ð½Ð¸Ñ?Ñ?Ðµ Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ñ? â??%sâ??."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960
-#: ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301
-#: ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:269
+#: ../em-format/em-format.c:1026 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°"
 
@@ -4238,67 +4095,72 @@ msgstr "Ð?Ñ?Ð¸Ð¼Ð°"
 msgid "Sta_rt date:"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿_Ð¾Ñ?ÐµÑ?ÐºÐ°:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "Ð¡Ð°Ð¶Ðµ_Ñ?Ð°Ðº:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Ð?Ñ?Ð¸Ð¼Ð°:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Ð?Ñ?Ñ?Ð¿Ð°:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?. Ð¨Ñ?Ð° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Ð?ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?. Ð¨Ñ?Ð° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð´ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ñ?Ðµ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº. Ð¨Ñ?Ð° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?. Ð¨Ñ?Ð° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Ð¡Ð°Ð¼Ð¾ Ð¾Ð²Ð°Ñ? Ñ?Ð½Ð¾Ñ?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Ð?Ð²Ð°Ñ? Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ðµ Ñ?Ð½Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Ð?Ð²Ð°Ñ? Ð¸ Ð±Ñ?Ð´Ñ?Ñ?Ðµ Ñ?Ð½Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Ð¡Ð²Ðµ Ñ?Ð½Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ð?Ð²Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð° Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?ÐµÐ´ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ° Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "Ð½Ð°"
 
@@ -4306,7 +4168,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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "Ð¿Ñ?Ð²Ð¾Ñ?"
 
@@ -4315,7 +4177,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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "Ð´Ñ?Ñ?Ð³Ð¾Ñ?"
 
@@ -4323,7 +4185,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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "Ñ?Ñ?ÐµÑ?Ð¾Ñ?"
 
@@ -4331,7 +4193,7 @@ 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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð¾Ñ?"
 
@@ -4339,7 +4201,7 @@ msgstr "Ñ?ÐµÑ?Ð²Ñ?Ñ?Ð¾Ñ?"
 #. * (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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "Ð¿ÐµÑ?Ð¸"
 
@@ -4347,13 +4209,13 @@ msgstr "Ð¿ÐµÑ?Ð¸"
 #. * (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:1045
+#: ../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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Ð?Ñ?Ñ?Ð³Ð¸ Ð´Ð°Ñ?Ñ?Ð¼"
 
@@ -4361,7 +4223,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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "Ð¾Ð´ Ð¿Ñ?Ð²Ð¾Ð³ Ð´Ð¾ Ð´ÐµÑ?ÐµÑ?Ð¾Ð³"
 
@@ -4369,7 +4231,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] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "Ð¾Ð´ Ñ?ÐµÐ´Ð°Ð½Ð°ÐµÑ?Ñ?Ð¾Ð³ Ð´Ð¾ Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ?Ð¾Ð³"
 
@@ -4377,45 +4239,45 @@ 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] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "Ð¾Ð´ Ð´Ð²Ð°Ð´ÐµÑ?ÐµÑ? Ð¿Ñ?Ð²Ð¾Ð³ Ð´Ð¾ Ñ?Ñ?Ð¸Ð´ÐµÑ?ÐµÑ? Ð¿Ñ?Ð²Ð¾Ð³"
 
 #. 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:1112
+#: ../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:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "Ð¿Ð¾Ñ?Ð°Ð²Ðµ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð½Ð°Ñ?Ðµ Ð¸Ð·Ð±Ð¾Ñ? Ñ?Ð°Ð´Ð¸ Ð¼ÐµÑ?Ð°Ñ?Ð°."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸ Ð¸Ð·Ñ?Ð·ÐµÑ?Ð°Ðº"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð½Ð°Ñ?Ðµ Ð¸Ð·Ð±Ð¾Ñ? Ñ?Ð°Ð´Ð¸ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð°."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼/Ð²Ñ?ÐµÐ¼Ðµ"
 
@@ -4427,8 +4289,7 @@ msgstr "Ð¡Ð²Ð°ÐºÐ¸Ñ?"
 msgid "Exceptions"
 msgstr "Ð?Ð·Ñ?Ð·ÐµÑ?Ð¸"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
-#: ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´"
 
@@ -4436,53 +4297,65 @@ msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´"
 msgid "This appointment rec_urs"
 msgstr "Ð?Ð²Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ð¿Ð¾_Ð½Ð°Ð²Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "Ñ?Ð²ÐµÐº"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "Ð¼ÐµÑ?ÐµÑ?(Ð¸)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "Ð½ÐµÐ´ÐµÑ?Ð°(Ðµ)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð°(Ðµ)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¼Ð¾Ñ?Ðµ Ð°Ð»Ð°Ñ?Ð¼Ðµ Ñ?Ð° Ð¾Ð²Ð¸Ð¼ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?ÐµÐ¼"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?Ð¸ _Ñ?Ð°Ð¼Ð¾ Ð½Ð¾Ð²Ðµ Ñ?Ñ?ÐµÑ?Ð½Ð¸ÐºÐµ"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°"
 
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
+
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228
-#: ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648
-#: ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
@@ -4490,43 +4363,35 @@ msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135
-#: ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Ð?Ð¸Ñ?Ð¾ÐºÐ°"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812
-#: ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "Ð£ Ñ?Ð¾ÐºÑ?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133
-#: ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Ð?Ð°Ð»Ð°"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304
-#: ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "Ð?Ð±Ð¸Ñ?Ð½Ð°"
@@ -4534,13 +4399,10 @@ msgstr "Ð?Ð±Ð¸Ñ?Ð½Ð°"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224
-#: ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð·Ð°Ð¿Ð¾Ñ?ÐµÑ?Ð¾"
 
@@ -4556,19 +4418,17 @@ msgstr "_Ð¡Ñ?Ð°Ñ?Ðµ:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ?"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "Ð?ÐµÐ¾Ð´Ñ?ÐµÑ?ÐµÐ½Ð°"
@@ -4578,7 +4438,7 @@ msgid "_Date completed:"
 msgstr "_Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ°:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_Ð?Ð°Ð¶Ð½Ð¾Ñ?Ñ?:"
 
@@ -4586,53 +4446,64 @@ msgstr "_Ð?Ð°Ð¶Ð½Ð¾Ñ?Ñ?:"
 msgid "_Web Page:"
 msgstr "_Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "Ð?ÐµÑ?_Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸ Ð·Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ñ? Ð¸Ð»Ð¸ Ð´ÐµÑ?Ð°Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ð·Ð°Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Ð?Ð¾Ð³_Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ ÐºÐ¾Ð´ Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "_Ð?Ð°Ð´Ð°Ñ?Ð°Ðº"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+#, fuzzy
+#| msgid "Print the list of tasks"
+msgid "Print this task"
+msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?ÐºÐ° Ñ?Ðµ Ñ? Ð¿Ñ?Ð¾Ñ?Ð»Ð¾Ñ?Ñ?Ð¸"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "Ð Ð¾Ðº Ð·Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?ÐºÐ° Ñ?Ðµ Ñ? Ð¿Ñ?Ð¾Ñ?Ð»Ð¾Ñ?Ñ?Ð¸"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð¸, Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 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.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸_Ð·Ð°Ñ?Ð¾Ñ?:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?Ð°Ðº Ñ?Ðµ Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐ° Ñ? â??%sâ??."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "Ð£Ñ?_ÐµÑ?Ð½Ð¸Ñ?Ð¸..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ð?Ð°_Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ..."
@@ -4653,6 +4524,7 @@ msgid_plural "%d days"
 msgstr[0] "%d Ð´Ð°Ð½"
 msgstr[1] "%d Ð´Ð°Ð½Ð°"
 msgstr[2] "%d Ð´Ð°Ð½Ð°"
+msgstr[3] "%d Ð´Ð°Ð½"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:400
@@ -4662,6 +4534,7 @@ msgid_plural "%d weeks"
 msgstr[0] "%d Ð½ÐµÐ´ÐµÑ?Ð°"
 msgstr[1] "%d Ð½ÐµÐ´ÐµÑ?Ðµ"
 msgstr[2] "%d Ð½ÐµÐ´ÐµÑ?Ð°"
+msgstr[3] "%d Ð½ÐµÐ´ÐµÑ?Ð°"
 
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
@@ -4723,8 +4596,7 @@ msgstr "%s Ð½Ð° %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s Ð·Ð° Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ñ?Ð¸Ð¿ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../calendar/gui/e-cal-component-preview.c:192
-#: ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Ð?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¾"
 
@@ -4733,8 +4605,7 @@ msgid "Categories:"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151
-#: ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº:"
 
@@ -4749,8 +4620,8 @@ msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð° Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?Ð°Ðº:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ?:"
 
@@ -4759,9 +4630,8 @@ msgid "Priority:"
 msgstr "Ð?Ð°Ð¶Ð½Ð¾Ñ?Ñ?:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214
-#: ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Ð?Ð¿Ð¸Ñ?:"
 
@@ -4776,33 +4646,32 @@ msgstr "Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°:"
 msgid "Created"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../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-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543
-#: ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Ð?Ð°Ñ?Ð·ÐµÑ?Ð¾"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4818,73 +4687,47 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Ð?Ð°"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Ð?Ðµ"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?"
-
-#: ../calendar/gui/e-cal-model.c:387
-#: ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?ÐºÐ¾Ñ?ÐºÐµ"
-
-#: ../calendar/gui/e-cal-model.c:388
-#: ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562
-#: ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120
-#: ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989
-#: ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¾"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "Ð?Ð¾Ð´ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ %s"
@@ -4921,106 +4764,97 @@ msgid "Start date"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Ð¢Ð¸Ð¿"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "Ð¡ÐµÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "Ð?Ñ?Ð¸Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/e-calendar-view.c:429
-#: ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ñ? Ð¾Ð±Ñ?ÐµÐºÐ°Ñ?Ð°"
 
-#: ../calendar/gui/e-calendar-view.c:617
-#: ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ?Ð°"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182
-#: ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "Ð?Ð´Ð±Ð¸Ñ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Ð¡Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð¾Ð¼"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "Ð?ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð° Ñ?Ð°Ð´Ñ?Ñ?"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1835
-#: ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839
-#: ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¾: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: %s %s"
@@ -5076,10 +4910,8 @@ 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:864
-#: ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222
-#: ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5094,11 +4926,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868
-#: ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5111,34 +4942,36 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872
-#: ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115
-#: ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118
-#: ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "%d. Ð½ÐµÐ´ÐµÑ?Ð°"
 
+#: ../calendar/gui/e-itip-control.c:761
+#| msgid "Recurring"
+msgid "Recurring:"
+msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ð?Ð°. (Ð¡Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ)"
@@ -5150,6 +4983,7 @@ msgid_plural "Every %d days"
 msgstr[0] "Ð¡Ð²Ð°ÐºÐ¸ %d Ð´Ð°Ð½"
 msgstr[1] "Ð¡Ð²Ð°ÐºÐ° %d Ð´Ð°Ð½Ð°"
 msgstr[2] "Ð¡Ð²Ð°ÐºÐ¸Ñ? %d Ð´Ð°Ð½Ð°"
+msgstr[3] "Ð¡Ð²Ð°ÐºÐ¸ Ð´Ð°Ð½"
 
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
@@ -5158,6 +4992,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Ð¡Ð²Ð°ÐºÐµ %d Ð½ÐµÐ´ÐµÑ?Ðµ"
 msgstr[1] "Ð¡Ð²Ð°ÐºÐµ %d Ð½ÐµÐ´ÐµÑ?Ðµ"
 msgstr[2] "Ð¡Ð²Ð°ÐºÐ¸Ñ? %d Ð½ÐµÐ´ÐµÑ?Ð°"
+msgstr[3] "Ð¡Ð²Ð°ÐºÐµ Ð½ÐµÐ´ÐµÑ?Ðµ"
 
 #: ../calendar/gui/e-itip-control.c:802
 #, c-format
@@ -5166,6 +5001,7 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "Ð¡Ð²Ð°ÐºÐµ %d Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? "
 msgstr[1] "Ð¡Ð²Ð°ÐºÐµ %d Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? "
 msgstr[2] "Ð¡Ð²Ð°ÐºÐ¸Ñ? %d Ð½ÐµÐ´ÐµÑ?Ð° Ñ? "
+msgstr[3] "Ð¡Ð²Ð°ÐºÐµ Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
 #: ../calendar/gui/e-itip-control.c:813
@@ -5190,6 +5026,7 @@ msgid_plural "every %d months"
 msgstr[0] "Ñ?Ð²Ð°ÐºÐ¾Ð³ %d Ð¼ÐµÑ?ÐµÑ?Ð°"
 msgstr[1] "Ñ?Ð²Ð°ÐºÐ° %d Ð¼ÐµÑ?ÐµÑ?Ð°"
 msgstr[2] "Ñ?Ð²Ð°ÐºÐ¸Ñ? %d Ð¼ÐµÑ?ÐµÑ?Ð¸"
+msgstr[3] "Ñ?Ð²Ð°ÐºÐ¾Ð³ Ð¼ÐµÑ?ÐµÑ?Ð°"
 
 # Ñ?Ð»Ð¸Ñ?Ð½Ð¾ ÐºÐ°Ð¾ Ð·Ð° Ð¼ÐµÑ?ÐµÑ?Ðµ Ð¸ Ð½ÐµÐ´ÐµÑ?Ðµ
 #: ../calendar/gui/e-itip-control.c:861
@@ -5199,6 +5036,7 @@ msgid_plural "Every %d years"
 msgstr[0] "Ð¡Ð²Ð°ÐºÐµ %d Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 msgstr[1] "Ð¡Ð²Ð°ÐºÐµ %d Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 msgstr[2] "Ð¡Ð²Ð°ÐºÐ¸Ñ? %d Ð³Ð¾Ð´Ð¸Ð½Ð°"
+msgstr[3] "Ð¡Ð²Ð°ÐºÐµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
 #: ../calendar/gui/e-itip-control.c:874
 #, c-format
@@ -5207,6 +5045,7 @@ msgid_plural "a total of %d times"
 msgstr[0] "Ñ?ÐºÑ?Ð¿Ð½Ð¾ %d Ð¿Ñ?Ñ?"
 msgstr[1] "Ñ?ÐºÑ?Ð¿Ð½Ð¾ %d Ð¿Ñ?Ñ?Ð°"
 msgstr[2] "Ñ?ÐºÑ?Ð¿Ð½Ð¾ %d Ð¿Ñ?Ñ?Ð°"
+msgstr[3] "Ñ?ÐºÑ?Ð¿Ð½Ð¾ %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:885
@@ -5228,8 +5067,7 @@ msgstr "Ð?Ð°Ð²Ñ?Ñ?Ð°Ð²Ð° Ñ?Ðµ"
 msgid "Due"
 msgstr "Ð Ð¾Ðº"
 
-#: ../calendar/gui/e-itip-control.c:986
-#: ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
@@ -5238,21 +5076,26 @@ msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 msgid "iCalendar Error"
 msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1080
-#: ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107
-#: ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð¾Ñ?Ð¾Ð±Ð°"
 
-#: ../calendar/gui/e-itip-control.c:1132
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¸ Ð¿Ð¾Ñ?Ð¾Ð¼ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ñ? Ð¸Ð· Ð´Ð¾Ñ?ÐµÐ³ Ð¼ÐµÐ½Ð¸Ñ?Ð°."
+#: ../calendar/gui/e-itip-control.c:1145
+#, fuzzy
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+"<br> Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¸ Ð¿Ð¾Ñ?Ð¾Ð¼ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ñ? Ð¸Ð· Ð´Ð¾Ñ?ÐµÐ³ Ð¼ÐµÐ½Ð¸Ñ?Ð°."
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -5260,286 +5103,305 @@ msgstr "<br> Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¸ Ð¿Ð¾Ñ?Ð¾Ð¼ Ð¸Ð·
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¾ Ñ? Ñ?ÐµÐ·ÐµÑ?Ð²Ð¾Ð¼"
 
-#: ../calendar/gui/e-itip-control.c:1277
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1290
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½, Ð¼ÐµÑ?Ñ?Ñ?Ð¸Ð¼ Ð½Ð¸Ñ?Ðµ Ð³Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸ Ñ? Ð?Ð°Ñ?Ð¸Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸Ð¼Ð°"
 
-#: ../calendar/gui/e-itip-control.c:1279
-msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½, Ð¼ÐµÑ?Ñ?Ñ?Ð¸Ð¼ Ð½Ð¸Ñ?Ðµ Ð³Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸ Ñ? Ð?Ð°Ñ?Ð¸Ð¼ Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð¸Ð¼Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
+#: ../calendar/gui/e-itip-control.c:1292
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"Ð?Ð°Ð´Ð°Ñ?Ð°Ðº Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½, Ð¼ÐµÑ?Ñ?Ñ?Ð¸Ð¼ Ð½Ð¸Ñ?Ðµ Ð³Ð° Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð¸ Ñ? Ð?Ð°Ñ?Ð¸Ð¼ Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð¸Ð¼Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1356
-#, c-format
-msgid "<b>%s</b> has published meeting information."
+#: ../calendar/gui/e-itip-control.c:1369
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1363
-#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
+#: ../calendar/gui/e-itip-control.c:1376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
 msgstr "<b>%s</b> Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ %s Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1365
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
+#: ../calendar/gui/e-itip-control.c:1378
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
 msgstr "<b>%s</b> Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð?Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Ð?Ñ?ÐµÐ´Ð»Ð¾Ð³ Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+#: ../calendar/gui/e-itip-control.c:1385
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð´ÐµÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ³ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1377
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
+#: ../calendar/gui/e-itip-control.c:1390
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ð° Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ð° Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ² Ð·Ð° Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
+#: ../calendar/gui/e-itip-control.c:1398
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
 msgstr "<b>%s</b> Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð° Ð½Ð° Ð·Ð°Ñ?Ñ?ÐµÐ² Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../calendar/gui/e-itip-control.c:1393
-#, c-format
-msgid "<b>%s</b> has canceled a meeting."
+#: ../calendar/gui/e-itip-control.c:1406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a meeting."
+msgid "%s has canceled a meeting."
 msgstr "<b>%s</b> Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Ð?Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1404
-#: ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
 msgstr "<b>%s</b> Ñ?Ð°Ñ?Ðµ Ð½ÐµÑ?Ð°Ð·Ñ?Ð¼Ñ?Ð¸Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "Ð?Ð¾Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1432
-#, c-format
-msgid "<b>%s</b> has published task information."
+#: ../calendar/gui/e-itip-control.c:1445
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published task information."
+msgid "%s has published task information."
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1440
-#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
+#: ../calendar/gui/e-itip-control.c:1453
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
 msgstr "<b>%s</b> Ñ?Ñ?Ð°Ð¶Ð¸ %s Ð·Ð° Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°."
 
-#: ../calendar/gui/e-itip-control.c:1442
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: ../calendar/gui/e-itip-control.c:1455
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
 msgstr "<b>%s</b> Ñ?Ñ?Ð°Ð¶Ð¸ Ð´Ð° Ð?Ð¸ Ð¸Ð·Ð²Ñ?Ñ?Ð¸Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Ð?Ñ?ÐµÐ´Ð»Ð¾Ð³ Ð·Ð° Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+#: ../calendar/gui/e-itip-control.c:1462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
 msgstr "<b>%s</b Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð´ÐµÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ³ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1454
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: ../calendar/gui/e-itip-control.c:1467
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð° Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ð° Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ð° Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ² Ð·Ð° Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?ÐµÐ¼ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: ../calendar/gui/e-itip-control.c:1475
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
 msgstr "<b>%s</b> Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð° Ð½Ð° Ð´Ð¾Ð´ÐµÑ?ÐµÐ½ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/e-itip-control.c:1470
-#, c-format
-msgid "<b>%s</b> has canceled a task."
+#: ../calendar/gui/e-itip-control.c:1483
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a task."
+msgid "%s has canceled a task."
 msgstr "<b>%s</b> Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Ð?Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "Ð?Ð¾Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?"
 
-#: ../calendar/gui/e-itip-control.c:1506
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: ../calendar/gui/e-itip-control.c:1519
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ"
 
-#: ../calendar/gui/e-itip-control.c:1511
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: ../calendar/gui/e-itip-control.c:1524
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
 msgstr "<b>%s</b> Ð¿Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° Ñ?Ñ?Ðµ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¸/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¸."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð·Ð°Ñ?Ñ?ÐµÐ²"
 
-#: ../calendar/gui/e-itip-control.c:1516
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
+#: ../calendar/gui/e-itip-control.c:1529
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
 msgstr "<b>%s</b> Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð° Ð½Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð·Ð°Ñ?Ñ?ÐµÐ²."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "Ð?Ð¾Ñ?Ð° Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð°"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ð½ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ð·Ð°Ñ?Ñ?ÐµÐ²Ðµ."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð³ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð·Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð³ Ð½ÐµÐ¼Ð° Ñ?Ñ?Ð°Ð²ÐºÐµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð¼Ð¾Ð³Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð¸"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Ð?Ð±Ñ?ÐµÐºÐ°Ñ? Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ð?Ð²Ð°Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº.  Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð³Ð° Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ðµ?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?Ð½Ð¸ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ñ?ÐµÑ? Ð½ÐµÐ¼Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½ Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?Ð½Ð¸ÐºÐ°\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ñ?ÐµÑ?Ð½Ð¸ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¾Ñ?Ð²ÐµÐ¶ÐµÐ½ Ñ?ÐµÑ? Ñ?Ñ?Ð°Ð²ÐºÐ° Ð²Ð¸Ñ?Ðµ Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../calendar/gui/e-itip-control.c:2102
-#: ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108
-#: ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ñ?:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð¾Ð¼"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Ð?Ð´Ð±Ð¸Ñ?"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð¸ Ñ?Ñ?Ð°Ñ?Ñ?Ñ? Ñ?Ð°Ð³Ð¾Ð²Ð¾Ñ?Ð½Ð¸ÐºÐ°"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
 
@@ -5588,78 +5450,65 @@ msgid "Resources"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð¸"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Ð?Ð¾Ñ?ÐµÐ´Ð¸Ð½Ð°Ñ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97
-#: ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:969
-#: ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Ð?Ñ?Ñ?Ð¿Ð°"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Ð?Ð·Ð²Ð¾Ñ?"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Ð¡Ð¾Ð±Ð°"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Ð¡Ñ?Ð¾Ð»Ð¸Ñ?Ð°"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Ð?Ð±Ð°Ð²ÐµÐ·Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "Ð?Ð¾Ð³Ñ?Ñ?Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Ð?Ðµ-Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180
-#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 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:537
 msgid "Attendee                          "
 msgstr "Ð£Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "Ð£ Ñ?Ð¾ÐºÑ?"
 
@@ -5667,7 +5516,7 @@ 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -5681,7 +5530,7 @@ msgstr "%A, %d %B , %Y."
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
@@ -5696,67 +5545,63 @@ msgstr "%a %d. %m. %Y."
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Ð?Ð°Ð½ ÐºÐ°Ð½Ñ?ÐµÐ»Ð°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ°"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "Ð£Ñ?_ÐµÑ?Ð½Ð¸Ñ?Ð¸..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "Ð?_Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð°Ð¼Ð¾ Ñ?Ð°Ð´Ð½Ðµ Ñ?Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð¼Ð°Ñ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ? Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Ð¡Ð°Ð¼Ð¾Ð¸Ð·Ð±Ð¾Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Ð¡Ð²Ðµ Ñ?Ñ?Ð´Ðµ Ð¸ Ð¸Ð·Ð²Ð¾Ñ?Ðµ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Ð¡Ð²Ðµ _Ñ?Ñ?Ð´Ðµ Ð¸ Ñ?ÐµÐ´Ð°Ð½ Ð¸Ð·Ð²Ð¾Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Ð?Ð±Ð°Ð²ÐµÐ·Ð½Ðµ Ñ?Ñ?Ð´Ðµ"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Ð?Ð±Ð°Ð²ÐµÐ·Ð½Ðµ Ñ?Ñ?Ð´Ðµ Ð¸ _Ñ?ÐµÐ´Ð°Ð½ Ð¸Ð·Ð²Ð¾Ñ?"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ _Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ°:"
 
@@ -5784,48 +5629,47 @@ msgstr "Ð?ÐµÐ·Ð¸Ðº"
 msgid "Member"
 msgstr "Ð§Ð»Ð°Ð½"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/e-memo-table.c:489
-#: ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* Ð?ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ° *"
 
-#: ../calendar/gui/e-memo-table.c:573
-#: ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº:"
 
-#: ../calendar/gui/e-memo-table.c:591
-#: ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "Ð?Ð¾: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "Ð¡ÐµÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "Ð?Ð¸Ñ?Ð° Ñ?Ð²Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 
@@ -5833,87 +5677,56 @@ msgstr "Ð?Ð¸Ñ?Ð° Ñ?Ð²Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 msgid "Click to add a memo"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+# Don't use any other specifiers.
+# strftime format %d = day of month, %b = abbreviated
+# month name. You can change the order but don't
+# change the specifiers or add anything.
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-task-table.c:624
-#: ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#, fuzzy, c-format
+#| msgid "%d %b"
+msgid "%d%%"
+msgstr "%d. %b"
+
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "Ð¡ÐµÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "Ð?Ð¸Ñ?Ð° Ñ?Ð²Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ?"
 
@@ -5922,57 +5735,56 @@ 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:239
-#: ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Ð?Ð¼Ð° Ð°Ð»Ð°Ñ?Ð¼Ðµ."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Ð?Ð¼Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð°."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "Ð¢Ð¾ Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?ÐºÐ¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?: Ñ?Ð°Ð¶ÐµÑ?Ð°Ðº Ñ?Ðµ %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?ÐºÐ¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?: Ð½ÐµÐ¼Ð° Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Ð£Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð¾ÐºÑ?Ñ?"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Ð?Ð¾Ð²Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Ð?Ð¾Ð²Ð¸ Ñ?ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Ð?Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Ð?Ð´Ð¸ Ð½Ð° Ð´Ð°Ð½Ð°Ñ?Ñ?Ð¸ Ð´Ð°Ð½"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Ð?Ð´Ð¸ Ð½Ð° Ð´Ð°Ñ?Ñ?Ð¼"
 
@@ -5981,26 +5793,25 @@ msgstr "Ð?Ð´Ð¸ Ð½Ð° Ð´Ð°Ñ?Ñ?Ð¼"
 msgid "a table to view and select the current time range"
 msgstr "Ñ?Ð°Ð±ÐµÐ»Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¸ Ð¸Ð·Ð±Ð¾Ñ? Ñ?ÐµÐºÑ?Ñ?ÐµÐ³ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¾Ð³ Ñ?Ð°Ñ?Ð¿Ð¾Ð½Ð°"
 
-#: ../calendar/gui/ea-day-view.c:152
-#: ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Ð?Ð¼Ð° %d Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?."
 msgstr[1] "Ð?Ð¼Ð° %d Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°."
 msgstr[2] "Ð?Ð¼Ð° %d Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°."
+msgstr[3] "Ð?Ð¼Ð° %d Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157
-#: ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð°Ð´Ð½Ðµ Ð½ÐµÐ´ÐµÑ?Ðµ: %s. %s"
@@ -6008,47 +5819,47 @@ msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð°Ð´Ð½Ðµ Ð½ÐµÐ´ÐµÑ?Ðµ: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ñ?Ð°Ð´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ñ?ÐµÐ´Ð°Ð½ Ð¸Ð»Ð¸ Ð²Ð¸Ñ?Ðµ Ð´Ð°Ð½Ð°"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Ð?Ð½Ð¾Ð¼Ð¾Ð² ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -6070,15 +5881,15 @@ msgstr "Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "Ð?ÐµÐ´ÐµÑ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ð¼ÐµÑ?ÐµÑ?"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð·Ð° Ñ?ÐµÐ´Ð½Ñ? Ð¸Ð»Ð¸ Ð²Ð¸Ñ?Ðµ Ð½ÐµÐ´ÐµÑ?Ð°"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
@@ -6131,44 +5942,40 @@ msgid "Select Date"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ñ?Ð¼"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Ð¡ÐµÐ¿Ñ?ÐµÐ¼Ð±Ð°Ñ?"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ _Ð´Ð°Ð½Ð°Ñ?Ñ?Ð¸ Ð´Ð°Ð½"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð´Ð°Ð½Ð°Ñ?Ñ?Ð¸ Ð´Ð°Ð½"
+msgid "September"
+msgstr "Ð¡ÐµÐ¿Ñ?ÐµÐ¼Ð±Ð°Ñ?"
 
-#: ../calendar/gui/itip-utils.c:409
-#: ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ? Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ñ?ÐµÐ´Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº Ñ?Ðµ Ð½ÐµÐ¾Ð¿Ñ?Ð¾Ð´Ð°Ð½"
 
-#: ../calendar/gui/itip-utils.c:633
-#: ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ñ?"
 
-#: ../calendar/gui/itip-utils.c:636
-#: ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?"
 
-#: ../calendar/gui/itip-utils.c:639
-#: ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸"
 
-#: ../calendar/gui/itip-utils.c:642
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
@@ -6176,7 +5983,7 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¾"
@@ -6185,7 +5992,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:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¾ Ñ? Ñ?ÐµÐ·ÐµÑ?Ð²Ð¾Ð¼"
@@ -6197,8 +6004,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:693
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Ð?Ð´Ð±Ð¸Ñ?ÐµÐ½Ð¾"
@@ -6207,7 +6013,7 @@ msgstr "Ð?Ð´Ð±Ð¸Ñ?ÐµÐ½Ð¾"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Ð?ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ð½Ð¾"
@@ -6215,7 +6021,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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶ÐµÐ½Ð¾"
@@ -6223,7 +6029,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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
@@ -6231,7 +6037,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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð¸"
@@ -6239,29 +6045,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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¸Ð²-Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð³"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ð¡Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ (%s Ð´Ð¾ %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð½Ð¾Ñ?, Ð½Ð¾Ð²Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ñ?Ðµ ÐºÐ¾Ñ?Ð¸ Ñ?Ð° Ð½ÐµÐºÐ¸Ð¼ Ð´Ñ?Ñ?Ð³Ð¸Ð¼."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð½Ð¾Ñ?, Ð³Ñ?ÐµÑ?ÐºÐ°:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°."
 
@@ -6417,49 +6223,73 @@ msgstr "Ð?Ðµ"
 msgid "Sa"
 msgstr "Ð¡Ñ?"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " Ð·Ð° "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (Ð?Ð¾ "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "Ð?Ð¾ "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Ð?Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ð¸:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ?: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "Ð?Ð°Ð¶Ð½Ð¾Ñ?Ñ?: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð°Ðº Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾Ð³: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸: "
 
@@ -6468,62 +6298,232 @@ msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸: "
 msgid "% Completed"
 msgstr "% Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "Ð£ Ñ?Ð¾ÐºÑ?"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../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:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "Ñ?Ðµ Ð¼Ð°Ñ?Ðµ Ð¾Ð´"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ñ?Ð¸"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Ð?Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+#, fuzzy
+#| msgid "vCalendar files (.vcf)"
+msgid "vCalendar files (.vcs)"
 msgstr "Ð²Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð²Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?ÐºÐ¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð¸"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð¸Ð½Ñ?ÐµÐ»Ð¸Ð³ÐµÐ½Ñ?Ð½Ð¸ Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgctxt "New"
+#| msgid "M_eeting"
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgid "Events"
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ?"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+#| msgid "Task"
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Ð?Ð°Ð´Ð°Ñ?Ð°Ðº"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+#| msgid "Memo"
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "Ð?ÐµÐ»ÐµÑ?ÐºÐ°"
+
+#: ../calendar/importers/icalendar-importer.c:941
+#| msgid "It has recurrences."
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "Ð¸Ð¼Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ð°"
+
+#: ../calendar/importers/icalendar-importer.c:946
+#, fuzzy
+#| msgid "This and Prior Instances"
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "Ð?Ð²Ð°Ñ? Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ðµ Ñ?Ð½Ð¾Ñ?Ðµ"
+
+#: ../calendar/importers/icalendar-importer.c:951
+#| msgid "It has alarms."
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "Ð¸Ð¼Ð° Ð°Ð»Ð°Ñ?Ð¼Ðµ"
+
+#: ../calendar/importers/icalendar-importer.c:956
+#, fuzzy
+#| msgid "%s attachment"
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "%s Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+#| msgid "Public"
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Ð?Ð°Ð²Ð½Ð¾"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+#| msgid "Private"
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "Ð?Ð¸Ñ?Ð½Ð¾"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+#| msgid "Confidential"
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Ð?Ð¾Ð²ÐµÑ?Ñ?Ð¸Ð²Ð¾"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+#| msgid "Classification"
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+#| msgid "Summary"
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+#| msgid "Location"
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Ð?ÐµÑ?Ñ?Ð¾"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+#| msgid "Start"
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+#, fuzzy
+#| msgid "Due"
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Ð Ð¾Ðº"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+#| msgid "End"
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Ð?Ñ?Ð°Ñ?"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+#| msgid "Categories"
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Ð?Ð°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ"
+
+# timezone.
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+#| msgid "Completed"
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+#| msgid "URL"
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+#| msgid "Organizer"
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¾Ñ?"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+#| msgid "Attendees"
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "Ð£Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+#| msgid "Description"
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Ð?Ð¿Ð¸Ñ?"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+#| msgid "Type"
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Ð¢Ð¸Ð¿"
+
 # * We only place them here so gettext picks them up for translation.
 # * Don't include in any C files.
 #.
@@ -8075,302 +8075,288 @@ msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ð¸Ðº/Ð?Ð¾Ð»Ð¸Ñ?"
 msgid "Pacific/Yap"
 msgstr "Ð?Ð°Ñ?Ð¸Ñ?Ð¸Ðº/Ð?Ð°Ð¿"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "Ð?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:374
 msgid "Attach a file"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð¶Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "Ð¨Ñ?Ð°Ð¼_Ð¿Ð°Ñ?..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´ Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Ð§Ñ?Ð²Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? _ÐºÐ°Ð¾..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "Ð§Ñ?Ð²Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð¿Ð¾Ð´ Ð´Ñ?Ñ?Ð³Ð¸Ð¼ Ð¸Ð¼ÐµÐ½Ð¾Ð¼"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ _Ð½Ð°Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Ð§Ñ?Ð²Ð° ÐºÐ°Ð¾ Ð½Ð°Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:328
-#: ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "Ð?Ð¾Ñ?_Ð°Ñ?Ð¸"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "Ð¨Ð°Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "Ð?Ð¾Ð²Ð° _Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð·Ð° Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "Ð?Ð¾_Ð´Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PGP _Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? PGP-Ð°"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "PGP _Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? PGP ÐºÑ?Ñ?Ñ?Ð°"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "Ð?_Ð°Ð¶Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð²Ð°Ð¶Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð° Ð²Ð¸Ñ?Ð¾ÐºÐ¾"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "Ð¢_Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð° Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ð¸ ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? S/MIME Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ñ?Ñ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? S/MIME Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¾Ð¼"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_Bcc Ð¿Ð¾Ñ?Ðµ"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ BCC Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Cc Ð¿Ð¾Ñ?Ðµ"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ CC Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "Ð¨_Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ Ð¨Ð°Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "Ð?Ð´Ð³Ð¾_Ð²Ð¾Ñ?-Ð·Ð° Ð¿Ð¾Ñ?Ðµ"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Ð?Ð¸Ñ?Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?-Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð½Ð°Ñ?Ñ?Ñ?"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ "
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ?"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? (cc) Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../composer/e-composer-header-table.c:47
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð±ÐµÐ· Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+#: ../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"
+msgstr ""
+"Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð±ÐµÐ· Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ "
+"Ð¿Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "Ð¨_Ð°Ñ?Ðµ:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323
-#: ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "Ð¨Ð°Ñ?Ðµ"
-
 # *
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "_Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?-Ð·Ð°:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "_Ð?Ñ?Ð¸Ð¼Ð°:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Ð?Ð¾Ð¿Ð¸Ñ?Ð° (Cc):"
 
-#: ../composer/e-composer-header-table.c:979
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Ð?ÐµÐ²Ð¸Ð´Ñ?Ð¸Ð²Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð° (Bcc):"
 
-#: ../composer/e-composer-header-table.c:985
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "Ð¡_Ð»Ð°Ñ?Ðµ Ð½Ð°:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "Ð?Ð°_Ñ?Ð»Ð¾Ð²:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "Ð?Ð¾Ñ?Ð¿_Ð¸Ñ?:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð·Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?."
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ñ?Ð»Ð°Ñ?Ðµ"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "Ð?Ð¿Ð¾Ð·Ð¸Ð²Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ? Ñ?Ð°Ð´Ñ?Ñ?"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð²Ñ?Ñ?Ð¸ Ð¾Ð¿Ð¾Ð·Ð²Ð°Ð½Ñ? Ñ?Ð°Ð´Ñ?Ñ?"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ñ?Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ñ?Ñ?Ðµ Ð¸ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð½Ð°Ñ?Ñ?Ñ?"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187
-#: ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_Ð?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ? Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 
-#: ../composer/e-msg-composer.c:983
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³"
+#: ../composer/e-msg-composer.c:1029
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° "
+"Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../composer/e-msg-composer.c:990
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³"
+#: ../composer/e-msg-composer.c:1041
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° "
+"Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¸Ð· Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¾Ð³ Ñ?Ñ?Ð²Ð°Ñ?Ð°"
 
-#: ../composer/e-msg-composer.c:1445
-#: ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../composer/e-msg-composer.c:3310
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-msgstr "<b>(Ð¡Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ? Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ?, Ñ?Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¾.)<b>"
+#: ../composer/e-msg-composer.c:3538
+#, fuzzy
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be "
+#| "edited.)</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr ""
+"<b>(Ð¡Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ? Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ?, Ñ?Ñ?Ð¾ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¾.)<b>"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "Ð?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
-msgstr " Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¾Ð²Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ñ?Ð° Ñ?Ð¾Ð¼ "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ñ?Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð°Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¾Ð²Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸ Ð½ÐµÑ?Ðµ "
+"Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ñ?Ð° Ñ?Ð¾Ð¼ "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Ð¡Ð²Ð¸ Ð½Ð°Ð»Ð¾Ð·Ð¸ Ñ?Ñ? Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½Ð¸."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð´Ð±Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ?, Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ?ÐµÐ½Ñ? â??{0}â??, ÐºÐ¾Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -8387,8 +8373,14 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Ð?Ð±Ð¾Ð³ &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?ÐµÐ¼ Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð´Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?, Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð?Ð°Ñ?Ñ?Ñ?Ð¸. Ð?Ð²Ð¾ Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ°Ñ?Ð½Ð¸Ñ?Ðµ."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"Ð?Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?ÐµÐ¼ Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð´Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?, Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ "
+"Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð?Ð°Ñ?Ñ?Ñ?Ð¸. Ð?Ð²Ð¾ Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ "
+"Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ°Ñ?Ð½Ð¸Ñ?Ðµ."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -8424,18 +8416,26 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ? Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð·Ð±Ð¾Ð³ &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð»Ð° Ñ?Ð¾ÐºÐ¾Ð¼ Ð¿Ð¸Ñ?Ð°Ñ?Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð¡Ð¿Ð°Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ð´Ðµ Ñ?Ñ?Ðµ Ñ?Ñ?Ð°Ð»Ð¸."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½Ð¾ Ð·Ð°Ð²Ñ?Ñ?Ð¸Ð»Ð° Ñ?Ð¾ÐºÐ¾Ð¼ Ð¿Ð¸Ñ?Ð°Ñ?Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð¡Ð¿Ð°Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ "
+"Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ð´Ðµ Ñ?Ñ?Ðµ Ñ?Ñ?Ð°Ð»Ð¸."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+#| msgid ""
+#| "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° â??{0}â?? Ð½Ð¸Ñ?Ðµ Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð° Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ HTML Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°.\n"
 "\n"
@@ -8446,7 +8446,9 @@ msgid "Unable to activate the address selector control."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð¶Ð¸Ñ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??{0}â?? Ð¾Ð²Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8469,287 +8471,327 @@ msgstr "Ð¡Ð¿Ð°_Ñ?Ð¸"
 msgid "_Save Draft"
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð½Ð°Ñ?Ñ?Ñ?"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Anjal Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?"
 
-#: ../capplet/anjal-settings-main.c:203
-#| msgid "Mark as _default memo list"
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Anjal Ð·Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾Ð³ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "Ð?Ð? Ñ?Ð¾ÐºÐµÑ?Ð° Ð·Ð° Ñ?Ð¼ÐµÑ?Ð°Ñ?Ðµ"
 
-#: ../capplet/anjal-settings-main.c:211
-#| msgid "sort"
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "Ñ?Ð¾ÐºÐµÑ?"
 
-#: ../capplet/anjal-settings-main.c:225
-#| msgid "Default Mail Client"
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Ð?Ð»Ð¸Ñ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-#| msgid "New _Task"
-msgid "New Tab"
-msgstr "Ð?Ð¾Ð²Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
-
-#: ../capplet/settings/mail-account-view.c:56
-#| msgid "Please enter user name first."
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð?Ð°Ñ?Ðµ Ð¿Ñ?Ð½Ð¾ Ð¸Ð¼Ðµ."
 
-#: ../capplet/settings/mail-account-view.c:57
-#| msgid "Please enter user name first."
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "Ð£Ð½ÐµÑ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð°."
 
-#: ../capplet/settings/mail-account-view.c:224
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Ð?Ð¸Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+#| msgid "Please enter your email address."
+msgid "Please enter your password."
+msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ñ? Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../capplet/settings/mail-account-view.c:464
+#| msgid "Personal"
+msgid "Personal details:"
+msgstr "Ð?Ð¸Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Ð?Ð¼Ðµ:"
 
-#: ../capplet/settings/mail-account-view.c:238
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ:"
 
-#: ../capplet/settings/mail-account-view.c:248
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Ð?ÐµÑ?Ð°Ñ?Ð¸ Ð·Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Ð?ÐµÑ?Ð°Ñ?Ð¸:</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:496
+#| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ:</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "Ð¢Ð¸Ð¿ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: "
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾Ð¸Ð¼Ðµ:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "Ð½Ð¸ÐºÐ°Ð´Ð°"
 
-#: ../capplet/settings/mail-account-view.c:298
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Ð?ÐµÑ?Ð°Ñ?Ð¸ Ð·Ð° Ñ?Ð»Ð°Ñ?Ðµ:</span>"
+#: ../capplet/settings/mail-account-view.c:545
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Ð¡Ð»Ð°Ñ?Ðµ:</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
-msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
-msgstr "Ð?Ð° Ð±Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ð»Ð¸ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³. Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¾Ð»Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð´Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð¾ Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸, Ð¼Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?."
+#: ../capplet/settings/mail-account-view.c:585
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"Ð?Ð° Ð±Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ð»Ð¸ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³. Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¾Ð»Ðµ "
+"Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð´Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ð¾ "
+"Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸, Ð¼Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?."
 
-#: ../capplet/settings/mail-account-view.c:357
-msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
-msgstr "Ð?Ð°Ð¾ Ð½Ð°Ð¼ Ñ?Ðµ, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð´Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ. Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ñ? Ð´Ð¾Ð»Ðµ. Ð?Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ñ?Ð¼Ð¾ Ð´Ð° Ñ?Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÐ¼Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ, Ð°Ð»Ð¸ Ñ?Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð´Ð° Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ."
+#: ../capplet/settings/mail-account-view.c:587
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"Ð?Ð°Ð¾ Ð½Ð°Ð¼ Ñ?Ðµ, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÐ¼Ð¾ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð´Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ. Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ñ? Ð´Ð¾Ð»Ðµ. "
+"Ð?Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ñ?Ð¼Ð¾ Ð´Ð° Ñ?Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÐ¼Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ, Ð°Ð»Ð¸ Ñ?Ðµ "
+"Ð¼Ð¾Ð¶Ð´Ð° Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð´Ð° Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ."
 
-#: ../capplet/settings/mail-account-view.c:359
-#| msgid "You may only configure a single Exchange account."
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ Ñ?Ð¾Ñ? Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°."
 
-#: ../capplet/settings/mail-account-view.c:361
-msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
-msgstr "Ð¡Ð°Ð´Ð° Ñ?Ñ? Ð½Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ð»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ñ?Ð¼Ð¾ Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ð´Ð¸Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ, Ð¿Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð´Ð° Ð¸Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ."
+#: ../capplet/settings/mail-account-view.c:591
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Ð¡Ð°Ð´Ð° Ñ?Ñ? Ð½Ð°Ð¼ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ð»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ñ?Ð¼Ð¾ Ñ?Ð° Ð¿Ð¾Ð³Ð¾Ð´Ð¸Ð¼Ð¾ "
+"Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ, Ð¿Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð´Ð° Ð¸Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð½Ð°Ð»Ð¾Ð³Ð°."
 
-#: ../capplet/settings/mail-account-view.c:363
-msgid "Time to check things over before we try and connect to the server and fetch your mail."
-msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?ÐµÐ¼ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð°Ð´Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
+#: ../capplet/settings/mail-account-view.c:593
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Ð?Ñ?ÐµÐ¼Ðµ Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð¿Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?ÐµÐ¼ Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? "
+"Ñ?Ð°Ð´Ð¸ Ð´Ð¾Ð±Ð°Ð²Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064
-#: ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?ÐµÑ?"
 
-#: ../capplet/settings/mail-account-view.c:378
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´ - Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´ - Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "Ð?Ð°Ð·Ð°Ð´ - Ð?Ð´ÐµÐ½Ñ?Ð¸Ñ?ÐµÑ?"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´ - Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:380
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "Ð?Ð°Ð·Ð°Ð´ - Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´ - Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´ - Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "Ð?Ð°Ð·Ð°Ð´ - Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774
-#: ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 
-#: ../capplet/settings/mail-account-view.c:383
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "Ð?Ð°Ð·Ð°Ð´ - Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÑ?Ð°Ðº"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "Ð?Ð°Ð·Ð°Ð´ - Ð¡Ð»Ð°Ñ?Ðµ"
 
 #: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
-#| msgid "Close"
+#, fuzzy
+#| msgid "Add WebDAV contacts to Evolution."
+msgid "Setup Google contacts with Evolution"
+msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ WebDAV ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
+
+#: ../capplet/settings/mail-account-view.c:720
+#, fuzzy
+#| msgid "Add Google Calendars to Evolution."
+msgid "Setup Google calendar with Evolution"
+msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Google ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "Ð?Ð¾Ð¶Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ IMAP Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿."
+
+#: ../capplet/settings/mail-account-view.c:733
+#, fuzzy
+#| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Ð?Ð¸Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+#, fuzzy
+#| msgid "Add weather calendars to Evolution."
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ð·Ð° Ð²Ñ?ÐµÐ¼Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸Ð¼Ð° Ñ?Ðµ Ð´Ð¾Ð´ÐµÑ?Ñ?Ñ?Ñ? Ð¸Ð¼ÐµÐ½Ð° Ð¾Ð±Ð»Ð¸ÐºÐ° Ð¸Ð¼Ðµ_Ð¿Ñ?ÐµÐ·Ð¸Ð¼Ðµ. Ð?Ð¾ÐºÑ?Ñ?Ð°Ð»Ð¸ Ñ?Ð¼Ð¾ Ð´Ð° "
+"Ñ?Ð¾Ñ?Ð¼Ð¸Ñ?Ð°Ð¼Ð¾ Ð¸Ð¼Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°. Ð?Ð¾Ñ?Ð²Ñ?Ð´Ð¸Ñ?Ðµ Ð¸Ð»Ð¸ Ñ?Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾ Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¿Ñ?ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð½Ð¸Ñ?Ðµ "
+"Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾."
+
+#: ../capplet/settings/mail-account-view.c:768
+#, fuzzy
+#| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Yahoo Calendar name:"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+
+#: ../capplet/settings/mail-account-view.c:1023
+#| msgid "Pass_word:"
+msgid "Password:"
+msgstr "Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°:"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
 
-#: ../capplet/settings/mail-account-view.c:729
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "Ð§Ð°Ñ?Ð¾Ð±Ñ?Ð°Ðº Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
-#| msgid "Evolution Account Assistant"
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð½Ð°Ð»Ð¾Ð³Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
-msgid "Email Settings"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-#| msgid "_Quit"
-msgid "Quit"
-msgstr "Ð?Ð·Ð°Ñ?Ð¸"
-
 # On This Computer is always first and VFolders is always last
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453
-#: ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Ð?Ð° Ð¾Ð²Ð¾Ð¼ Ñ?Ð°Ñ?Ñ?Ð½Ð°Ñ?Ñ?"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸"
 
-#: ../capplet/settings/mail-settings-view.c:150
-#| msgid "Add IM Account"
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð½Ð¾Ð²Ð¸ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../capplet/settings/mail-settings-view.c:185
-#| msgid "<span weight=\"bold\">Account Information</span>"
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+#| msgid "Account Management"
+msgid "Account management"
+msgstr "Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð·Ð¸Ð¼Ð°"
 
-#: ../capplet/settings/mail-settings-view.c:276
-#| msgid "Junk Settings"
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ"
 
@@ -8761,9 +8803,8 @@ msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ð° Ð¾ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?ÐºÐ¸Ð¼ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð¸Ð¼Ð°"
 msgid "Evolution Alarm Notify"
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð°Ð»Ð°Ñ?Ð¼Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð°"
 
@@ -8774,8 +8815,7 @@ msgstr "Ð?Ð¾Ñ?Ñ?Ð° Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 # bug(slobo): tooltip Ð±Ð¸ Ð¼Ð¾Ð³Ð°Ð¾ Ð´Ð° Ð±Ñ?Ð´Ðµ Ð¸ â??Ð?Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ð¸Ð¼Ð° Ð¸ Ð¿Ð¾Ñ?ÐµÐ´
 # Ð¾Ð²Ð°ÐºÐ¾ Ñ?Ñ?Ñ?Ð¾Ð³Ñ?ÐµÐ½Ð¸Ñ? Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð°
 # msgstr "Ð?Ð°ÐºÐµÑ? Ð¿Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°"
-#: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Ð?Ð°ÐºÐµÑ? Groupware"
 
@@ -8784,17 +8824,12 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼, ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð° Ð¸ Ð¾Ð±Ð°Ð²ÐµÐ·Ð°Ð¼Ð°"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "ÐºÐ°Ñ?Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8820,18 +8855,16 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾)"
 
-#: ../e-util/e-alert.c:72
-#: ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../e-util/e-alert.c:74
-#: ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
 # bug(slobo): Ð¼Ð¾Ð³Ð»Ð¸ Ñ?Ñ? Ð´Ð°Ñ?Ð¸ Ð¸ Ð±Ð¾Ñ?Ð¸ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð», Ð´Ð¾Ð±Ð¸Ð»Ð¸ Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾ Ñ?Ð°ÐºÐ¾ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½ Ð¿Ñ?ÐµÐ²Ð¾Ð´
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°, Ð·Ð°Ñ?Ñ?ÐµÐ²Ð°Ð½Ð° Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ° â??%sâ??"
@@ -8892,62 +8925,72 @@ msgstr "Ð?Ð°Ð¿Ð°Ð´Ð½Ð¾ÐµÐ²Ñ?Ð¾Ð¿Ñ?ÐºÐ°"
 msgid "Western European, New"
 msgstr "Ð?Ð°Ð¿Ð°Ð´Ð½Ð¾ÐµÐ²Ñ?Ð¾Ð¿Ñ?ÐºÐ°, Ð½Ð¾Ð²Ð°"
 
-#: ../e-util/e-charset.c:85
-#: ../e-util/e-charset.c:86
-#: ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Ð¢Ñ?Ð°Ð´Ð¸Ñ?Ð¸Ð¾Ð½Ð°Ð»Ð½Ð°"
 
-#: ../e-util/e-charset.c:88
-#: ../e-util/e-charset.c:89
-#: ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Ð?Ð¾Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð°"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ð£ÐºÑ?Ð°Ñ?Ð¸Ð½Ñ?ÐºÐ°"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Ð?Ð¸Ð·Ñ?ÐµÐ»Ð½Ð°"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Ð?Ð°Ð½Ð°Ñ?"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð°"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "Ð?Ñ?Ñ?Ðµ"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d Ð´Ð°Ð½Ð° Ð¾Ð´ Ñ?Ð°Ð´Ð°"
+#| msgid "%d days from now"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Ð?Ð° %d Ð´Ð°Ð½"
+msgstr[1] "Ð?Ð° %d Ð´Ð°Ð½Ð°"
+msgstr[2] "Ð?Ð° %d Ð´Ð°Ð½Ð°"
+msgstr[3] "Ð?Ð° %d Ð´Ð°Ð½"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "Ð¿Ñ?Ðµ %d Ð´Ð°Ð½Ð°"
+#| msgid "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Ð?Ñ?Ðµ %d Ð´Ð°Ð½"
+msgstr[1] "Ð?Ñ?Ðµ %d Ð´Ð°Ð½Ð°"
+msgstr[2] "Ð?Ñ?Ðµ %d Ð´Ð°Ð½Ð°"
+msgstr[3] "Ð?Ñ?Ðµ %d Ð´Ð°Ð½"
 
-#: ../e-util/e-datetime-format.c:283
-#: ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ Ð»Ð¾ÐºÐ°Ð»Ð¸Ñ?ÐµÑ?"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
 
@@ -8968,18 +9011,6 @@ msgstr "Ð£Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ â??%sâ??"
 msgid "Writing \"%s\" to %s"
 msgstr "Ð£Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ â??%sâ?? Ñ? %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Ð?Ð°Ð·Ð¸Ð² Ð±ÐµÐ»ÐµÐ¶Ð½Ð¸ÐºÐ°"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Ð?Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Ð?Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¼Ð¾Ð´Ñ?Ð»Ð°"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ñ?Ð¸ Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ðµ ÐºÐ²Ð°Ñ?Ð°"
@@ -9003,15 +9034,15 @@ msgstr "Ð£Ð½Ð¾Ñ?Ð¸ Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ°:"
 msgid "Log Level"
 msgstr "Ð?Ð¸Ð²Ð¾ Ð·Ð°Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ð° Ñ? Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297
-#: ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306
-#: ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
@@ -9035,39 +9066,26 @@ msgstr "Ð?Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð° ÐºÐ²Ð°Ñ?Ð°"
 msgid "Error, Warnings and Debug messages"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ð¾ Ð³Ñ?ÐµÑ?Ñ?Ð¸, Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ñ? Ð¸ Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð¸ ÐºÐ²Ð°Ñ?Ð°"
 
-# has "activatable" set.
-#: ../e-util/e-plugin.c:295
-#: ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½Ð¾"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½"
-
-#: ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "Ð½ÐµÐ´ÐµÑ?Ðµ"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "Ð?Ð¾Ñ?Ð»Ð¾ Ñ?Ðµ Ð´Ð¾ Ð³Ñ?ÐµÑ?ÐºÐµ Ñ? Ñ?Ñ?Ð°Ð¼Ð¿Ð¸"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 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."
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "Ð¡Ð¸Ñ?Ñ?ÐµÐ¼ Ð·Ð° Ñ?Ñ?Ð°Ð¼Ð¿Ð°Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð½Ñ?Ð´Ð¸Ð¾ Ð½Ð¸ÐºÐ°ÐºÐ²Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð½Ðµ Ð´ÐµÑ?Ð°Ñ?Ðµ Ð¾ Ð³Ñ?ÐµÑ?ÐºÐ¸."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:731
 msgid "Autogenerated"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾"
 
@@ -9077,7 +9095,6 @@ msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾"
 # system:no-save-file secondary
 # system:no-load-file secondary
 #: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Ð?Ð±Ð¾Ð³ â??{1}â??."
 
@@ -9097,16 +9114,15 @@ msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ðµ Ð¿Ñ?ÐµÐ¿Ð¸Ñ?ÐµÑ?Ðµ?"
 msgid "File exists \"{0}\"."
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ â??{0}â??."
 
-#: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "_Ð?Ñ?ÐµÐ¿Ð¸Ñ?Ð¸"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð²ÐµÐ·Ñ?."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ? Ð·Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 
@@ -9119,249 +9135,252 @@ msgstr "GConf Ð³Ñ?ÐµÑ?ÐºÐ°: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Ð¡Ð²Ðµ Ð³Ñ?ÐµÑ?ÐºÐµ Ñ?Ðµ Ñ?Ð±Ñ?Ð´Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ Ñ? Ñ?ÐµÑ?Ð¼Ð¸Ð½Ð°Ð»Ñ?."
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1024
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "Ð¨Ð°Ñ?Ðµ"
+
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?"
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð° (Cc)"
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243
-#: ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Ð?ÐµÐ²Ð¸Ð´Ñ?Ð¸Ð²Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð° (Bcc)"
 
-#: ../em-format/em-format-quote.c:355
-#: ../em-format/em-format.c:963
-#: ../mail/e-mail-tag-editor.c:328
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18
-#: ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7
-#: ../smime/lib/e-cert.c:1125
+#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð²"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366
-#: ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?"
 
-#: ../em-format/em-format-quote.c:431
-#: ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° --------"
 
-#: ../em-format/em-format.c:964
-#: ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83
-#: ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1030 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼"
 
-#: ../em-format/em-format.c:965
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "Ð?Ñ?Ñ?Ð¿Ðµ Ð·Ð° Ð²ÐµÑ?Ñ?Ð¸"
 
-#: ../em-format/em-format.c:966
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Ð?Ð¸Ñ?Ðµ"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1411
 #, c-format
 msgid "%s attachment"
 msgstr "%s Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1472
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° S/MIME Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../em-format/em-format.c:1512
-#: ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1627 ../em-format/em-format.c:1803
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° MIME Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1635
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸ Ñ?Ð¸Ð¿ Ñ?Ð¸Ñ?Ñ?Ðµ Ð·Ð° multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1648
 msgid "Could not parse PGP/MIME message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° PGP/MIME Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1649
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° PGP/MIME Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1827
 msgid "Unsupported signature format"
 msgstr "Ð?ÐµÐ¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ Ð¾Ð±Ð»Ð¸Ðº Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
 
-#: ../em-format/em-format.c:1706
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
 msgid "Error verifying signature"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
 
-#: ../em-format/em-format.c:1706
-#: ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
+#: ../em-format/em-format.c:1998
 msgid "Unknown error verifying signature"
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2082
+#, fuzzy
+#| msgid "Could not parse PGP message"
+msgid "Could not parse PGP message: "
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° PGP Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° PGP/MIME Ð¿Ð¾Ñ?Ñ?ÐºÐµ: Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
+#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ðµ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð¸ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ñ?ÐµÐºÑ?Ð½Ð´Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ð¼Ð¸Ð½Ñ?Ñ?"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ð¼Ð¸Ð½Ñ?Ñ?"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d Ð¼Ð¸Ð½Ñ?Ñ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ð¼Ð¸Ð½Ñ?Ñ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ð¼Ð¸Ð½Ñ?Ñ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ñ?Ð°Ñ?"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ñ?Ð°Ñ?Ð°"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ñ?Ð°Ñ?Ð¸"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ñ?Ð°Ñ?"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d Ñ?Ð°Ñ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ñ?Ð°Ñ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ñ?Ð°Ñ?Ð¸ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ñ?Ð°Ñ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ð´Ð°Ð½"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ð´Ð°Ð½Ð°"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ð´Ð°Ð½Ð°"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ð´Ð°Ð½"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d Ð´Ð°Ð½ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ð´Ð°Ð½Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ð´Ð°Ð½Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ð´Ð°Ð½ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ð½ÐµÐ´ÐµÑ?Ñ?"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ð½ÐµÐ´ÐµÑ?Ðµ"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ð½ÐµÐ´ÐµÑ?Ð°"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ð½ÐµÐ´ÐµÑ?Ðµ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ð½ÐµÐ´ÐµÑ?Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ð¼ÐµÑ?ÐµÑ?"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ð¼ÐµÑ?ÐµÑ?Ð°"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ð¼ÐµÑ?ÐµÑ?Ð¸"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ð¼ÐµÑ?ÐµÑ?"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d Ð¼ÐµÑ?ÐµÑ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
+msgstr[3] "%d Ð¼ÐµÑ?ÐµÑ? Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "Ð¿Ñ?Ðµ %d Ð³Ð¾Ð´Ð¸Ð½Ñ?"
 msgstr[1] "Ð¿Ñ?Ðµ %d Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 msgstr[2] "Ð¿Ñ?Ðµ %d Ð³Ð¾Ð´Ð¸Ð½Ð°"
+msgstr[3] "Ð¿Ñ?Ðµ %d Ð³Ð¾Ð´Ð¸Ð½Ñ?"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[1] "%d Ð³Ð¾Ð´Ð¸Ð½Ðµ Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 msgstr[2] "%d Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
+msgstr[3] "%d Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ? Ð±Ñ?Ð´Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ñ?Ð¼>"
 
-#: ../filter/e-filter-datespec.c:119
-#: ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "Ñ?Ð°Ð´Ð°"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ"
 
@@ -9397,8 +9416,7 @@ msgstr "_Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ð²ÐºÐµ:"
 msgid "All related"
 msgstr "Ð¡Ð²Ðµ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¾"
 
-#: ../filter/e-filter-rule.c:761
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸"
 
@@ -9414,14 +9432,12 @@ msgstr "Ð?ÐµÐ¼Ð° Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¾Ð´Ð¸Ñ?ÐµÑ?Ð°"
 msgid "I_nclude threads"
 msgstr "Ð£_ÐºÑ?Ñ?Ñ?Ð¸ Ð½Ð¸Ñ?Ð¸"
 
-#: ../filter/e-filter-rule.c:1141
-#: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Ð?Ð¾Ð»Ð°Ð·Ð½Ð¾"
 
-#: ../filter/e-filter-rule.c:1141
-#: ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Ð?Ð´Ð»Ð°Ð·Ð½Ð¾"
 
@@ -9454,8 +9470,7 @@ msgid "Missing file name."
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ðµ Ð¸Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ðµ Ð¸Ð¼Ðµ."
 
@@ -9512,8 +9527,7 @@ msgstr ""
 "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¾Ñ?ÐµÑ?ÐµÐ½ Ñ?Ð°\n"
 "Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸Ð¼ Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾Ð¼ ÐºÐ°Ð´Ð° Ñ?Ðµ Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð´ÐµÑ?Ð¸Ð»Ð¾."
 
-#: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "Ð?Ñ?_Ð°Ð²Ð¸Ð»Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°"
 
@@ -9535,8 +9549,7 @@ msgid "months"
 msgstr "Ð¼ÐµÑ?ÐµÑ?Ð¸"
 
 # bug: plural-forms
-#: ../filter/filter.ui.h:19
-#: ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 
@@ -9552,50 +9565,31 @@ msgstr "Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ¾Ñ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ðµ"
 msgid "years"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: ../mail/e-mail-attachment-bar.c:120
-#: ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029
-#: ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Ð?Ñ?Ð¸Ð»Ð¾Ð³"
 msgstr[1] "Ð?Ñ?Ð¸Ð»Ð¾Ð·Ð¸"
-msgstr[2] "Ð?Ñ?Ð¸Ð»Ð¾Ð³Ð°"
+msgstr[2] "Ð?Ñ?Ð¸Ð»Ð¾Ð·Ð¸"
+msgstr[3] "Ð?Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð°Ð¼Ð°"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð¼"
 
-#: ../mail/e-mail-browser.c:732
-#: ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Ð?Ñ?Ð°Ñ?Ð¸Ð»Ð°Ñ? Ñ?Ð¾ÐºÑ?Ñ?Ð°"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Ð?Ð¾Ð´Ñ?Ð» Ñ?ÐºÐ¾Ñ?ÐºÐµ"
-
-#: ../mail/e-mail-browser.c:743
-#: ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Ð?Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ðµ"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+#: ../mail/e-mail-browser.c:265
+#| msgid "Subject"
+msgid "(No Subject)"
+msgstr ""
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9645,7 +9639,7 @@ msgid "_Later"
 msgstr "Ð?Ð°Ñ?Ð½Ð¸_Ñ?Ðµ"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð¾Ð·Ð½Ð°ÐºÑ?"
 
@@ -9665,124 +9659,60 @@ msgstr ""
 msgid "Color"
 msgstr "Ð?Ð¾Ñ?Ð°"
 
-#: ../mail/e-mail-local.c:37
-#: ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680
-#: ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Ð?Ð¼Ðµ"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 msgid "Inbox"
 msgstr "Ð¡Ð°Ð½Ð´Ñ?Ñ?Ðµ"
 
-#: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð¸"
 
-#: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "Ð?Ð° Ñ?Ð»Ð°Ñ?Ðµ"
 
-#: ../mail/e-mail-local.c:40
-#: ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¾"
 
-#: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ð¸"
 
-#: ../mail/e-mail-migrate.c:960
-#: ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "Ð?Ð°Ð¶Ð½Ð¾"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Ð?Ð° Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ð¸"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Ð?Ð°Ñ?Ð½Ð¸Ñ?Ðµ"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "Ð?Ñ?ÐµÐ½Ð¾Ñ?ÐµÑ?Ðµ..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Ð?Ñ?ÐµÐ»Ð°Ð·Ð°Ðº"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "Ð?Ñ?ÐµÐ½Ð¾Ñ?ÐµÑ?Ðµ â??%sâ??:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð½Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ?? Ñ? â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸Ð¼ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ð¸Ñ?Ð¸Ð¼Ð° Ñ? â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1823
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "Ð?Ñ?ÐµÐ½Ð¾Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../mail/e-mail-migrate.c:1824
+#: ../mail/e-mail-migrate.c:650
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¾ Ð¸ Ñ?Ð¸Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¿Ð¾Ñ?Ñ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð¾Ð´ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ 1.Ñ?.\n"
-"\n"
-"Ð?Ð¾Ð»Ð¸Ð¼ Ð±Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¾Ð³ POP Ñ?Ñ?Ð²Ð°Ñ?-Ð½Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ POP3 Ñ?Ñ?Ð²Ð°Ñ?-Ð½Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ POP3 Ñ?Ñ?Ð²Ð°Ñ?-Ð½Ð°-Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?ÐºÐ° â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2546
-#: ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ð¾Ñ?Ñ?Ð°Ð²Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2934
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9790,50 +9720,59 @@ msgstr ""
 "\n"
 "Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¿Ð¾Ñ?Ñ?Ðµ Ñ? â??%sâ??: %s"
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ð¼ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ? Ñ? â??%sâ??: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð°Ñ?Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ, â??evolution/config.xmldbâ?? Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ð¸Ð»Ð¸ Ñ?Ðµ Ð¾Ñ?Ñ?ÐµÑ?ÐµÐ½."
+#: ../mail/e-mail-notebook-view.c:563
+#| msgid "Please select a server."
+msgid "Please select a folder"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?."
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Ð?Ðµ Ð¿Ð¸Ñ?Ð°Ñ? Ð¼Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾"
 
-#: ../mail/e-mail-reader.c:264
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/e-mail-reader.c:264
-#: ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸"
 
-#: ../mail/e-mail-reader.c:638
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/e-mail-reader.c:638
-#: ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "Ð?Ñ?Ðµ_Ð¼ÐµÑ?Ñ?Ð¸"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:908 ../mail/e-mail-reader.c:1019
+#: ../mail/e-mail-reader.c:1060
+#| msgid "Do not ask me again"
+msgid "_Do not ask me again."
+msgstr "_Ð?Ðµ Ð¿Ð¸Ñ?Ð°Ñ? Ð¼Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾."
+
+#: ../mail/e-mail-reader.c:1065
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Ð£Ð²ÐµÐº Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?-Ð·Ð°: Ð·Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ðµ Ð»Ð¸Ñ?Ñ?Ðµ."
+
+#: ../mail/e-mail-reader.c:1155
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 msgstr[1] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgstr[2] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+msgstr[3] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
 #. Translators: This is a part of a suggested file name
 #. * used when saving a message or multiple messages to an
@@ -9841,586 +9780,647 @@ msgstr[2] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1176
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Ð?Ð¾Ñ?Ñ?ÐºÐ°"
 msgstr[1] "Ð?Ð¾Ñ?Ñ?ÐºÐµ"
-msgstr[2] "Ð?Ð¾Ñ?Ñ?ÐºÐ°"
-
-#: ../mail/e-mail-reader.c:1143
+msgstr[2] "Ð?Ð¾Ñ?Ñ?ÐºÐµ"
+msgstr[3] "Ð?Ð¾Ñ?Ñ?ÐºÐ°"
+#: ../mail/e-mail-reader.c:1441
 msgid "A_dd Sender to Address Book"
 msgstr "Ð?Ð¾_Ð´Ð°Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1443
 msgid "Add sender to address book"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1448
 msgid "Check for _Junk"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¸Ð¼Ð° Ð»Ð¸ _Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1450
 msgid "Filter the selected messages for junk status"
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ? Ð´Ð° Ð»Ð¸ Ð¼ÐµÑ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° Ð¸Ð¼Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1455
 msgid "_Copy to Folder..."
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1457
 msgid "Copy selected messages to another folder"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð´Ñ?Ñ?Ð³Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1462
 msgid "_Delete Message"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1464
 msgid "Mark the selected messages for deletion"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) Ð·Ð° Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1469
 msgid "Filter on Mailing _List..."
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? _Ð»Ð¸Ñ?Ñ?Ñ?..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1471
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð·Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð° Ð¾Ð²Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1476
 msgid "Filter on _Recipients..."
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð½Ð° _Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1478
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð·Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð²Ð¸Ð¼ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð°"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1483
 msgid "Filter on Se_nder..."
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð½Ð° Ð¿Ð¾Ñ?_Ð¸Ñ?Ð°Ð¾Ñ?Ð°..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1485
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð·Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´ Ð¾Ð²Ð¾Ð³ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1490
 msgid "Filter on _Subject..."
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð½Ð° _Ð½Ð°Ñ?Ð»Ð¾Ð²..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1492
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð·Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð° Ð¾Ð²Ð¸Ð¼ Ð½Ð°Ñ?Ð»Ð¾Ð²Ð¾Ð¼"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1497
 msgid "A_pply Filters"
 msgstr "Ð?Ñ?Ð¸_Ð¼ÐµÐ½Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1499
 msgid "Apply filter rules to the selected messages"
 msgstr "Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ð½Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1504
 msgid "_Find in Message..."
 msgstr "Ð?_Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1506
 msgid "Search for text in the body of the displayed message"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ? Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1511
 msgid "_Clear Flag"
 msgstr "Ð¡ÐºÐ»Ð¾_Ð½Ð¸ Ð¾Ð·Ð½Ð°ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1513
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¾Ð·Ð½Ð°ÐºÑ? Ð·Ð° Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1518
 msgid "_Flag Completed"
 msgstr "Ð?Ð·Ð½Ð°Ñ?_Ð¸ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1520
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð¾Ð·Ð½Ð°ÐºÑ? Ð·Ð° Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ñ? Ð½Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1525
 msgid "Follow _Up..."
 msgstr "Ð¡Ð»Ðµ_Ð´Ð¸..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1527
 msgid "Flag the selected messages for follow-up"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð·Ð° Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1532
 msgid "_Attached"
 msgstr "Ð?Ñ?Ð¸_Ð»Ð¾Ð¶ÐµÐ½Ð¾"
 
-#: ../mail/e-mail-reader.c:1236
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½ÐµÐºÐ¾Ð¼Ðµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1539
 msgid "Forward As _Attached"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ°Ð¾ _Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1546
 msgid "_Inline"
 msgstr "Ð£Ð½Ñ?Ñ?_Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1250
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
 msgid "Forward the selected message in the body of a new message"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?ÐµÐ»Ñ? Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1553
 msgid "Forward As _Inline"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ°Ð¾ _Ñ?Ð½Ñ?Ñ?Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1560
 msgid "_Quoted"
 msgstr "_Ð¦Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1264
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
 msgid "Forward the selected message quoted like a reply"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ñ? ÐºÐ°Ð¾ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1567
 msgid "Forward As _Quoted"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ°Ð¾ _Ñ?Ð¸Ñ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1574
 msgid "_Load Images"
 msgstr "_Ð£Ñ?Ð¸Ñ?Ð°Ñ? Ñ?Ð»Ð¸ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1576
 msgid "Force images in HTML mail to be loaded"
 msgstr "Ð¡Ð¸Ð»Ð¾Ð¼ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ñ? HTML Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1581
 msgid "_Important"
 msgstr "_Ð?Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1583
 msgid "Mark the selected messages as important"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) ÐºÐ°Ð¾ Ð²Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1588
 msgid "_Junk"
 msgstr "_Ð?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark the selected messages as junk"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) ÐºÐ°Ð¾ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1595
 msgid "_Not Junk"
 msgstr "Ð?Ð¸_Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1597
 msgid "Mark the selected messages as not being junk"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) Ð´Ð° Ð½Ð¸Ñ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1602
 msgid "_Read"
 msgstr "Ð?Ñ?Ð¾_Ñ?Ð¸Ñ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark the selected messages as having been read"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1609
 msgid "Uni_mportant"
 msgstr "Ð?Ðµ_Ð²Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1611
 msgid "Mark the selected messages as unimportant"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) ÐºÐ°Ð¾ Ð½ÐµÐ²Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1616
 msgid "_Unread"
 msgstr "_Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark the selected messages as not having been read"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) ÐºÐ°Ð¾ Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1623
 msgid "_Edit as New Message..."
 msgstr "_Ð£Ñ?ÐµÐ´Ð¸ ÐºÐ°Ð¾ Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1625
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ñ? Ñ?Ð°Ð´Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1630
 msgid "Compose _New Message"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ _Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1632
 msgid "Open a window for composing a mail message"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1637
 msgid "_Open in New Window"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ñ? Ð½Ð¾Ð²Ð¾Ð¼ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1639
 msgid "Open the selected messages in a new window"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð½Ð¾Ð²Ð¾Ð¼ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1644
 msgid "_Move to Folder..."
 msgstr "_Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1646
 msgid "Move selected messages to another folder"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ?(Ðµ) Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) Ñ? Ð´Ñ?Ñ?Ð³Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1651
+#| msgid "Switch to %s"
+msgid "_Switch to Folder"
+msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ñ? _Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
+
+#: ../mail/e-mail-reader.c:1653
+#, fuzzy
+#| msgid "Install the shared folder"
+msgid "Display the parent folder"
+msgstr "Ð?Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ? Ð´ÐµÑ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
+
+#: ../mail/e-mail-reader.c:1658
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _next tab"
+msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ð½Ð° %s"
+
+#: ../mail/e-mail-reader.c:1660
+msgid "Switch to the next tab"
+msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ð¸ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../mail/e-mail-reader.c:1665
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _previous tab"
+msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ð½Ð° %s"
+
+#: ../mail/e-mail-reader.c:1667
+msgid "Switch to the previous tab"
+msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ð¸ Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../mail/e-mail-reader.c:1672
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Cl_ose current tab"
+msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+
+#: ../mail/e-mail-reader.c:1674
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close current tab"
+msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+
+#: ../mail/e-mail-reader.c:1679
 msgid "_Next Message"
 msgstr "_Ð¡Ð»ÐµÐ´ÐµÑ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1681
 msgid "Display the next message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1686
 msgid "Next _Important Message"
 msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ð° _Ð²Ð°Ð¶Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1688
 msgid "Display the next important message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð²Ð°Ð¶Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1693
 msgid "Next _Thread"
 msgstr "_Ð¡Ð»ÐµÐ´ÐµÑ?Ð° Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð°"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1695
 msgid "Display the next thread"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ñ?"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1700
 msgid "Next _Unread Message"
 msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ð° _Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1702
 msgid "Display the next unread message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1707
 msgid "_Previous Message"
 msgstr "_Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1709
 msgid "Display the previous message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1714
 msgid "Pr_evious Important Message"
 msgstr "Ð?Ñ?_ÐµÑ?Ñ?Ð¾Ð´Ð½Ð° Ð²Ð°Ð¶Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1716
 msgid "Display the previous important message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ñ? Ð²Ð°Ð¶Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1721
 msgid "P_revious Unread Message"
 msgstr "Ð?_Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð° Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1723
 msgid "Display the previous unread message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ñ? Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1730
 msgid "Print this message"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1737
 msgid "Preview the message to be printed"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1742
 msgid "Re_direct"
 msgstr "Ð?Ñ?ÐµÑ?_Ñ?Ð¼ÐµÑ?Ð¸"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1744
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Ð?Ñ?ÐµÑ?_Ñ?Ð¼ÐµÑ?Ð°Ð²Ð° (Ð±ÐµÐ· Ñ?Ð¸Ñ?Ð°Ñ?Ð°) Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½ÐµÐºÐ¾Ð¼Ðµ"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1749 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸ _Ñ?Ð²Ð¸Ð¼Ð°"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1751
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?Ð²Ð¸Ð¼ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1756 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸ Ð½Ð° _Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1758
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ð¾Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1763
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1765
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1770
 msgid "_Save as mbox..."
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ mbox..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1772
 msgid "Save selected messages as an mbox file"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ mbox Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1777
 msgid "Search Folder from Mailing _List..."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? _Ð»Ð¸Ñ?Ñ?Ñ?..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1779
 msgid "Create a search folder for this mailing list"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° Ð¾Ð²Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1784
 msgid "Search Folder from Recipien_ts..."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð¾Ð´ Ð¿Ñ?Ð¸Ð¼Ð°_Ð»Ð°Ñ?Ð°..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1786
 msgid "Create a search folder for these recipients"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° Ð¾Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1791
 msgid "Search Folder from Sen_der..."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð½Ð° _Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1793
 msgid "Create a search folder for this sender"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° Ð¾Ð²Ð¾Ð³ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1798
 msgid "Search Folder from S_ubject..."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð½Ð° Ð½_Ð°Ñ?Ð»Ð¾Ð²..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1800
 msgid "Create a search folder for this subject"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ñ?Ð»Ð¾Ð²"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1805
 msgid "_Message Source"
 msgstr "Ð?Ð·Ð²Ð¾_Ñ?Ð½Ð¸ ÐºÐ¾Ð´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1807
 msgid "Show the raw email source of the message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¸ ÐºÐ¾Ð´ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1819
 msgid "_Undelete Message"
 msgstr "Ð?_Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1821
 msgid "Undelete the selected messages"
 msgstr "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1826
 msgid "_Normal Size"
 msgstr "_Ð?Ð¾Ñ?Ð¼Ð°Ð»Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð°"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1828
 msgid "Reset the text to its original size"
 msgstr "Ð?Ñ?Ð°Ñ?Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð½Ð° Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ?"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1833
 msgid "_Zoom In"
 msgstr "Ð£Ð²_ÐµÑ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1835
 msgid "Increase the text size"
 msgstr "Ð£Ð²ÐµÑ?Ð°Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1840
 msgid "Zoom _Out"
 msgstr "Ð£_Ð¼Ð°Ñ?Ð¸"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1842
 msgid "Decrease the text size"
 msgstr "Ð£Ð¼Ð°Ñ?Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1849
 msgid "Create R_ule"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð°_Ð²Ð¸Ð»Ð¾"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1856
 msgid "Ch_aracter Encoding"
 msgstr "Ð?Ð¾Ð´Ð½Ð° Ñ?Ñ?_Ñ?Ð°Ð½Ð°"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1863
 msgid "F_orward As"
 msgstr "_Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ°Ð¾"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1870
+#, fuzzy
+#| msgid "_Reply"
+msgid "_Group Reply"
+msgstr "Ð?_Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸"
+
+#: ../mail/e-mail-reader.c:1877
 msgid "_Go To"
 msgstr "_Ð?Ð´Ð¸ Ð½Ð°"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1884
 msgid "Mar_k As"
 msgstr "Ð?_Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1891
 msgid "_Message"
 msgstr "_Ð?Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1898
 msgid "_Zoom"
 msgstr "Ð£Ð²_ÐµÑ?Ð°Ñ?"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark for Follo_w Up..."
 msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ð·Ð° _Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark as _Important"
 msgstr "Ð?Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ _Ð²Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1935
 msgid "Mark as _Junk"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ _Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1939
 msgid "Mark as _Not Junk"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° _Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1943
 msgid "Mar_k as Read"
 msgstr "Ð?_Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark as Uni_mportant"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ _Ð½ÐµÐ²Ð°Ð¶Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark as _Unread"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ _Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1987
 msgid "_Caret Mode"
 msgstr "Ð?ÐµÑ?Ð¾Ð´ Ñ?_Ð¼ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1989
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ñ?ÐµÐ¿Ñ?Ñ?Ñ?Ð¸ ÐºÑ?Ñ?Ñ?Ð¾Ñ? Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1995
 msgid "All Message _Headers"
 msgstr "Ð¡Ð²Ð° _Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1997
 msgid "Show messages with all email headers"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° Ñ?Ð²Ð¸Ð¼ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð¸Ð¼Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2218
 msgid "Unable to retrieve message"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/e-mail-reader.c:1900
-#: ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ â??%sâ??"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2838 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3007
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»_ÐµÐ´Ð¸"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:3008
 msgid "Forward the selected message to someone"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½ÐµÐºÐ¾Ð¼Ðµ"
 
-#: ../mail/e-mail-reader.c:2633
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#. Likewise the "mail-reply-group" action
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. (if possible and if that configuration option is enabled), or else
+#. it will reply to all. The word "Group" was chosen because it covers
+#. either of those, without too strongly implying one or the other.
+#: ../mail/e-mail-reader.c:3026
+#, fuzzy
+#| msgid "Group Items By"
+msgid "Group Reply"
+msgstr "Ð?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾"
+
+#: ../mail/e-mail-reader.c:3027
+#, fuzzy
+#| msgid "Compose a reply to the mailing list of the selected message"
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ð¾Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+
+#: ../mail/e-mail-reader.c:3072 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:3104
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:3108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¾"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸"
 
+#: ../mail/e-mail-reader.c:3730
+#, fuzzy, c-format
+#| msgid "Folder"
+msgid "Folder '%s'"
+msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 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:499
-#: ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 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:503
-#: ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 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:507
-#: ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ð¸"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10439,21 +10439,20 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881
-#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "Ð?Ð¸ÐºÐ°Ð´Ð°"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "Ð£Ð²ÐµÐº"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "Ð?Ð¸Ñ?Ð°Ñ? Ð·Ð° Ñ?Ð²Ð°ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
@@ -10463,17 +10462,16 @@ msgstr "Ð?Ð¸Ñ?Ð°Ñ? Ð·Ð° Ñ?Ð²Ð°ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704
-#: ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10483,34 +10481,41 @@ msgstr ""
 "\n"
 "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ â??Ð?Ð°Ð¿Ñ?ÐµÐ´â?? Ð·Ð° Ð¿Ð¾Ñ?ÐµÑ?Ð°Ðº. "
 
-#: ../mail/em-account-editor.c:2065
-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 information in email you send."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¾Ð»Ðµ Ð¸Ð¼Ðµ Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ?. â??Ð?ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð°â?? Ð¿Ð¾Ñ?Ð° Ð´Ð¾Ð»Ðµ Ð½Ðµ Ð¼Ð¾Ñ?Ð°Ñ?Ñ? Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ð¿Ñ?Ñ?ÐµÐ½Ð°, Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð½Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð²Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ñ?ÐµÑ?Ðµ."
+#: ../mail/em-account-editor.c:2099
+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 "
+"information in email you send."
+msgstr ""
+"Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¾Ð»Ðµ Ð¸Ð¼Ðµ Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ?. â??Ð?ÐµÐ¾Ð±Ð°Ð²ÐµÐ·Ð½Ð°â?? Ð¿Ð¾Ñ?Ð° Ð´Ð¾Ð»Ðµ Ð½Ðµ Ð¼Ð¾Ñ?Ð°Ñ?Ñ? Ð±Ð¸Ñ?Ð¸ "
+"Ð¿Ð¾Ð¿Ñ?Ñ?ÐµÐ½Ð°, Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð½Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð²Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ñ?ÐµÑ?Ðµ."
 
-#: ../mail/em-account-editor.c:2067
-#: ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð½Ð°Ð»Ð¾Ð³Ð°."
 
-#: ../mail/em-account-editor.c:2070
-#: ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
 msgid "Sending Email"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/em-account-editor.c:2071
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð½Ð°Ñ?Ð¸Ð½Ñ? Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?ÐµÑ?Ðµ Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?. Ð?ÐºÐ¾ Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸, Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð´Ð°Ð²Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ð»Ñ?Ð³Ð°."
+#: ../mail/em-account-editor.c:2105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð½Ð°Ñ?Ð¸Ð½Ñ? Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?ÐµÑ?Ðµ Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?. Ð?ÐºÐ¾ Ð½Ð¸Ñ?Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¸, "
+"Ð¿Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾Ð´Ð°Ð²Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ñ?Ñ?Ð»Ñ?Ð³Ð°."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð·Ð¸Ð¼Ð°"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10518,11 +10523,11 @@ msgstr ""
 "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¾Ð»Ðµ Ð¾Ð¿Ð¸Ñ?Ð½Ð¾ Ð¸Ð¼Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³.\n"
 "Ð?Ð²Ð¾ Ð¸Ð¼Ðµ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¾ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "Ð?Ð¾Ñ?Ð¾Ð²Ð¾"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10536,54 +10541,48 @@ msgstr ""
 "\n"
 "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ â??Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸â?? Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð·Ð° _Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?Ð²Ð°ÐºÐ¸Ñ?"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "Ð¼Ð¸Ð½Ñ?_Ñ?Ð°"
 
-#: ../mail/em-account-editor.c:2836
-#: ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2838
+#, fuzzy
+#| msgid "Please select an image for this contact"
+msgid "Please select a folder from the current account."
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð»Ð¸ÐºÑ? Ð·Ð° Ð¾Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
+
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
 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:2881
-#: ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
 msgid "Receiving Options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../mail/em-account-editor.c:2882
-#: ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
 msgid "Checking for New Messages"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ñ?Ðµ Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³Ð°"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð½Ð°Ð»Ð¾Ð³Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1539
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ð?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð·Ð° %s Ð½Ð° Ñ?ÐµÐ¼Ñ? â??%sâ?? Ð½Ð° %s Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1587
 #, c-format
-#| msgid "Mail Notification Properties"
 msgid "Delivery Notification for: \"%s\""
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¿Ñ?Ð¸Ñ?ÐµÐ¼Ñ? Ð·Ð°: â??%sâ??"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1991
 msgid "an unknown sender"
 msgstr "Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?"
 
@@ -10592,23 +10591,27 @@ msgstr "Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "Ð£ ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ? ${24Hour}:${Minute} ${TimeZone}, ${Sender} Ð¿Ð¸Ñ?Ðµ:"
+#: ../mail/em-composer-utils.c:2038
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"Ð£ ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ? ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} Ð¿Ð¸Ñ?Ðµ:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "-----Ð?Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð°"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
@@ -10625,10 +10628,18 @@ 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 "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ Ð·Ð°"
@@ -10689,6 +10700,10 @@ msgstr "Ð¡Ð»ÐµÐ´Ð¸"
 msgid "Forward to"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ Ð·Ð°"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Ð?Ð°Ð¶Ð½Ð¾"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ðµ"
@@ -10713,8 +10728,7 @@ msgstr "Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½Ð¾"
 msgid "is set"
 msgstr "Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "Ð?Ñ?Ð±Ñ?Ðµ"
 
@@ -10763,13 +10777,11 @@ msgid "Play Sound"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¸ Ð·Ð²Ñ?Ðº"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Ð§Ð¸Ñ?Ð°Ñ?"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸"
 
@@ -10797,13 +10809,11 @@ msgstr "Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¾ Ð¼Ð°Ñ?Ðµ Ð¾Ð´"
 msgid "Run Program"
 msgstr "Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../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:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?"
 
@@ -10849,47 +10859,49 @@ msgid "Unset Status"
 msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Ð?Ð¾Ñ?Ð¾Ð¼"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ñ?Ð°_Ð´Ñ?Ñ?"
 
 # bug: no need for plural-forms
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 msgstr[1] "Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 msgstr[2] "Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
+msgstr[3] "Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ð£ÐºÑ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 msgstr[1] "Ð£ÐºÑ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 msgstr[2] "Ð£ÐºÑ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
+msgstr[3] "Ð£ÐºÑ?Ð¿Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Ð?Ñ?ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¾Ñ?Ñ? ÐºÐ²Ð¾Ñ?Ðµ (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "Ð?Ñ?ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¾Ñ?Ñ? ÐºÐ²Ð¾Ñ?Ðµ"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
@@ -10897,38 +10909,32 @@ msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 msgid "<click here to select a folder>"
 msgstr "<ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "Ð?Ð°_Ð¿Ñ?Ð°Ð²Ð¸"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Ð?Ð¼Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151
-#: ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169
-#: ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056
-#: ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
 msgid "Search Folders"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176
-#: ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð Ð?"
 
-#: ../mail/em-folder-tree-model.c:748
-#: ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? â??%sâ??"
@@ -10955,280 +10961,328 @@ msgstr "Ð?Ð¼ÐµÐ½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð°Ð´Ñ?Ð¶Ðµ â??/â??"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "Ð¡Ñ?Ð°Ð±Ð»Ð¾ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../mail/em-folder-tree.c:1489
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s"
 
-#: ../mail/em-folder-tree.c:1491
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s"
 
-#: ../mail/em-folder-tree.c:1498
-#: ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? %s"
 
-#: ../mail/em-folder-tree.c:1500
-#: ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ?(Ðµ) Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ñ? Ð½Ð° Ð½Ð°Ñ?Ð²Ð¸Ñ?ÐµÐ¼ Ð½Ð¸Ð²Ð¾Ñ?"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
+#, fuzzy, c-format
+#| msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Ð?Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "Ð?Ð°Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð³Ð´Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð° Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/em-format-html-display.c:103
-#: ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "Ð?ÐµÐ¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/em-format-html-display.c:103
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð°. Ð?Ð¸Ñ?Ðµ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð´Ð° Ñ?Ðµ Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð°."
 
-#: ../mail/em-format-html-display.c:104
-#: ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../mail/em-format-html-display.c:104
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð° Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ñ?Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð²Ñ?Ð»Ð¾ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð°Ð½."
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð° Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ñ?Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð²Ñ?Ð»Ð¾ "
+"Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð°Ð½."
 
-#: ../mail/em-format-html-display.c:105
-#: ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../mail/em-format-html-display.c:105
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½, Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ?."
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Ð?Ð¾Ñ?Ð¿Ð¸Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð°Ð¾ Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½, Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ?."
 
-#: ../mail/em-format-html-display.c:106
-#: ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?, Ð°Ð»Ð¸ Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/em-format-html-display.c:106
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¾Ð¼, Ð°Ð»Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½."
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¾Ð¼, Ð°Ð»Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ "
+"Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½."
 
-#: ../mail/em-format-html-display.c:107
-#: ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸, Ð°Ð»Ð¸ Ñ?Ñ?Ð°Ð¶Ð¸ Ñ?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ?"
 
-#: ../mail/em-format-html-display.c:107
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:94
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð°, Ð°Ð»Ð¸ Ð½ÐµÐ¼Ð° Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ñ?Ñ?ÐµÐ³ Ñ?Ð°Ð²Ð½Ð¾Ð³ ÐºÑ?Ñ?Ñ?Ð°."
 
-#: ../mail/em-format-html-display.c:114
-#: ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "Ð?ÐµÑ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾"
 
-#: ../mail/em-format-html-display.c:114
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°. Ð?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð²Ð¸Ð´ÐµÑ?Ð¸ Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ? Ð¿Ñ?ÐµÐºÐ¾ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°."
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°. Ð?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð²Ð¸Ð´ÐµÑ?Ð¸ Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ? Ð¿Ñ?ÐµÐºÐ¾ "
+"Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°."
 
-#: ../mail/em-format-html-display.c:115
-#: ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾, Ñ?Ð»Ð°Ð±Ð¾"
 
-#: ../mail/em-format-html-display.c:115
-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 message in a practical amount of time."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°, Ð°Ð»Ð¸ Ñ?Ð»Ð°Ð±Ð¸Ð¼ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð¾Ð¼.  Ð¢ÐµÑ?ÐºÐ¾ Ñ?Ðµ, Ð°Ð»Ð¸ Ð½Ðµ Ð¸ Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð° Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ Ñ? Ð´Ð¾Ð³Ð»ÐµÐ´Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð²Ð¸Ð´Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
+#: ../mail/em-format-html-display.c:102
+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 "
+"message in a practical amount of time."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°, Ð°Ð»Ð¸ Ñ?Ð»Ð°Ð±Ð¸Ð¼ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð¾Ð¼.  Ð¢ÐµÑ?ÐºÐ¾ Ñ?Ðµ, Ð°Ð»Ð¸ Ð½Ðµ Ð¸ Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ðµ "
+"Ð´Ð° Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ Ñ? Ð´Ð¾Ð³Ð»ÐµÐ´Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð²Ð¸Ð´Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-format-html-display.c:116
-#: ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾"
 
-#: ../mail/em-format-html-display.c:116
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°.  Ð¢ÐµÑ?ÐºÐ¾ Ñ?Ðµ Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ Ð²Ð¸Ð´ÐµÑ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°.  Ð¢ÐµÑ?ÐºÐ¾ Ñ?Ðµ Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ Ð²Ð¸Ð´ÐµÑ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-format-html-display.c:117
-#: ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð¾, Ñ?Ð°ÐºÐ¾"
 
-#: ../mail/em-format-html-display.c:117
-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 practical amount of time."
-msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°, Ñ?Ð°ÐºÐ¸Ð¼ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð¾Ð¼. Ð?ÐµÐ¾Ð¼Ð° Ñ?Ðµ Ñ?ÐµÑ?ÐºÐ¾ Ð´Ð° Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ Ñ? Ð´Ð¾Ð³Ð»ÐµÐ´Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð²Ð¸Ð´Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
+#: ../mail/em-format-html-display.c:104
+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 "
+"practical amount of time."
+msgstr ""
+"Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð°, Ñ?Ð°ÐºÐ¸Ð¼ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð¾Ð¼. Ð?ÐµÐ¾Ð¼Ð° Ñ?Ðµ Ñ?ÐµÑ?ÐºÐ¾ Ð´Ð° Ð½ÐµÐºÐ¾ Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ðµ "
+"Ñ? Ð´Ð¾Ð³Ð»ÐµÐ´Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ð²Ð¸Ð´Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-format-html-display.c:248
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Ð?Ð²Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ð¸Ð²"
 
-#: ../mail/em-format-html-display.c:509
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ñ?Ñ?Ñ?Ñ?Ð° Ð¾Ð²Ð¾ Ð¿Ð¸Ñ?Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¿Ñ?ÐµÐ²ÐµÐ»Ð¸ÐºÐ¾. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð³Ð° Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ð¸ Ð½ÐµÑ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð³ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ð°."
+#: ../mail/em-format-html-display.c:497
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ñ?Ñ?Ñ?Ñ?Ð° Ð¾Ð²Ð¾ Ð¿Ð¸Ñ?Ð¼Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¿Ñ?ÐµÐ²ÐµÐ»Ð¸ÐºÐ¾. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð³Ð° "
+"Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ð¸ Ð½ÐµÑ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½Ð¾ Ð¸Ð»Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ð´Ñ?Ñ?Ð³Ð¾Ð³ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ð°."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾ Ð·Ð°"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "Ð?Ñ?ÐµÐºÐ¾Ñ?Ð°Ñ?ÐµÐ½Ð¾:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "Ð¾Ð´"
 
-#: ../mail/em-format-html-display.c:962
-#: ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? _Ð½ÐµÑ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? _Ð½ÐµÑ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "Ð?_Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ?"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. Ñ?Ñ?Ñ?Ð°Ð½Ð° Ð¾Ð´ %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "Ð?Ð±Ð»Ð¸ÐºÐ¾Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "Ð?Ð±Ð»Ð¸ÐºÐ¾Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ..."
 
-#: ../mail/em-format-html.c:1386
-#: ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#, fuzzy, c-format
+#| msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ â??%sâ??"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ? Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ð´ÐµÐ¾ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "Ð?Ð¾Ñ?Ðµ Ñ?Ð»Ð¾Ð¶ÐµÐ½ Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ð´ÐµÐ¾ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð¸Ð²Ð°Ñ? Ð½Ð° FTP Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð¸Ð²Ð°Ñ? Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? (%s) ÐºÐ¾Ñ?Ð° Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð¸ â??%sâ??"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð¸Ð²Ð°Ñ? Ð½Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð¸Ð²Ð°Ñ? Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ð?Ð¾ÐºÐ°Ð·Ð¸Ð²Ð°Ñ? Ð½Ð° Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð¸ Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº (Ñ?Ð¸Ð¿Ð° â??%sâ??)"
 
 #. 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:2628
-#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#: ../mail/em-format-html.c:2647
+#, fuzzy, c-format
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð°Ñ?Ðµ <b>%s</b> Ñ? Ð¸Ð¼Ðµ <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, fuzzy, c-format
+#| msgid "No summary available."
+msgid "No HTML stream available"
+msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°."
+
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ð?Ð²Ð° Ð¾Ñ?Ñ?Ð°Ð²Ð° Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ, Ð¸Ð»Ð¸ Ð½Ð¸Ñ?Ñ? Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½Ðµ."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½ Ñ?ÐµÑ?Ð²ÐµÑ?"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ {0} Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼?"
+msgstr[1] "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ {0} Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼?"
+msgstr[2] "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ {0} Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#, fuzzy
+#| msgid "_Do not show this message again."
+msgid "_Do not show this message again"
+msgstr "_Ð?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ? Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ð¾Ð´ %s"
@@ -11237,7 +11291,7 @@ msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ð¾Ð´ %s"
 msgid "Search _Folders"
 msgstr "Ð¤Ð°Ñ?_Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
@@ -11278,157 +11332,190 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Ð?Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ñ?ÐµÐºÑ?Ñ?Ñ?Ð°Ð»Ð½Ð¸ Ð´ÐµÐ¾ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÐ½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Ð£Ð²ÐµÐº Ñ?Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¾ Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ?Ðµ ÐµÐ¼Ð¾Ñ?Ð¸ÐºÐ¾Ð½Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¾ Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ?Ðµ Ð²ÐµÐ·Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ð¸Ð³Ð»Ð° Ð¿Ð¾Ñ?Ñ?Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Ð?Ð¾Ñ?Ð° Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Ð?Ð¾Ñ?Ð° Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð° Ð·Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ/Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð°Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Ð¡Ð°Ð¶Ð¼Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð°Ð´Ñ?ÐµÑ?Ð° Ñ? TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "Ð¡Ð°Ð¶Ð¼Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð°Ð´Ñ?ÐµÑ?Ð° Ñ? TO/CC/BCC Ð½Ð° Ð±Ñ?Ð¾Ñ? Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
-msgstr "Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ð¸Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ñ?Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð° Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¸Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð» Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ð½Ð°Ñ?Ð¼Ð°Ñ?Ðµ 30 Ñ?ÐµÐºÑ?Ð½Ð´Ð¸."
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ð¸Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ñ?Ð°Ð»Ð¾Ñ?Ñ? Ñ?Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð° Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¸Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ðµ. "
+"Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð» Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ð½Ð°Ñ?Ð¼Ð°Ñ?Ðµ 30 Ñ?ÐµÐºÑ?Ð½Ð´Ð¸."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð·Ð° Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ? Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:25
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
-msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð·Ð° Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ? Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð»ÐµÐ¼ÐµÐ½Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?Ñ? Ð½Ð¸Ð· Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° â??headername=valueâ??."
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð·Ð° Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ? Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð»ÐµÐ¼ÐµÐ½Ñ?Ð¸ "
+"Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ñ?Ñ? Ð½Ð¸Ð· Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° â??headername=valueâ??."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?ÐºÑ?Ð¿ Ð·Ð½Ð°ÐºÐ¾Ð²Ð° Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?ÐºÑ?Ð¿ Ð·Ð½Ð°ÐºÐ¾Ð²Ð° Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?ÐºÑ?Ð¿ Ð·Ð½Ð°ÐºÐ¾Ð²Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?ÐºÑ?Ð¿ Ð·Ð½Ð°ÐºÐ¾Ð²Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?Ñ?Ð¸Ð» Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?Ñ?Ð¸Ð» Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð° Ñ?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ñ?Ð°Ð¼Ð¾ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð·Ð¸ Ð·Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼"
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ñ?Ð°Ð¼Ð¾ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð·Ð¸ Ð·Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ð¾Ð¼ "
+"Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ðµ, "
+"Ð½Ðµ Ñ?Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð° Ñ?Ðµ Ñ? Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?. Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?Ðµ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸Ð¼Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ð¼ Ð·Ð° "
+"Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ. Ð?Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¾Ñ?Ð¾ Ð°ÐºÐ¾ Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸ (Ñ?ÐµÑ?Ð¸Ð¼Ð¾ LDAP) Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸ Ð·Ð° "
+"Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ."
+
 #: ../mail/evolution-mail.schemas.in.h:42
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
-msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ðµ, Ð½Ðµ Ñ?Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð° Ñ?Ðµ Ñ? Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?. Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?Ðµ Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸Ð¼Ð° Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸Ð¼ Ð·Ð° Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ. Ð?Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¾Ñ?Ð¾ Ð°ÐºÐ¾ Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸ (Ñ?ÐµÑ?Ð¸Ð¼Ð¾ LDAP) Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ð¸ Ð·Ð° Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ."
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ "
+"Ð¿Ð¾Ñ?Ñ?Ðµ"
 
 #: ../mail/evolution-mail.schemas.in.h:43
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ "
+"Ð¿Ð¾Ñ?Ñ?Ðµ. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð° Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð°, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð±Ñ?Ð¶Ð°."
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
-msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð° Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð°, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð±Ñ?Ð¶Ð°."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¾Ð½Ñ? Ñ? Ð¿Ð¾Ñ?Ð¸Ð¼Ð° â??Ð¨Ð°Ñ?Ðµâ?? and â??Ð?Ð°Ñ?Ð»Ð¾Ð²â?? Ñ? Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ "
+"Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ¾Ð»Ð¾Ð½Ðµ â??Ð?Ð¾Ñ?Ñ?ÐºÐµâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:45
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
-msgstr "Ð£Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¾Ð½Ñ? Ñ? Ð¿Ð¾Ñ?Ð¸Ð¼Ð° â??Ð¨Ð°Ñ?Ðµâ?? and â??Ð?Ð°Ñ?Ð»Ð¾Ð²â?? Ñ? Ñ?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? ÐºÐ¾Ð»Ð¾Ð½Ðµ â??Ð?Ð¾Ñ?Ñ?ÐºÐµâ??."
-
-#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ/Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¼Ð¾Ð´Ñ?Ð»Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ðµ Ð¸Ð»Ð¸ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ñ?ÐºÑ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð°Ð·Ð¸Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ð±Ð¾Ñ?Ð½Ð¾Ñ? Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð½Ðµ Ð¿Ñ?ÐµÐ»Ð°Ð·Ðµ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ?"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Ð?Ðµ Ð´Ð¾Ð´Ð°Ñ? Ñ?Ð°Ð·Ð´Ð²Ð¾Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°"
@@ -11454,8 +11541,12 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ð?Ñ?Ð°Ð·Ð½Ð¸ Ñ?Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ?Ð° Ñ?Ð¼ÐµÑ?ÐµÐ¼ Ð¿Ñ?Ð¸ Ð·Ð°Ñ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ."
 
 #: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
-msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð°Ð½Ð¸Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð»Ð¸ÐºÐµ Ñ? HTML Ð¿Ð¾Ñ?Ñ?Ð¸. Ð?Ð½Ð¾Ð³Ð¸Ð¼ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸Ð¼Ð° Ñ?Ð¼ÐµÑ?Ð°Ñ?Ñ? Ð°Ð½Ð¸Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ð¸ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¸Ñ? Ð¶ÐµÐ»Ðµ Ð½ÐµÐ¿Ð¾ÐºÑ?ÐµÑ?Ð½Ðµ Ñ?Ð»Ð¸ÐºÐµ."
+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:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -11482,633 +11573,960 @@ msgid "Enable search folders on startup."
 msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð¿Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ñ?."
 
 #: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
-msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ðµ Ð¸Ð· Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ, Ñ?Ñ?Ð¾ Ð´Ð¾Ð½Ð¾Ñ?Ð¸ Ð¸Ð½Ñ?ÐµÑ?Ð°ÐºÑ?Ð¸Ð²Ð½Ð¾Ñ?Ñ? Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð·Ð¸ Ð½Ð°Ð·Ð¸Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ðµ Ð¸Ð· Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ, Ñ?Ñ?Ð¾ Ð´Ð¾Ð½Ð¾Ñ?Ð¸ Ð¸Ð½Ñ?ÐµÑ?Ð°ÐºÑ?Ð¸Ð²Ð½Ð¾Ñ?Ñ? Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð·Ð¸ "
+"Ð½Ð°Ð·Ð¸Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
 
 #: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
-msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾ Ð´Ð° Ð±Ð¸ Ñ?Ð°Ð·Ð¼Ð°ÐºÐ½Ð¸Ñ?Ð¾Ð¼ Ð¿Ð¾Ð¼ÐµÑ?Ð°Ð»Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?, ÐºÐ°Ð¾ Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"Ð£ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾ Ð´Ð° Ð±Ð¸ Ñ?Ð°Ð·Ð¼Ð°ÐºÐ½Ð¸Ñ?Ð¾Ð¼ Ð¿Ð¾Ð¼ÐµÑ?Ð°Ð»Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?, ÐºÐ°Ð¾ Ð¸ "
+"Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
 
-# bug: unclear
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ñ?Ð°Ð»Ð½Ð¸ Ð´ÐµÐ¾ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÐ½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð°Ð¼Ð¾ Ñ?ÐµÐºÑ?Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð½Ðµ Ð¿Ñ?ÐµÐ»Ð°Ð·Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ñ? ÐºÑ?Ñ?Ñ?ÐµÐ¼ "
+"â??message_text_part_limitâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable/disable caret mode"
-msgstr "Ð£ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ðµ/Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð· ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:66
-#: ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ? Ð½Ð°Ð·Ð¸Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð½Ð° Outlook/GMail Ð½Ð°Ñ?Ð¸Ð½"
+#, fuzzy
+#| msgid ""
+#| "Enable this to use Space bar key to scroll in message preview, message "
+#| "list and folders."
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"Ð£ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾ Ð´Ð° Ð±Ð¸ Ñ?Ð°Ð·Ð¼Ð°ÐºÐ½Ð¸Ñ?Ð¾Ð¼ Ð¿Ð¾Ð¼ÐµÑ?Ð°Ð»Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?, ÐºÐ°Ð¾ Ð¸ "
+"Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid "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, ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð»Ð¸ Ð½Ð°Ð·Ð¸Ð²Ðµ Ñ?Ð° UTF-8 Ñ?Ð»Ð¾Ð²Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð°, Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð½Ðµ Ð¿Ñ?Ð¸Ð´Ñ?Ð¶Ð°Ð²Ð°Ñ?Ñ? RFC 2231, Ð½ÐµÐ³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ðµ Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´ RFC 2047."
+msgid "Enable/disable caret mode"
+msgstr "Ð£ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ðµ/Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð· ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Height of the message-list pane"
-msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ? Ð½Ð°Ð·Ð¸Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð½Ð° Outlook/GMail Ð½Ð°Ñ?Ð¸Ð½"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Height of the message-list pane."
-msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+msgid ""
+"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, "
+"ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð»Ð¸ Ð½Ð°Ð·Ð¸Ð²Ðµ Ñ?Ð° UTF-8 Ñ?Ð»Ð¾Ð²Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ñ?Ð°Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð°, "
+"Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð½Ðµ Ð¿Ñ?Ð¸Ð´Ñ?Ð¶Ð°Ð²Ð°Ñ?Ñ? RFC 2231, Ð½ÐµÐ³Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ðµ Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´ RFC 2047."
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Ð¡ÐºÑ?Ð¸Ð²Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð° Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð° Ð¸Ð·Ð±Ð¾Ñ?"
+msgid "Flush Outbox after filtering"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:71
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸ 10 Ð¸Ð»Ð¸ Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼, Ð¿Ð¸Ñ?Ð° Ð³Ð° Ð´Ð° Ð»Ð¸ Ð·Ð°Ð¸Ñ?Ñ?Ð° Ð¶ÐµÐ»Ð¸ Ñ?Ð¾ Ð´Ð° Ñ?Ñ?Ð°Ð´Ð¸."
+msgid "Group Reply replies to list"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:72
-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 in GNOME's MIME type database may be used for displaying content."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ? Ð¾ÐºÐ²Ð¸Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ¼Ð° Ñ?Ð³Ñ?Ð°Ñ?ÐµÐ½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? MIME Ñ?Ð¸Ð¿, Ñ?Ð²Ð¸ MIME Ñ?Ð¸Ð¿Ð¾Ð²Ð¸ Ñ?Ð° Ð¾Ð²Ð¾Ð³ Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ñ?Ð¸ Ñ?Ñ? Ð²ÐµÐ·Ð°Ð½Ð¸ Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Bonobo Ð´ÐµÐ»Ð¾Ð²Ð° Ñ? Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¾Ñ? Ð±Ð°Ð·Ð¸ MIME Ñ?Ð¸Ð¿Ð¾Ð²Ð° Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð°."
+msgid "Height of the message-list pane"
+msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
 #: ../mail/evolution-mail.schemas.in.h:73
-msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid "Height of the message-list pane."
+msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
 #: ../mail/evolution-mail.schemas.in.h:74
-msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Ð¡ÐºÑ?Ð¸Ð²Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð° Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð° Ð¸Ð·Ð±Ð¾Ñ?"
 
 #: ../mail/evolution-mail.schemas.in.h:75
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸ 10 Ð¸Ð»Ð¸ Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼, Ð¿Ð¸Ñ?Ð° Ð³Ð° Ð´Ð° Ð»Ð¸ "
+"Ð·Ð°Ð¸Ñ?Ñ?Ð° Ð¶ÐµÐ»Ð¸ Ñ?Ð¾ Ð´Ð° Ñ?Ñ?Ð°Ð´Ð¸."
 
 #: ../mail/evolution-mail.schemas.in.h:76
-msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
+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 "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ? Ð¾ÐºÐ²Ð¸Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ¼Ð° Ñ?Ð³Ñ?Ð°Ñ?ÐµÐ½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? MIME Ñ?Ð¸Ð¿, Ñ?Ð²Ð¸ "
+"MIME Ñ?Ð¸Ð¿Ð¾Ð²Ð¸ Ñ?Ð° Ð¾Ð²Ð¾Ð³ Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ñ?Ð¸ Ñ?Ñ? Ð²ÐµÐ·Ð°Ð½Ð¸ Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Bonobo Ð´ÐµÐ»Ð¾Ð²Ð° Ñ? "
+"Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¾Ñ? Ð±Ð°Ð·Ð¸ MIME Ñ?Ð¸Ð¿Ð¾Ð²Ð° Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð°."
 
 #: ../mail/evolution-mail.schemas.in.h:77
-msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
+msgid "Ignore list Reply-To:"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð° Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° "
+"Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° "
+"Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ "
+"Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ "
+"Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
 
 #: ../mail/evolution-mail.schemas.in.h:82
-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 the search results."
-msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð°/Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð´Ð° Ñ?Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾, Ð° Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð· Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ. "
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ "
+"Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ "
+"Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð²ÐµÑ?Ð°Ð½Ð¾Ð³ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ "
+"Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð²ÐµÑ?Ð° Ð¸Ð»Ð¸ Ñ?Ð¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?. Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¾Ð²Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð²ÐµÑ?Ð°Ð½. Ð?Ð²Ð° Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? "
+"Ñ?Ð°Ð¼Ð¾ Ñ?Ð¿Ð¾Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ."
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ð¼ÐµÑ?Ð°"
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°â??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
 
 #: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° "
+"Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"Ð?Ð¾Ñ?ÐµÑ?Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° â??Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµâ??. Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ñ?Ðµ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ "
+"ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?."
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
+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 "
+"the search results."
+msgstr ""
+"Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð°/Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð´Ð° Ñ?Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ "
+"Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾, Ð° Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð· Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ. "
+
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+#| 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 the search results."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð°/Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð° Ð´Ð° Ñ?Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ "
+"Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾, Ð° Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ðµ Ð¸Ð· Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ. "
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+#, fuzzy
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
+msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
+
+#: ../mail/evolution-mail.schemas.in.h:93
+#, fuzzy
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
+msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ð¼ÐµÑ?Ð°"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¾Ð·Ð½Ð°ÐºÐ° Ð¸ Ñ?Ð¸Ð¼Ð° Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸Ñ? Ð±Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð° MIME Ñ?Ð¸Ð¿Ð¾Ð²Ð° Ñ?Ð°Ð´Ð¸ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð·Ð° Bonobo Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð¸Ð¼Ð° Ð´ÐµÐ»Ð¾Ð²Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¸Ñ? Ð»Ð¸Ñ?ÐµÐ½Ñ?Ð¸"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð½Ð°Ð»Ð¾Ð³Ð° ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð´ÐµÐ¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½Ð¸Ð·Ð¾Ð²Ðµ ÐºÐ¾Ñ?Ðµ Ð¸Ð¼ÐµÐ½Ñ?Ñ?Ñ? Ð¿Ð¾Ð´Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð½Ð°Ð»Ð¾Ð³Ð° ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð´ÐµÐ¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½Ð¸Ð·Ð¾Ð²Ðµ "
+"ÐºÐ¾Ñ?Ðµ Ð¸Ð¼ÐµÐ½Ñ?Ñ?Ñ? Ð¿Ð¾Ð´Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¾Ð·Ð½Ð°ÐºÐ° Ñ?ÐµÐ·Ð¸ÐºÐ° Ñ?ÐµÑ?Ð½Ð¸ÐºÐ° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ðµ Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:94
-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."
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¾Ð·Ð½Ð°ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð´ÐµÐ¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½Ð¸Ð·Ð¾Ð²Ðµ Ð¾Ð±Ð»Ð¸ÐºÐ° Ð¸Ð¼Ðµ:Ð±Ð¾Ñ?Ð° Ð³Ð´Ðµ Ð±Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ HTML hex ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:103
+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."
+msgstr ""
+"Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¾Ð·Ð½Ð°ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð´ÐµÐ¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ. Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½Ð¸Ð·Ð¾Ð²Ðµ "
+"Ð¾Ð±Ð»Ð¸ÐºÐ° Ð¸Ð¼Ðµ:Ð±Ð¾Ñ?Ð° Ð³Ð´Ðµ Ð±Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ HTML hex ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ð¼ÐµÐ½Ð° Ð¿Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»Ð° Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ð° Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ð·Ð° HTML Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?ÐµÐºÐ¾ HTTP-Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:97
-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 contacts. \"2\" - Always load images off the net."
-msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ð·Ð° HTML Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?ÐµÐºÐ¾ HTTP(S)-Ð°. Ð?Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸: â??0â?? - Ð?Ð¸ÐºÐ°Ð´Ð° Ð½Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ. â??1â?? - Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°. â??2â?? - Ð£Ð²ÐµÐº Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:106
+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 "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ð·Ð° HTML Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?ÐµÐºÐ¾ HTTP(S)-Ð°. Ð?Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸: â??0â?? - "
+"Ð?Ð¸ÐºÐ°Ð´Ð° Ð½Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ. â??1â?? - Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ð¸Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ "
+"Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°. â??2â?? - Ð£Ð²ÐµÐº Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "Ð?ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð°Ð´Ñ?Ðµ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "Ð?ÐµÐ»ÐµÐ¶Ð¸ Ñ?Ð°Ð´Ñ?Ðµ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð° Ñ? Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð·Ð° Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð·Ð° Ð±ÐµÐ»ÐµÐ¶ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "Ð£Ð²ÐµÑ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ Ð²Ð¸Ñ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ð»Ðµ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾Ð³ Ñ?Ð¾ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ Ð²Ð¸Ñ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ð»Ðµ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾Ð³ Ñ?Ð¾ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Ð¡Ñ?Ð¸Ð» Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ (â??normalâ?? Ð·Ð° Ð½Ð¾Ñ?Ð¼Ð°Ð»Ð°Ð½ Ð¿Ñ?Ð¸ÐºÐ°Ð·; â??full headersâ?? Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð²Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°; â??sourceâ?? Ð·Ð° Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð·)"
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ (â??normalâ?? Ð·Ð° Ð½Ð¾Ñ?Ð¼Ð°Ð»Ð°Ð½ Ð¿Ñ?Ð¸ÐºÐ°Ð·; â??full headersâ?? Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· "
+"Ñ?Ð²Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°; â??sourceâ?? Ð·Ð° Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð·)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ð´Ð°Ð½Ð° Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ð´Ð°Ð½Ð° Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ð¼ÐµÑ?Ð° Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ñ?, Ñ? Ð´Ð°Ð½Ð¸Ð¼Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ð¼ÐµÑ?Ð° Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ñ?, Ñ? Ð´Ð°Ð½Ð¸Ð¼Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Ð?Ñ?Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ? TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° Ñ?Ðµ Ð½Ð°Ñ?Ð»Ð¾Ð² Ð¿Ñ?Ð°Ð·Ð°Ð½"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð±ÐµÐ· Ð½Ð°Ñ?Ð»Ð¾Ð²Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ ÐºÐ¾Ð´ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Ð?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when replying privately to list messages"
+msgstr "Ð?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when replying to many recipients"
+msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð°Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¼ Bcc Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð°"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Ð?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð½ÐµÐ²Ð¸Ð´Ñ?Ð¸Ð²Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸ 10 Ð¸Ð»Ð¸ Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼"
 
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
-msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ HTML Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ Ð¶ÐµÐ»Ðµ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ñ? HTML Ð¿Ð¾Ñ?Ñ?Ñ?."
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Ð?Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ HTML Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ð½Ðµ "
+"Ð¶ÐµÐ»Ðµ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ñ? HTML Ð¿Ð¾Ñ?Ñ?Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð±ÐµÐ· Ð¿Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ°Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ð¸ HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Ð?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð¿ÐµÑ?Ñ?Ð¾Ð½Ð°Ð»Ð¸Ð·Ð¾Ð²Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ? Ð½Ð° Ð´Ð½Ð¾ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Ð?Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ðµ ÐµÐ¼Ð¾Ñ?Ð¸ÐºÐ¾Ð½Ðµ Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ñ? Ñ?Ð»Ð¸ÐºÐ°Ð¼Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "Ð?Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°je Ð²ÐµÐ·Ðµ Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ð¸Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð° Ð´Ð° Ð»Ð¸ Ð¸Ð¼Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ñ? Ð´Ð¾Ð»Ð°Ð·Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?Ð»Ð¸ÐºÑ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸Ð¼Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ? ÐºÐ°Ð¾ HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ñ? ÐºÐ°Ð¾ HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ ÐºÐ¾Ð»Ð¾Ð½Ñ? Ñ?Ð° Ðµ-Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð°  Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Ð?Ð½Ñ?ÐµÑ?Ð²Ð°Ð» Ñ?Ð¸Ð½Ñ?Ñ?Ð¾Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð¾Ð¼"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð° TRUE Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ? Ð´Ð° Ð½Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ð·Ð´Ð²Ð¾Ñ?Ð½Ð¸ÐºÐ° Ð¸Ñ?Ð¿Ñ?ÐµÐ´ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¿Ð¸Ñ?Ð°Ñ?Ñ?. "
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð° TRUE Ñ? Ñ?Ð»Ñ?Ñ?Ð°Ñ?Ñ? Ð´Ð° Ð½Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ð·Ð´Ð²Ð¾Ñ?Ð½Ð¸ÐºÐ° Ð¸Ñ?Ð¿Ñ?ÐµÐ´ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° "
+"Ð¿Ñ?Ð¸ Ð¿Ð¸Ñ?Ð°Ñ?Ñ?. "
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ â??Bccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ â??Ccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ â??Ð¨Ð°Ñ?Ðµâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ â??Ð¨Ð°Ñ?Ðµâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ðµ â??Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð°â?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ â??Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð°â?? ÐºÐ°Ð´Ð° Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð°Ð½Ð¸Ð¼Ð°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð²Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð²Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð°Ð½Ð¸Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð»Ð¸ÐºÐµ ÐºÐ°Ð¾ Ð°Ð½Ð¸Ð¼Ð°Ñ?Ð¸Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ (ÐºÐ°Ð¾ Ð¿Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ðµ) Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð°Ð½Ð¸Ð¼Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð»Ð¸ÐºÐµ"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? â??Ð?Ð°Ñ?Ñ?Ð¼â??."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ñ?Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÑ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ â??Bccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° â??Ð?Ñ?ÐµÐ³Ð»ÐµÐ´â?? Ð½Ð°ÐºÐ¾Ð½ Ð¸Ð·Ð±Ð¾Ñ?Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
-
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ â??Bccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° â??Ð?Ñ?ÐµÐ³Ð»ÐµÐ´â?? Ð½Ð°ÐºÐ¾Ð½ Ð¸Ð·Ð±Ð¾Ñ?Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ â??Bccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° â??Ð?Ñ?ÐµÐ³Ð»ÐµÐ´â?? "
+"Ð½Ð°ÐºÐ¾Ð½ Ð¸Ð·Ð±Ð¾Ñ?Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:155
-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:166
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ðµ â??Bccâ?? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° â??Ð?Ñ?ÐµÐ³Ð»ÐµÐ´â?? "
+"Ð½Ð°ÐºÐ¾Ð½ Ð¸Ð·Ð±Ð¾Ñ?Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-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:167
+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:157
-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:168
+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:158
-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:169
+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:159
-msgid "Show the email-address of the sender in a separate column in the message list."
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ðµ-Ð°Ð´Ñ?ÐµÑ?Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð¿Ð¾Ñ?ÐµÐ±Ð½Ð¾Ñ? ÐºÐ¾Ð»Ð¾Ð½Ð¸ Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð¾ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ â??Ð?Ð°Ñ?Ñ?Ð¼â?? (Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð°ÐºÐ¾ Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÑ?Ñ?Ñ?). Ð?Ð½Ð°Ñ?Ðµ Ñ?Ð²ÐµÐº Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° â??Ð?Ð°Ñ?Ñ?Ð¼â?? Ð¿Ñ?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¾Ñ? Ð·Ð¾Ð½Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°."
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ð¾ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ â??Ð?Ð°Ñ?Ñ?Ð¼â?? (Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð°ÐºÐ¾ "
+"Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÑ?Ñ?Ñ?). Ð?Ð½Ð°Ñ?Ðµ Ñ?Ð²ÐµÐº Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° â??Ð?Ð°Ñ?Ñ?Ð¼â?? "
+"Ð¿Ñ?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ð¸ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐ¾Ñ? Ð·Ð¾Ð½Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»Ð¸ÐºÑ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð¾ÐºÐ½Ñ? Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð° Ñ?Ð½Ñ?Ñ?Ð°Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Ð?ÐµÐ·Ð¸Ñ?Ð¸ Ð·Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ? Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Ð¤Ð¾Ð½Ñ? Ñ?ÐµÑ?Ð¼Ð¸Ð½Ð°Ð»Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "Ð?Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÑ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ñ?Ð°Ð»Ð½Ð¾Ð³ Ð´ÐµÐ»Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð´Ð¾Ð´Ð°Ñ?Ð°Ðº ÐºÑ?ÐºÐµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
+#, fuzzy
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°, Ñ? Ð´Ð°Ð½Ð¸Ð¼Ð° Ð¾Ð´ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ° ÐµÐ¿Ð¾Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:182
+#, fuzzy
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ñ?Ð°Ð¶Ñ?ÐµÑ?Ð° Ñ?Ð¼ÐµÑ?Ð°, Ñ? Ð´Ð°Ð½Ð¸Ð¼Ð° Ð¾Ð´ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ° ÐµÐ¿Ð¾Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
-msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ°. â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ð²Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°. â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ°. "
+"â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ð²Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°. "
+"â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "Ð¤Ð¾Ð½Ñ? Ñ?ÐµÑ?Ð¼Ð¸Ð½Ð°Ð»Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "Ð¤Ð¾Ð½Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ñ?Ð¸Ð²Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
-msgstr "Ð?Ð¾Ð¶Ðµ Ð¸Ð¼Ð°Ñ?Ð¸ Ñ?Ñ?Ð¸ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸. â??0â?? Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐµ. â??1â?? Ð·Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°. â??2â?? Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾ Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð¸ ÐºÐ²Ð°Ñ?Ð°."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"Ð?Ð¾Ð¶Ðµ Ð¸Ð¼Ð°Ñ?Ð¸ Ñ?Ñ?Ð¸ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸. â??0â?? Ð·Ð° Ð³Ñ?ÐµÑ?ÐºÐµ. â??1â?? Ð·Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ð°. â??2â?? Ð·Ð° "
+"Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾ Ð´Ð¸Ñ?Ð°Ð³Ð½Ð¾Ð·Ð¸ ÐºÐ²Ð°Ñ?Ð°."
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.h:176
-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."
-msgstr "Ð?Ð²Ð¾ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð²ÐµÑ?Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?Ð°Ð»Ð½Ð¾Ð³ Ð´ÐµÐ»Ð° ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸. Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ðµ 4MB / 4096 KB Ð¸ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾ Ñ?Ðµ ÐºÐ°Ð¾ Ð±Ñ?Ð¾Ñ? KB."
+#: ../mail/evolution-mail.schemas.in.h:187
+#, fuzzy
+#| 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."
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð½Ð°Ñ?Ð²ÐµÑ?Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?ÐµÐºÑ?Ñ?Ñ?Ð°Ð»Ð½Ð¾Ð³ Ð´ÐµÐ»Ð° ÐºÐ¾Ñ?Ð¸ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ñ? "
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸. Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ðµ 4MB / 4096 KB Ð¸ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¾ Ñ?Ðµ ÐºÐ°Ð¾ Ð±Ñ?Ð¾Ñ? KB."
 
-#: ../mail/evolution-mail.schemas.in.h:177
-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 to the other available plugins."
-msgstr "Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð´Ð¾Ð´Ð°Ñ?Ð°Ðº ÐºÑ?ÐºÐµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ, Ñ?Ð°Ðº Ð¸ Ð°ÐºÐ¾ Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¸ Ð²Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐ¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð¼ÐµÐ½Ñ?Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð¸Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½, Ð¿Ñ?ÐµÐ¾Ñ?Ñ?Ð°Ð»Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ð½Ð¸."
+#: ../mail/evolution-mail.schemas.in.h:188
+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 "
+"to the other available plugins."
+msgstr ""
+"Ð?Ð²Ð¾ Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð´Ð¾Ð´Ð°Ñ?Ð°Ðº ÐºÑ?ÐºÐµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ, Ñ?Ð°Ðº Ð¸ Ð°ÐºÐ¾ Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¸ Ð²Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐ¸ "
+"Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ð¼ÐµÐ½Ñ?Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð¸Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½, Ð¿Ñ?ÐµÐ¾Ñ?Ñ?Ð°Ð»Ð¸ "
+"Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ð¸ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð°ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/evolution-mail.schemas.in.h:178
-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."
-msgstr "Ð?Ð²Ð°Ðº ÐºÑ?Ñ?Ñ? Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½ Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð¸ Ð¿Ð¾Ñ?Ð¾Ð¼ Ð²Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° â??falseâ?? (Ð½ÐµÑ?Ð°Ñ?Ð½Ð¾). Ð?Ð²Ð¾ Ñ?ÐºÐ»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð° Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?."
+#: ../mail/evolution-mail.schemas.in.h:189
+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."
+msgstr ""
+"Ð?Ð²Ð°Ðº ÐºÑ?Ñ?Ñ? Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½ Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð¸ Ð¿Ð¾Ñ?Ð¾Ð¼ Ð²Ñ?Ð°Ñ?ÐµÐ½ Ð½Ð° â??falseâ?? (Ð½ÐµÑ?Ð°Ñ?Ð½Ð¾). Ð?Ð²Ð¾ Ñ?ÐºÐ»Ð°Ñ?Ð° "
+"Ð¿Ð¾Ñ?Ñ?Ñ? Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð° Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?."
 
-#: ../mail/evolution-mail.schemas.in.h:179
-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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð»Ð¸Ñ?Ñ?Ñ? XML Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð° Ð·Ð° Ð½Ð°Ð²Ð¾Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ? Ñ?Ð¸Ñ?Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°. XML Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð° Ñ?Ðµ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° &lt;header enabled&gt; - Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½Ð¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:190
+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;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ñ?ÐµÐ±Ð° Ð´Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð»Ð¸Ñ?Ñ?Ñ? XML Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð° Ð·Ð° Ð½Ð°Ð²Ð¾Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? "
+"Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ñ? Ñ?Ð¸Ñ?Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°. XML Ñ?Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð° Ñ?Ðµ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° &lt;header "
+"enabled&gt; - Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½Ð¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:180
-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 mail sent by known contacts from junk filtering."
-msgstr "Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¾Ð´Ð½Ð¾Ñ?Ð¸ Ð½Ð° ÐºÑ?Ñ?Ñ? lookup_addressbook Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ðµ Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð´Ð° Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð°Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ñ?Ðµ Ð¸Ð·Ð´Ð²Ð¾Ñ?Ð¸Ð»Ð° Ð¿Ð¾Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ð¼Ñ?ÐµÐ½Ð° Ð¾Ð´ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?Ð° Ð¾Ð´ Ð¾Ð½Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:191
+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 "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Ð?Ð²Ð° Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¾Ð´Ð½Ð¾Ñ?Ð¸ Ð½Ð° ÐºÑ?Ñ?Ñ? lookup_addressbook Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ðµ Ð·Ð° Ð¾Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ "
+"Ð´Ð° Ð»Ð¸ Ð´Ð° Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?Ñ?Ð°Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ? ÐºÐ°ÐºÐ¾ Ð±Ð¸ Ñ?Ðµ Ð¸Ð·Ð´Ð²Ð¾Ñ?Ð¸Ð»Ð° Ð¿Ð¾Ñ?Ñ?Ð° "
+"Ð¿Ñ?Ð¸Ð¼Ñ?ÐµÐ½Ð° Ð¾Ð´ Ð¿Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ?Ð° Ð¾Ð´ Ð¾Ð½Ðµ Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸Ð¿Ð¾Ð¼Ð¾Ñ?Ð¸ Ð±Ñ?Ð·Ð¸Ð½Ð¸ Ð¿Ñ?Ð¸Ð±Ð°Ð²Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-msgstr "Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ð±Ñ?Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, Ð¿Ð¾Ñ?Ð»Ðµ Ñ?ÐµÐ³Ð° Ñ?Ðµ â??...â?? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ð±Ñ?Ð¾Ñ? Ð°Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾Ð¼ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, "
+"Ð¿Ð¾Ñ?Ð»Ðµ Ñ?ÐµÐ³Ð° Ñ?Ðµ â??...â?? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾."
 
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
-msgstr "Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð½Ð¸Ð·Ð¾Ð²Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð¸Ð»Ð¸ Ñ?ÐºÑ?Ð¿Ñ?ÐµÐ½Ð¸. Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð½Ð¸Ð·Ð¾Ð²Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¸ Ð¸Ð»Ð¸ "
+"Ñ?ÐºÑ?Ð¿Ñ?ÐµÐ½Ð¸. Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:184
-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 restart."
-msgstr "Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð½Ð¸Ð·Ð¾Ð²Ð¸ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð½Ð¸ Ð¿Ð¾ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸ Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð½Ð¸Ð·Ð°, Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¿Ð¾ Ð´Ð°Ñ?Ñ?Ð¼Ñ?. Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ."
+#: ../mail/evolution-mail.schemas.in.h:195
+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 "
+"restart."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð½Ð¸Ð·Ð¾Ð²Ð¸ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð½Ð¸ Ð¿Ð¾ Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸ "
+"Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð½Ð¸Ð·Ð°, Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¿Ð¾ Ð´Ð°Ñ?Ñ?Ð¼Ñ?. Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?ÐµÐ¼Ð° Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð²Ð¸Ñ?ÐµÐ½Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð·Ð° Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð²Ð¸Ñ?ÐµÐ½Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "Ð?Ð?Ð? Ð½Ð¸Ð· Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° Ð¿Ð¾Ð´Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð½Ð¸Ñ? Ð³Ñ?ÐµÑ?ÐºÐ¸ Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?ÐµÑ?Ð²Ð¸Ñ? Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð° Ð£Ð±Ð¸Ñ?Ðµ Ñ?Ð¿Ð°Ð¼Ð°"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð´ÐµÐ¼Ð¾Ð½Ð° Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð° Ð£Ð±Ð¸Ñ?Ðµ Ñ?Ð¿Ð°Ð¼Ð° (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¾Ð¿Ñ?Ñ?Ð²ÐµÐ½Ðµ Ñ?Ð¾Ð½Ñ?Ð¾Ð²Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ðµ Ñ?Ð¾Ð½Ñ?Ð¾Ð²Ðµ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?Ðµ."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ñ?Ð¿Ð°Ð¼Ð°."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ Ñ?Ð¿Ð°Ð¼Ð° (Ð±ÐµÐ· DNS-Ð°)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
-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:207
+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:197
-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:208
+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:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Ð¤Ð¾Ð½Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ñ?Ð¸Ð²Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ð´Ð¾Ð´Ð°Ñ?Ðµ Ñ?Ð²Ð°ÐºÐ¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¾Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ?Ñ? Ñ?ÐºÑ?Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð½Ð°Ð·Ð¸Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? Ð±Ð¾Ñ?Ð½Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ð¸."
 
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-msgstr "Ð?Ð° Ð»Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ðµ Ð¿Ð¾ Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ? ÐºÐ°Ð´Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° In-Reply-To Ð¸Ð»Ð¸ References."
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð· Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ðµ Ð¿Ð¾ Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ? ÐºÐ°Ð´Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° In-"
+"Reply-To Ð¸Ð»Ð¸ References."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ð¶Ñ? Ð½Ð° Ð¾Ñ?Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð¸"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Elm Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:951
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Elm Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "Ð?Ð°Ð¶Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð° Ð¸Ð· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð° Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+#, fuzzy
+#| msgid "Destination folder:"
+msgid "_Destination folder:"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ñ?Ð²Ð¾Ð·"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#, fuzzy
+#| msgid "Subject"
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð²"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#, fuzzy
+#| msgid "From"
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Ð¨Ð°Ñ?Ðµ"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Ð?ÐµÑ?ÐºÐ»Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾ Ñ?Ð°Ð½Ð´Ñ?Ñ?Ðµ (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Ð£Ð²Ð¾Ð·Ð½Ð¸Ðº Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¾Ð±Ð»Ð¸ÐºÐ° Ð?ÐµÑ?ÐºÐ»Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾Ð³ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾Ð³ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
+#, fuzzy, c-format
+#| msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° %s"
@@ -12117,469 +12535,564 @@ msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° %s"
 msgid "Importing Pine data"
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Pine Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Pine Ñ?Ð²Ð¾Ð·Ð½Ð¸Ðº"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Ð£Ð²Ð¾Ð·Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ? Ð¸Ð· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð° Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð° Ð·Ð° %s"
 
-#: ../mail/mail-autofilter.c:236
-#: ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð° Ð¾Ð´ %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² Ñ?Ðµ %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ð° Ð»Ð¸Ñ?Ñ?Ð°"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Ð?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Ð?Ð¿Ñ?Ð¸Ñ?Ð° Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ</b> (Ð½Ðµ Ð¿Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ðµ)"
+msgid "(Not Recommended)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Ð?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ð½Ð°Ð»Ð¾Ð³Ñ?"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð½Ð¾_Ð²Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Ð£Ð²ÐµÐº Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð° Ð¾Ð²Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_Ð¢Ð°ÐºÐ¾Ñ?Ðµ Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ð½Ð° Ñ?ÐµÐ±Ðµ Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Ð£Ð²ÐµÐº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ _ÐºÐ¾Ð¿Ð¸Ñ?Ñ? (cc):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Ð£Ð²ÐµÐº Ð¿Ð¾Ñ?Ð°Ñ?Ð¸ _Ð½ÐµÐ²Ð¸Ð´Ñ?Ð¸Ð²Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? (Bcc):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Ð£Ð²ÐµÐº _Ð²ÐµÑ?Ñ?Ñ? ÐºÑ?Ñ?Ñ?ÐµÐ²Ð¸Ð¼Ð° Ð¼Ð¾Ð³ Ð¿Ñ?Ð¸Ð²ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Ð£Ð²_ÐµÐº Ñ?Ð¸Ñ?Ñ?Ñ?Ñ? Ð¸ Ð¼ÐµÐ½Ð¸ Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Ð£Ð²ÐµÐº Ñ?Ñ?Ð°Ð¶Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ?"
 
 #: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:993
+msgid "Apply the same _view settings to all folders"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "Ð£Ð²ÐµÐº Ñ?Ð¼ÐµÑ?Ð½Ð¸ Ñ?Ð»Ð¸ÐºÐµ _ÐµÐ¼Ð¾Ñ?Ð¸ÐºÐ¾Ð½Ð°"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "Ð?_Ð¾Ð´Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "_Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ñ?Ð¸Ð¿Ð¾Ð²Ðµ"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¸Ð¼Ð° Ð»Ð¸ Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ñ? _Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ð¼ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð¸Ð¼Ð°"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¸Ð¼Ð° Ð»Ð¸ Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð° Ñ? _Ð¿Ñ?Ð¸Ñ?Ñ?Ð¸Ð³Ð»Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ? Ð´Ð¾Ðº _ÐºÑ?Ñ?Ð°Ð¼"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ð¸Ð³Ð»Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "Ð?Ñ?Ð¸_Ñ?Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "Ð?Ñ?Ð¸Ñ?_Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Ð?Ð¾Ñ?Ð° Ð·Ð° _Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð½Ð¾ Ð½Ð°Ð¿Ð¸Ñ?Ð°Ð½Ðµ Ñ?ÐµÑ?Ð¸:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/mail-config.ui.h:26
-#: ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Ð?Ð¾Ñ?Ð²Ñ?Ð´Ð¸ ÐºÐ°Ð´Ð° Ð¿Ñ?Ð°Ð·Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ð¿Ð¾Ð½Ð°Ñ?Ð°Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½a _ÐºÐ¾Ð´Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ñ?Ñ?Ð±Ñ?Ðµ Ð¿Ñ?Ð¸ Ð¸_Ð·Ð»Ð°Ð·Ñ?"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Ð?Ð¸Ð³Ð¸Ñ?Ð°Ð»Ð½Ð¾ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¾Ð´_Ð»Ð°Ð·Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:39
+#, fuzzy
+#| msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð° _Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "Ð?Ðµ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð´Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸_Ð½Ð° Ð¿Ñ?ÐµÑ?Ðµ"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ð?Ðµ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°_Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ñ?Ñ?Ð±Ñ?Ðµ Ð°ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ñ? Ð¼Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "Ð?Ðµ Ñ?Ð¸Ñ?Ð¸Ñ?Ð°Ñ?"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "_Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð?Ð°Ñ?Ñ?Ñ?Ð¸:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° _Ð°Ð´Ñ?ÐµÑ?Ð°:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ñ?Ð° _Ñ?Ð¼ÐµÑ?ÐµÐ¼ Ð½Ð° Ð¸Ð·Ð»Ð°Ð·Ñ?"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð?Ð°Ð³Ð¸Ñ?Ð½Ñ? Ñ?Ð°Ð·Ð¼Ð°Ðº_Ð½Ð¸Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?_Ñ?Ð°Ð³Ðµ"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ñ?Ð¸_Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Ð¨Ð¸Ñ?Ñ?Ñ?Ñ? Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ (Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "Ð£Ñ?Ð²Ñ?Ñ?ÐµÐ½Ðµ-Ñ?Ð¸Ñ?Ð¸Ð½Ðµ:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "Ð¤Ð¾Ð½Ñ? Ð½ÐµÐ¿_Ñ?Ð¾Ð¼ÐµÑ?Ð¸Ð²Ðµ Ñ?Ð¸Ñ?Ð¸Ð½Ðµ:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ñ?Ð¾Ð½Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Ð?Ð±Ð»Ð¸ÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? H_TML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "Ð?Ð¼Ðµ Ð¸ Ð¿Ñ?ÐµÐ·Ð¸Ð¼Ðµ:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "Ð?Ð°Ð³Ð»Ð°Ñ?Ð¸ _Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "Ð£Ð½Ñ?Ñ?Ð°Ñ?"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "Ð£Ð½Ñ?Ñ?Ð°Ñ? (Outlook Ñ?Ñ?Ð¸Ð»)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Ð?Ð·Ð½Ð°ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ñ?ÐµÐ·Ð¸ÐºÐ°"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð»Ð¸ÐºÐ°"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "Ð?Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¾Ð³ Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "Ð¤Ð¾Ð½Ñ?Ð¾Ð²Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "Ð?Ñ?Ð¸Ð·Ð½Ð°Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "Ð?ÐµÐ· _Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð°:"
 
-#: ../mail/mail-config.ui.h:73
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.ui.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "Ð?Ð°Ð¿Ð¾Ð¼ÐµÐ½Ð°: Ð½ÐµÑ?ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸ Ð·Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð´Ð¾Ðº Ñ?Ðµ Ð½Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ?Ðµ Ð¿Ñ?Ð²Ð¸ Ð¿Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ð¾ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ðµ Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ð¼ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?ÐµÐ¼ Ð·Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð¾Ð¼."
+msgstr ""
+"Ð?Ð¿Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ð¾ Ð¿Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ðµ Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ð¼ "
+"Ð·Ð°Ð³Ð»Ð°Ð²Ñ?ÐµÐ¼ Ð·Ð° Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð¾Ð¼."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "Ð?Ñ?_Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG Ð?Ð? _ÐºÑ?Ñ?Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "_Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Ð?Ð¾Ñ?Ñ?:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð°Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¼ Bcc Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð°"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¸Ñ?Ð½Ð¾ Ð´Ð¾Ð±Ñ?Ð° Ð¿Ñ?Ð¸Ð²Ð°Ñ?Ð½Ð¾Ñ?Ñ? (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "Ð¤Ð¾Ð½Ñ?Ð¾Ð²Ð¸ Ð·Ð° Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:92
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "Ð?Ð¸Ñ?Ð° Ð¿Ñ?Ð¸ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+
+#: ../mail/mail-config.ui.h:93
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending replies to _many recipients"
+msgstr "Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð°Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¼ Bcc Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð°"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "Ð¦Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "Ð?_Ð°Ð¿Ð°Ð¼Ñ?Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "Ð?Ð´_Ð³Ð¾Ð²Ð¾Ñ?:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "Ð?Ð°Ð¿Ð°_Ð¼Ñ?Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "Ð?Ð±Ð°Ð²ÐµÐ·Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½ Ñ? Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Ð¢Ñ?_Ð°Ð¶Ð¸ Ñ?Ð¾Ñ?Ð¾Ð³Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ?Ð°Ð¼Ð¾ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸Ð¼Ð°"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "Ð?Ð·Ð°Ð±_ÐµÑ?Ð¸..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ðµ:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "_Ð¡Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸ Ñ?Ð¾Ð½Ñ?:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¸ MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "Ð?Ð´Ð°Ð±Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð°"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ HTML Ñ?Ð¾Ð½Ñ? Ñ?Ð¸ÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ HTML Ñ?Ð¾Ð½Ñ? Ñ?Ð¸ÐºÑ?Ð¸Ñ?Ð°Ð½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ð·Ð° Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ HTML Ñ?Ð¾Ð½Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ñ?Ð¸Ð²Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ HTML Ñ?Ð¾Ð½Ñ? Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ñ?Ð¸Ð²Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ð·Ð° Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Junk Folder"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Ð?Ð´Ð°Ð±Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¾"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+#, fuzzy
+#| msgid "Select Drafts Folder"
+msgid "Select Trash Folder"
+msgstr "Ð?Ð´Ð°Ð±Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð°"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Ð¤Ð¾Ñ?Ð¾Ð³Ñ?Ð°Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸Ñ? _Ð¿Ð¾Ñ?Ñ?ÐºÐ°:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "Ð¡ÐµÑ?_Ð²ÐµÑ? Ñ?Ñ?Ð°Ð¶Ð¸ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "_Ð¢Ð¸Ð¿ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°: "
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° _Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ:"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "Ð?Ð¾Ñ?_Ð¿Ð¸Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° _Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "Ð?Ð¾Ñ?Ð¿_Ð¸Ñ?:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° _Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ:"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ð¿Ñ?Ð°Ð²Ð¾Ð¿Ð¸Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "Ð£ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ñ? Ð·Ð°Ð¿Ð¾Ñ?Ð½Ð¸ _ÐºÑ?Ñ?Ð°Ñ?Ðµ Ð½Ð° Ð´Ð½Ñ?"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "Ð¢_Ð¸Ð¿:"
 
-#: ../mail/mail-config.ui.h:122
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
-msgstr "Ð?Ð¸Ñ?Ñ?Ð° Ñ?ÐµÐ·Ð¸ÐºÐ° Ð¾Ð²Ð´Ðµ Ð¾Ñ?Ð»Ð¸ÐºÐ°Ð²Ð° Ñ?Ð°Ð¼Ð¾ Ð¾Ð½Ðµ Ñ?ÐµÐ·Ð¸ÐºÐµ Ð·Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½ Ñ?ÐµÑ?Ð½Ð¸Ðº."
+#: ../mail/mail-config.ui.h:138
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ð?Ð¸Ñ?Ñ?Ð° Ñ?ÐµÐ·Ð¸ÐºÐ° Ð¾Ð²Ð´Ðµ Ð¾Ñ?Ð»Ð¸ÐºÐ°Ð²Ð° Ñ?Ð°Ð¼Ð¾ Ð¾Ð½Ðµ Ñ?ÐµÐ·Ð¸ÐºÐµ Ð·Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½ Ñ?ÐµÑ?Ð½Ð¸Ðº."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12589,7 +13102,14 @@ msgstr ""
 "Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?. Ð?Ð¼Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð´Ð°Ð»Ð¸ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¾\n"
 "Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° ÐµÐºÑ?Ð°Ð½Ñ?. "
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+#| msgid "Posting destination"
+msgid "Top Posting Option"
+msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° Ð¿Ð¾Ñ?Ñ?Ð°"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12597,188 +13117,201 @@ msgstr ""
 "Ð£ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð¸Ð¼Ðµ Ð¿Ð¾ ÐºÐ¾Ð¼Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð½Ð°Ð·Ð¾Ð²ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³.\n"
 "Ð?Ð° Ð¿Ñ?Ð¸Ð¼ÐµÑ?: â??Ð?Ð¾Ñ?Ð»Ð¾Ð²Ð½Ð¸â?? Ð¸Ð»Ð¸ â??Ð?Ð¸Ñ?Ð½Ð¸â??"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾_Ð¸Ð¼Ðµ:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð°Ñ?Ñ?Ðµ_Ð½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:130
-#: ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾_Ð¸Ð¼Ðµ:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "Ð?Ñ?Ð¾_Ð¼ÐµÐ½Ñ?Ð¸Ð²Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð°:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "_Ð?Ð¾Ð´Ð°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "_Ð£Ð²ÐµÐº Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ? Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "Ð¢Ð¸Ð¿ _Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "_Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "_Ð?Ð¸Ñ?ÐµÐºÑ?Ð½Ð° Ð²ÐµÐ·Ð° Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð¾Ð¼"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ð?Ðµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ñ?Ñ? Ð·Ð°Ñ?Ñ?ÐµÐ²Ðµ Ð·Ð° Ñ?_Ð°Ñ?Ñ?Ð°Ð½ÐºÐµ (Outlook ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð½Ð¾Ñ?Ñ?)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "Ð¡Ñ?Ð¸Ð» _Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:139
+# bug: requires a comment on usage
+#: ../mail/mail-config.ui.h:157
+#, fuzzy
+#| msgid "Current Folder"
+msgid "_Junk Folder:"
+msgstr "Ñ?ÐµÐºÑ?Ñ?Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "_Ð?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ? Ð¸Ð·Ð½Ð°Ð´ Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ñ?Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "_Ð?ÐµÐ·Ð¸Ñ?Ð¸"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "_Ð£Ñ?Ð¸Ñ?Ð°Ñ? Ñ?Ð»Ð¸ÐºÐµ Ð¾Ð´ ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð° Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "_Ð?Ð¾Ñ?Ñ?Ð°Ð¶Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ñ?"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "_Ð?ÐµÐºÐ° Ð¾Ð²Ð¾ Ð±Ñ?Ð´Ðµ Ð¼Ð¾Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "_Ð Ñ?Ñ?Ð½Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "_Ð?Ð·Ð½Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ð»Ðµ"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "_Ð?Ð¸ÐºÐ°Ð´Ð° Ð½Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ? Ñ?Ð»Ð¸ÐºÐµ Ñ?Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "_Ð?Ñ?Ñ?Ð°Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? HTML Ð¿Ð¾Ñ?Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð° ÐºÐ¾Ñ?Ð¸ Ð¸Ñ? Ð½Ðµ Ð¶ÐµÐ»Ðµ"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Ð£Ð¿Ð¾Ð·Ð¾Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð°Ñ?ÐµÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð±ÐµÐ· Ð½Ð°Ñ?Ð»Ð¾Ð²Ð°"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "_Ð¡Ñ?Ð¸Ð» Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "_Ð¡ÐºÑ?Ð¸Ð¿Ñ?Ð°:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "_Ð?ÐµÐ·Ð±ÐµÐ´Ð°Ð½ HTTP Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº:"
 
-#: ../mail/mail-config.ui.h:155
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "Ð¡_ÐµÑ?Ð²ÐµÑ?:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð°Ð½Ð¸Ð¼Ð°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð¾Ñ?Ð¾Ð³Ñ?Ð°Ñ?Ð¸Ñ?Ñ? Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ð° Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_Ð¡Ð°Ð¶Ð¼Ð¸ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° To / Cc / Bcc Ñ? "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+#, fuzzy
+#| msgid "Drafts _Folder:"
+msgid "_Trash Folder:"
+msgstr "_Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð?Ð°Ñ?Ñ?Ñ?Ð¸:"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ñ? Ð²ÐµÐ·Ñ?:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ñ?Ñ?Ðµ Ñ?Ð¾Ð½Ñ?Ð¾Ð²Ðµ ÐºÐ°Ð¾ Ð´Ñ?Ñ?Ð³Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð¸"
 
-#: ../mail/mail-config.ui.h:163
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../mail/mail-config.ui.h:165
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "Ð±"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "Ð±Ð¾Ñ?Ð°"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "Ð¾Ð¿Ð¸Ñ?"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Ð¡Ð²Ðµ Ð°ÐºÑ?Ð¸Ð²Ð½Ðµ Ð¼Ñ?ÐµÐ¶Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Ð¡Ð²Ðµ Ð»Ð¾ÐºÐ°Ð»Ðµ Ð¸ Ð°ÐºÑ?Ð¸Ð²Ð½Ðµ Ð¼Ñ?ÐµÐ¶Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Ð¡Ð²Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Ð?Ð¾Ð·Ð¸Ð²"
 
 # timezone.
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Ð?Ð°_Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+#| msgid "collapse"
+msgid "Collapse _all"
+msgstr "Ñ?ÐºÑ?Ð¿Ñ?Ð°"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Ð?Ð¸Ð³Ð¸Ñ?Ð°Ð»Ð½Ð¸ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
@@ -12788,58 +13321,68 @@ msgid "Do Not Forward"
 msgstr "Ð?Ðµ Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ñ?Ñ?"
 
 #: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+#| msgid "E_xpand All Threads"
+msgid "E_xpand all"
+msgstr "Ð Ð°Ð·Ð³Ñ?Ð°Ð½Ð°Ñ? Ñ?Ð²Ðµ Ñ?Ð°_Ñ?Ð¿Ñ?Ð°Ð²Ðµ"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Ð¨Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ðµ Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Ð¡Ð»ÐµÐ´Ð¸"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Ð?Ð° Ð?Ð°Ñ?Ñ? Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Ð£Ð³Ð¾Ð²Ð¾Ñ? Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ð¸"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð½ÐµÐ¾Ð¿Ñ?Ð¾Ð´Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸ Ñ?Ð²Ð¸Ð¼Ð°"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "Ð¡_ÐµÑ?Ð²ÐµÑ?:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Ð?Ð·Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "Ð?Ð´Ñ?ÐµÑ?ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12847,191 +13390,191 @@ msgstr ""
 "Ð?Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð»Ð¸ Ð·Ð° Ð¿Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ñ? Ð´Ð¾Ð»Ðµ Ð¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ð½Ðµ.\n"
 "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ñ? Ð·Ð° Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° â??Ð?Ð·Ð½Ð°ÐºÐ°â??."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ñ?"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Ð Ð¾Ðº:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Ð?Ð·Ð½Ð°ÐºÐ°:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "Ð?Ð·_Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ð³Ð¾Ð²Ð¾Ñ? Ð¾ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ð¸"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Ð?Ñ?Ð¿Ð¸Ñ?Ñ?Ñ?ÐµÐ¼ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ñ?Ñ? Ð·Ð° %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "Ð£Ð·Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð¿Ñ?Ð¸Ð¼ÐµÐ½Ð° Ð¾Ð´Ð»Ð°Ð·ÐµÑ?Ð¸Ñ? Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°: %s"
 
-#: ../mail/mail-ops.c:597
-#: ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ? %s: %s\n"
 "Ð?Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¾â??."
 
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:654
+#, fuzzy, c-format
+#| msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¾â??: %s"
 
-#: ../mail/mail-ops.c:752
-#: ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ %d Ð¾Ð´ %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð»Ð°Ñ?Ðµ %d Ð¾Ð´ %d Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/mail-ops.c:791
-#: ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "Ð?Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾."
 
-#: ../mail/mail-ops.c:793
-#: ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Ð§Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Ð?Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¾ ÐºÐ²Ð¾Ñ?Ð¸ Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¾Ñ?Ñ?Ð°Ð²Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Ð£ÐºÐ»Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ð¡Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Ð?Ñ?Ð°Ð¶Ñ?ÐµÑ?Ðµ Ð¸ Ñ?Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð° â??%sâ??"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Ð¡Ð¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð° â??%sâ??"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Ð?Ñ?Ð°Ð¶Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??%sâ??"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Ð?Ð·Ð±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð¼ÐµÑ?Ð° Ñ? â??%sâ??"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgstr[1] "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgstr[2] "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+msgstr[3] "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Ð§Ñ?Ð²Ð°Ñ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgstr[1] "Ð§Ñ?Ð²Ð°Ñ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 msgstr[2] "Ð§Ñ?Ð²Ð°Ñ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
+msgstr[3] "Ð§Ñ?Ð²Ð°Ñ?Ðµ %d Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
+#| msgid ""
+#| "Error saving messages to: %s:\n"
+#| " %s"
+msgid "Error saving messages to: %s:\n"
 msgstr ""
 "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð²Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?: %s:\n"
-" %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "Ð§Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
 
-#: ../mail/mail-ops.c:2226
-#: ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13040,390 +13583,464 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð¸Ð·Ð»Ð°Ð·Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð¿Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°: %s"
+#: ../mail/mail-ops.c:2310
+#| msgid "Could not write data: %s"
+msgid "Could not write data: "
+msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ñ?Ð¿Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°: "
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Ð?Ñ?ÐµÐºÐ¸Ð´Ð°Ñ?Ðµ Ð²ÐµÐ·Ðµ Ñ?Ð° â??%sâ??"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° â??%sâ??"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð° Ð½Ð°Ð»Ð¾Ð³ â??%sâ?? Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ñ?ÐµÑ?Ð²Ð¸Ñ?Ð°"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Ð?Ñ?ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸ _Ñ?Ð²Ðµ"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ..."
 
-#: ../mail/mail-send-recv.c:553
-#: ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "Ð§ÐµÐºÐ°Ñ?Ðµ..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ð·Ð° Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð¾ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ?."
 
-#: ../mail/mail-session.c:663
-msgid "No destination address provided, forward of the message has been cancelled."
+#: ../mail/mail-session.c:724
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð° Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð°, Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:733
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½ Ð½Ð°Ð»Ð¾Ð³ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ, Ð¿Ñ?Ð¾Ñ?Ð»ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¾Ñ?ÐºÐ°Ð·Ð°Ð½Ð¾."
 
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:128
+#, fuzzy, c-format
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð° Ð·Ð° Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ? â??%sâ??: %s"
 
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:161
+#, fuzzy, c-format
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Ð?Ð¾ÐºÑ?Ñ?Ð°Ð²Ð° Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸Ð· Ð½Ðµ-mbox Ð¸Ð·Ð²Ð¾Ñ?Ð° â??%sâ??"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:318
+#, fuzzy, c-format
+#| msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° â??%sâ??"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° â??%s: %sâ??"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° â??%sâ??"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
 msgstr "Ð£Ñ?ÐµÐ´Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1287
 msgid "New Search Folder"
 msgstr "Ð?Ð¾Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
 #: ../mail/mail.error.xml.h:1
+#, fuzzy
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð°"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "Ð?Ð·Ð²ÐµÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "Ð?Ð·Ð²ÐµÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð´Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¸Ð¼ÐµÐ½Ð° â??{0}â?? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸. Ð?Ð¾Ð´ÐµÐ»Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð½Ð°Ð·Ð¸Ð²."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð¸Ð¼ÐµÐ½Ð° â??{1}â?? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸. Ð?Ð¾Ð´ÐµÐ»Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð½Ð°Ð·Ð¸Ð²."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ñ?Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?ÐµÐ¼ Ð½Ð° â??{1}â?? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸.\n"
 "\n"
-"Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¸Ð»Ð¸ Ð´Ð° Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?, Ð¿Ñ?ÐµÐ¿Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð¸Ð»Ð¸ Ð´Ð¾Ð¿Ñ?Ð½Ð¸Ñ?Ðµ Ñ?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?, Ð¸Ð»Ð¸ Ð¸Ð·Ð°Ñ?ÐµÑ?Ðµ."
+"Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¸Ð»Ð¸ Ð´Ð° Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?, Ð¿Ñ?ÐµÐ¿Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð¸Ð»Ð¸ Ð´Ð¾Ð¿Ñ?Ð½Ð¸Ñ?Ðµ Ñ?ÐµÐ½ "
+"Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?, Ð¸Ð»Ð¸ Ð¸Ð·Ð°Ñ?ÐµÑ?Ðµ."
 
-#: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+#: ../mail/mail.error.xml.h:9
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ð° Ñ?Ðµ Ð·Ð°Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð° Ð·Ð° â??{1}â??. Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ? Ð·Ð° {0}?"
 
 # mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ? Ð½Ð°Ð·Ð²Ð°Ð½ â??{0}â?? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸. Ð?Ð°Ð²ÐµÐ´Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾ Ð¸Ð¼Ðµ."
 
-#: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
-msgstr "Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ð½Ð°Ñ?Ð»Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ð¾ Ñ?ÐµÐ¼Ñ? Ð¿Ð¸Ñ?ÐµÑ?Ðµ."
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Ð?Ð¾Ð´Ð°Ð²Ð°Ñ?ÐµÐ¼ Ñ?Ð¼Ð¸Ñ?Ð»ÐµÐ½Ð¾Ð³ Ð½Ð°Ñ?Ð»Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° Ð´Ð°Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð° Ð´Ð¾ Ð·Ð½Ð°Ñ?Ð° Ð¾ Ñ?ÐµÐ¼Ñ? "
+"Ð¿Ð¸Ñ?ÐµÑ?Ðµ."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³ Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?Ðµ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ?Ðµ?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 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?"
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³ Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐµ?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ {0} Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼?"
-
-#: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð´Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ðµ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð²Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸?"
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð´Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ðµ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð²Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸?"
 
-#: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+#: ../mail/mail.error.xml.h:16
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð´Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ðµ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ â??{0}â???"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? HTML Ð¾Ð±Ð»Ð¸ÐºÑ??"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð¾Ð¼?"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð°?"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð°Ð¼Ð¾ Ñ?Ð° BCC Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸Ð¼Ð°?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð±ÐµÐ· Ð½Ð°Ñ?Ð»Ð¾Ð²Ð°?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Ð?Ð±Ð¾Ð³ â??{0}â??."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Ð?Ð±Ð¾Ð³ â??{2}â??."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Ð?Ñ?Ð°Ð·Ð°Ð½ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??{0}â??."
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â?? Ñ? â??{1}â??."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â??."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾Ð³ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð° Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ, Ð·Ð±Ð¾Ð³ â??{1}â??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â??."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÑ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â??."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??{0}â?? Ð¿Ð¾Ñ?Ñ?Ð¾ Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â?? Ñ? â??{1}â??."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+#| msgid "Cannot open source \"{1}\""
+msgid "Cannot open source \"{1}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð²Ð¾Ñ? â??{1}â??"
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð²Ð¾Ñ? â??{2}â??."
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸Ñ? â??{2}â??."
 
-#: ../mail/mail.error.xml.h:36
-msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð»Ð¸Ñ?ÐµÐ½Ñ?Ðµ â??{0}â??, Ð·Ð±Ð¾Ð³ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ?Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð°Ñ?Ð¸Ñ?Ð¾Ð¼. Ð?ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ñ?Ð¶Ð°Ð¾Ñ?Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ñ?."
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð»Ð¸Ñ?ÐµÐ½Ñ?Ðµ â??{0}â??, Ð·Ð±Ð¾Ð³ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð° Ñ?Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð°Ñ?Ð¸Ñ?Ð¾Ð¼. "
+"Ð?ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ð¾Ð³ Ð¿Ñ?Ñ?Ð¶Ð°Ð¾Ñ?Ð° Ð´Ð¾Ðº Ð½Ðµ Ð¿Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸Ñ?Ðµ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ñ?."
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ â??{0}â?? Ñ? â??{1}â??."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÑ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?â??{0}â??."
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð° Ð½Ð° Ð½Ð°Ð»Ð¾Ð³Ñ?."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ â??{0}â??."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? â??{0}â??."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ð¿Ð¸Ñ? â??{0}â??."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð°"
-
-#: ../mail/mail.error.xml.h:44
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?. Ð?Ðµ Ð·Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ñ? Ð²ÐµÑ?Ð¸Ð½Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð° Ð±Ð¸Ñ?Ð½Ð°; Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð° Ð²ÐµÐ»Ð¸ÐºÐ° Ñ?Ð»Ð¾Ð²Ð°."
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð¾Ñ?ÐºÑ?Ñ?Ð°Ð»Ð¸ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?. Ð?Ðµ Ð·Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ñ? Ð²ÐµÑ?Ð¸Ð½Ð¸ "
+"Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð° Ð±Ð¸Ñ?Ð½Ð°; Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð° Ð²ÐµÐ»Ð¸ÐºÐ° Ñ?Ð»Ð¾Ð²Ð°."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð°."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??{0}â???"
 
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+#| msgid "Do not disable"
+msgid "Do _Not Disable"
+msgstr "Ð?ÐµÐ¼Ð¾Ñ? Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "Ð?Ðµ _Ð±Ñ?Ð¸Ñ?Ð¸"
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _Not Send"
+msgstr "Ð?Ðµ Ñ?Ð°Ñ?_Ð¸"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "Ð?Ðµ Ð±Ñ?Ð¸Ñ?Ð¸"
+#, fuzzy
+#| msgid "_Do not Synchronize"
+msgid "Do _Not Synchronize"
+msgstr "_Ð?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ñ?Ñ?Ñ?"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "Ð?ÐµÐ¼Ð¾Ñ? Ð¸Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð´Ð° Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ? Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ðµ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ "
+"Ð¼Ñ?ÐµÐ¶Ðµ?"
 
 #: ../mail/mail.error.xml.h:50
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð´Ð° Ñ?Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ? Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ðµ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ?"
-
-#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Ð?Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ?."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ? Ð´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ð¸Ñ?Ð° Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ñ?Ð¾ÐºÐ¾Ð¼ Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸, Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ð°Ð»Ð¸ Ð½Ð¸Ñ?Ðµ Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð°."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
-#: ../mail/mail.error.xml.h:60
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?, Ñ?Ð°Ð² Ñ?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?, Ñ?Ð°Ð² Ñ?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ "
+"Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/mail.error.xml.h:61
-msgid "If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:63
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?, Ñ?Ð°Ð² Ñ?ÐµÐ½ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ð?ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ñ?Ð²Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ¸ Ð½Ð°Ð»Ð¾Ð·Ð¸ Ð±Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½Ð¸."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13431,168 +14048,165 @@ msgstr ""
 "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð½Ð°Ð»Ð¾Ð³Ð° Ð¸ Ñ?Ð²Ð¸ Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?Ð¸\n"
 "Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð½Ð°Ð»Ð¾Ð³Ð° Ð±Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/mail.error.xml.h:66
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¸Ð·Ð°Ñ?ÐµÑ?Ðµ, Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð´Ð¾Ðº Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½ÐµÑ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
+#: ../mail/mail.error.xml.h:68
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¸Ð·Ð°Ñ?ÐµÑ?Ðµ, Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð´Ð¾Ðº Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½ÐµÑ?Ðµ "
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÑ?Ð½Ð¾ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ñ? Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/mail.error.xml.h:71
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "Ð?Ð½Ð¾Ð³Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¸ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð?Ð·Ð³Ð»ÐµÐ´Ð°-Ð¿Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ BCC Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¾, Ð¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð° Ð±Ð¸ Ð¸Ð·Ð±ÐµÐ³Ð»Ð¸ Ð¾Ð²Ð¾, Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð±Ð°Ñ?ÐµÐ¼ Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð?Ñ?Ð¸Ð¼Ð°: Ð¸Ð»Ð¸ CC: Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°."
+#: ../mail/mail.error.xml.h:73
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"Ð?Ð½Ð¾Ð³Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¸ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð?Ð·Ð³Ð»ÐµÐ´Ð°-Ð¿Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ "
+"BCC Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¾, Ð¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. "
+"Ð?Ð° Ð±Ð¸ Ð¸Ð·Ð±ÐµÐ³Ð»Ð¸ Ð¾Ð²Ð¾, Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð±Ð°Ñ?ÐµÐ¼ Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð?Ñ?Ð¸Ð¼Ð°: Ð¸Ð»Ð¸ CC: Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð¸ Ð½Ð¸Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÐ²Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¾Ð´Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð¼Ð¾Ð¶Ðµ Ñ?Ñ?Ð²Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³ Ð¸Ð»Ð¸ Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð´Ñ?Ñ?Ð³Ð¾Ð³ Ð½Ð°Ð»Ð¾Ð³Ð°."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð²Ð°Ð¶ÐµÑ?Ñ? ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ? Ð¿Ð¾Ñ?Ðµ Ð?Ñ?Ð¸Ð¼Ð°:. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ»Ð¸ÐºÐ¾Ð¼ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ Ð?Ñ?Ð¸Ð¼Ð°: Ð¿Ð¾Ñ?ÐµÐ´ Ð¿Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð½Ð¾Ñ?."
+#: ../mail/mail.error.xml.h:80
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð²Ð°Ð¶ÐµÑ?Ñ? ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ? Ð¿Ð¾Ñ?Ðµ Ð?Ñ?Ð¸Ð¼Ð°:. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ñ?Ð¸ "
+"ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ ÐºÐ»Ð¸ÐºÐ¾Ð¼ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ Ð?Ñ?Ð¸Ð¼Ð°: Ð¿Ð¾Ñ?ÐµÐ´ Ð¿Ð¾Ñ?Ð° Ð·Ð° Ñ?Ð½Ð¾Ñ?."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸ Ð¶ÐµÐ»Ðµ Ð¸ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ðµ HTML Ð¿Ð¾Ñ?Ñ?Ñ?:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Ð?Ð°Ñ?Ñ?Ðµ Ñ?ÐµÐ´Ð½Ð¾ Ñ?ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¾ Ð¸Ð¼Ðµ ÐºÐ¾Ñ?Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð¾Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "Ð¡Ð°Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Ð?Ñ?Ð¾Ð±Ð»ÐµÐ¼ Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ñ? Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ â??{0}â??."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? Ð·Ð° Ð»Ð¸Ñ?Ñ?Ñ? Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð½Ð¸Ñ? Ð¼ÐµÑ?Ð°Ð½Ð¸Ð·Ð°Ð¼Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð¶ÐµÐ½Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Ð?Ð°Ð¸Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â?? Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Ð?Ð°Ð¸Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? â??{0}â???"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "Ð?Ð·Ð²ÐµÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "Ð?Ð·Ð²ÐµÑ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð´Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð±Ñ?Ðµ Ð½ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾"
-
 #: ../mail/mail.error.xml.h:90
+#, fuzzy
+#| msgid "_Private"
+msgid "Reply _Privately"
+msgstr "Ð?_Ð¸Ñ?Ð½Ð¾"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ñ? Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ."
 
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr ""
+
 # bug(slobo): Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ð¸
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ?"
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
+#| msgid "Sender or Recipients"
+msgid "Send reply to all recipients?"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ð¸Ð»Ð¸ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ?"
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:95
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Ð¡Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½ÐµÐ¾Ð¿Ñ?Ð¾Ð´Ð½Ðµ Ð´Ð° Ð±Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸, Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ð¸ Ð¸Ð»Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸."
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Ð¡Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½ÐµÐ¾Ð¿Ñ?Ð¾Ð´Ð½Ðµ Ð´Ð° Ð±Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ð´Ð¸Ð»Ð° Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñ? "
+"Ð¿Ñ?ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸, Ð¿Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸Ñ?Ð¸ Ð¸Ð»Ð¸ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "Ð?Ð¾Ð½Ñ?Ð°ÐºÐ°Ñ? Ð»Ð¸Ñ?Ñ?Ð° ÐºÐ¾Ñ?Ð¾Ñ? Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ðµ Ð¿Ð¾Ð´ÐµÑ?ÐµÐ½Ð° Ð´Ð° Ñ?ÐºÑ?Ð¸Ð²Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð»Ð¸Ñ?Ñ?Ðµ.\n"
 "\n"
-"Ð?Ð½Ð¾Ð³Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¸ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð?Ð·Ð³Ð»ÐµÐ´Ð°-Ð¿Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ BCC Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¾, Ð¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ð° Ð±Ð¸ Ð¸Ð·Ð±ÐµÐ³Ð»Ð¸ Ð¾Ð²Ð¾, Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð±Ð°Ñ?ÐµÐ¼ Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð?Ñ?Ð¸Ð¼Ð°: Ð¸Ð»Ð¸ CC: Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°."
-
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Ð¡Ð»ÐµÐ´ÐµÑ?Ð°(Ðµ) Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°(Ðµ) Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ:\n"
-"{0}\n"
-"Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð´Ð° Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?:\n"
-"    â??{1}â??\n"
-"Ð? Ñ?Ð°Ð´Ð° Ñ?Ðµ(Ñ?Ñ?) Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°(Ðµ)."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ(Ð°) Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð¾(Ð°) Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°:\n"
-"{0}\n"
-"Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð´Ð° Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?:\n"
-"    â??{1}â??\n"
-"Ð? Ñ?Ð°Ð´Ð° Ñ?Ðµ(Ñ?Ñ?) Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾(Ð°)."
+"Ð?Ð½Ð¾Ð³Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¸ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð?Ð·Ð³Ð»ÐµÐ´Ð°-Ð¿Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° ÐºÐ¾Ñ?Ðµ Ð¸Ð¼Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ "
+"BCC Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ. Ð?Ð²Ð¾ Ñ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ, Ð°ÐºÐ¾ Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¾, Ð¸Ð·Ð»Ð¸Ñ?Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. "
+"Ð?Ð° Ð±Ð¸ Ð¸Ð·Ð±ÐµÐ³Ð»Ð¸ Ð¾Ð²Ð¾, Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð±Ð°Ñ?ÐµÐ¼ Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð?Ñ?Ð¸Ð¼Ð°: Ð¸Ð»Ð¸ CC: Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13600,7 +14214,7 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?ÐµÐ³ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13608,11 +14222,11 @@ msgstr ""
 "Ð?Ð¸Ñ?Ñ? Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¿Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?Ð°:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ðµ Ð¼Ð¾Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸ Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð²Ñ?Ñ?Ð½Ð°."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13620,207 +14234,267 @@ msgstr ""
 "Ð?Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ñ?Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¾ Ð´Ð¾Ð´Ð°Ñ?Ð°,\n"
 "Ð¸Ð´Ð¸Ñ?Ðµ Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð¸ Ð´Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ñ?Ðµ Ð¸Ð·Ñ?Ð¸Ñ?Ð¸Ñ?Ð¾, Ð°ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:116
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾ Ñ?Ðµ Ð¸Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½ Ð½Ð°Ð»Ð¾Ð³ Ñ?Ð° ÐºÐ¾Ñ?ÐµÐ³ Ñ?Ð°Ñ?ÐµÑ?Ðµ"
 
-#: ../mail/mail.error.xml.h:117
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:110
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾ Ð½Ð¸Ñ?Ñ?Ðµ Ð½Ð°Ð²ÐµÐ»Ð¸ Ð½Ð¸Ñ?ÐµÐ´Ð½Ð¾Ð³ Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°"
 
-#: ../mail/mail.error.xml.h:118
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "Ð?Ð²Ð°Ñ? Ñ?ÐµÑ?Ð²ÐµÑ? Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸ Ñ?Ð¸Ð¿ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ð¾Ð¿Ñ?Ñ?Ðµ Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?."
+#: ../mail/mail.error.xml.h:111
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Ð?Ð²Ð°Ñ? Ñ?ÐµÑ?Ð²ÐµÑ? Ð½Ðµ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¸ Ñ?Ð¸Ð¿ Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ð¸ Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ð¾Ð¿Ñ?Ñ?Ðµ Ð½Ðµ "
+"Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ð?Ð²Ð°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ? Ñ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÑ?ÐµÐ½, Ð°Ð»Ð¸ Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½."
 
-#: ../mail/mail.error.xml.h:120
-msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "Ð?Ð²Ð¾ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°."
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°."
+
+#: ../mail/mail.error.xml.h:114
+#, fuzzy
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Ð?Ð²Ð¾ Ð¾Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° GroupWise Ñ?ÐµÑ?Ð²ÐµÑ?."
 
-#: ../mail/mail.error.xml.h:122
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³. Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÑ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð°?"
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³. Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÑ? "
+"Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð°?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð»Ð¸Ñ?ÐµÐ½Ñ?Ðµ."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ _Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð°?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ: Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ð¼Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° Ñ?ÐµÐ½Ðµ Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸.\n"
+"Ð£Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?Ðµ: Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ð¼Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ?Ð° "
+"Ñ?ÐµÐ½Ðµ Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ðµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸.\n"
 "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¾Ð²Ð¾ Ð´Ð° Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ðµ?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this?"
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¸Ð· Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¾Ð²Ð¾ Ð´Ð° "
+"Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ðµ? "
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Ð?ÐµÐ¼Ð°Ñ?Ðµ Ð´Ð¾Ð²Ð¾Ñ?Ð½Ð° Ð¾Ð²Ð»Ð°Ñ?Ñ?ÐµÑ?Ð° Ð´Ð° Ð¾Ð±Ñ?Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "Ð?Ð¸Ñ?Ñ?Ðµ Ñ?Ð½ÐµÐ»Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Ð?Ð¼Ð°Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ, Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð¸Ð·Ð°Ñ?ÐµÑ?Ðµ?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð´Ð²Ð° Ð½Ð°Ð»Ð¾Ð³Ð° Ð¸Ñ?Ñ?Ð¾Ð³ Ð¸Ð¼ÐµÐ½Ð°."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ?Ð¸ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ Ð±Ð°Ñ? Ñ?ÐµÐ´Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? ÐºÐ°Ð¾ Ð¸Ð·Ð²Ð¾Ñ?.\n"
-"Ð?Ð¸Ð»Ð¾ Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ð½Ð°Ñ?Ð½Ð¸Ð¼ Ð¸Ð·Ð±Ð¾Ñ?Ð¾Ð¼ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, Ð¸/Ð¸Ð»Ð¸ Ð¸Ð·Ð±Ð¾Ñ?Ð¾Ð¼ Ñ?Ð²Ð¸Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, Ñ?Ð²Ð¸Ñ? Ð¼Ñ?ÐµÐ¶Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸Ð»Ð¸ Ð¸ Ñ?ÐµÐ´Ð½Ð¸Ñ? Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ñ?."
+"Ð?Ð¸Ð»Ð¾ Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ð½Ð°Ñ?Ð½Ð¸Ð¼ Ð¸Ð·Ð±Ð¾Ñ?Ð¾Ð¼ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, Ð¸/Ð¸Ð»Ð¸ Ð¸Ð·Ð±Ð¾Ñ?Ð¾Ð¼ Ñ?Ð²Ð¸Ñ? Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, "
+"Ñ?Ð²Ð¸Ñ? Ð¼Ñ?ÐµÐ¶Ð½Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸Ð»Ð¸ Ð¸ Ñ?ÐµÐ´Ð½Ð¸Ñ? Ð¸ Ð´Ñ?Ñ?Ð³Ð¸Ñ?."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ? â??{0}â?? ÐºÐ°Ð¾ â??{0}â?? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð°."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "_Ð?Ðµ Ñ?Ñ?ÐºÐ»Ð°Ñ?Ñ?Ñ?"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð·Ð½Ð¸ _Ð¡Ð¼ÐµÑ?Ðµ"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "Ð?Ð·_Ð±Ð°Ñ?Ð¸"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/message-list.c:1122
+# bug(slobo): Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð½Ð¾ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ Ð´Ð¾Ñ?Ñ?Ð°Ð²Ð¸
+#: ../mail/mail.error.xml.h:142
+#, fuzzy
+#| msgid "Send Receipt"
+msgid "_Send Receipt"
+msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð½Ð¸Ñ?Ñ?"
+
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+#| msgid "Synchronize"
+msgid "_Synchronize"
+msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "Ð?ÐµÐ²Ð¸Ñ?ÐµÐ½Ð¾"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "Ð?Ð¸Ñ?ÐµÐ½Ð¾"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?ÐµÐ½Ð¾"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÑ?ÐµÐ½Ð¾"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "Ð?Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐµ Ð½ÐµÐ²Ð¸Ñ?ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "Ð?Ð¸Ñ?ÐµÑ?Ñ?Ñ?Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "Ð?Ð°Ñ?Ð½Ð¸Ð¶Ðµ"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "Ð?Ð¸Ð¶Ðµ"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "Ð?Ð¸Ñ?Ðµ"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "Ð?Ð°Ñ?Ð²Ð¸Ñ?Ðµ"
 
-#: ../mail/message-list.c:1747
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Ð?Ð°Ð½Ð°Ñ? %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "Ð?Ñ?Ñ?Ðµ %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ñ?Ð²Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../mail/message-list.c:2588
-#: ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Ð?Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ?"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399
-#: ../mail/message-list.c:4895
+#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
 msgid "Generating message list"
 msgstr "Ð?Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../mail/message-list.c:4726
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð° Ð·Ð°Ð´Ð°Ñ?Ð¸Ð¼ Ñ?Ñ?Ð»Ð¾Ð²Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ? Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°->Ð?Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ð»Ð¸ Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸."
-
-#: ../mail/message-list.c:4728
-msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
-msgstr "Ð£ Ð¾Ð²Ð¾Ñ? Ñ?Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ Ñ?Ð»Ð¸ÐºÐµ. Ð?Ð° Ð±Ð¸ Ð¸Ñ? Ð²Ð¸Ð´ÐµÐ»Ð¸, Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¸Ñ?Ðµ Ð?Ñ?ÐµÐ³Ð»ÐµÐ´->Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ Ñ?Ð»Ð¸ÐºÐµ."
+#: ../mail/message-list.c:4633
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Ð?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð° Ð·Ð°Ð´Ð°Ñ?Ð¸Ð¼ Ñ?Ñ?Ð»Ð¾Ð²Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ? Ð¸Ð· Ð¼ÐµÐ½Ð¸Ñ?Ð° "
+"Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°->Ð?Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ð»Ð¸ Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸."
 
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4635
 msgid "There are no messages in this folder."
 msgstr "Ð?ÐµÐ¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ? Ð¾Ð²Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸."
 
@@ -13849,7 +14523,7 @@ msgid "Sent Messages"
 msgstr "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð°"
 
@@ -13858,27 +14532,27 @@ msgid "Subject - Trimmed"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² - Ñ?ÐºÑ?Ð°Ñ?ÐµÐ½Ð¾"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "Ð¢ÐµÐ»Ð¾ Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ðµ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð°Ð»Ð°Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
@@ -13887,60 +14561,95 @@ msgid "Subject or Addresses contains"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² Ð¸Ð»Ð¸ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ðµ"
 
 #: ../modules/addressbook/addressbook-config.c:206
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "Ð?Ð´Ð°Ð±Ð¸Ñ? Ð¾Ð²Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð°Ð¼Ð¾ Ð°ÐºÐ¾ Ð¾Ð½ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° SSL Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Ð?Ð´Ð°Ð±Ð¸Ñ? Ð¾Ð²Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð°Ð¼Ð¾ "
+"Ð°ÐºÐ¾ Ð¾Ð½ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° SSL Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ."
 
 #: ../modules/addressbook/addressbook-config.c:208
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "Ð?Ð´Ð°Ð±Ð¸Ñ? Ð¾Ð²Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð°Ð¼Ð¾ Ð°ÐºÐ¾ Ð¾Ð½ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° TLS Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Ð?Ð´Ð°Ð±Ð¸Ñ? Ð¾Ð²Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ·Ð°Ñ?Ð¸ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ? Ñ?Ð°Ð¼Ð¾ "
+"Ð°ÐºÐ¾ Ð¾Ð½ Ð¿Ð¾Ð´Ñ?Ð¶Ð°Ð²Ð° TLS Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ."
 
 #: ../modules/addressbook/addressbook-config.c:210
-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 Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ. Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ð?Ð°Ñ?Ð° Ð²ÐµÐ·Ð° Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð° Ð¸ Ð´Ð° Ñ?ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ð¸Ð²Ð¸ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ðµ Ð½Ð°Ð¿Ð°Ð´Ðµ. "
-
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+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 Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ. "
+"Ð¢Ð¾ Ð·Ð½Ð°Ñ?Ð¸ Ð´Ð° Ð?Ð°Ñ?Ð° Ð²ÐµÐ·Ð° Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð° Ð¸ Ð´Ð° Ñ?ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ð¸Ð²Ð¸ Ð½Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ð½Ðµ "
+"Ð½Ð°Ð¿Ð°Ð´Ðµ. "
+
+#: ../modules/addressbook/addressbook-config.c:602
+#, fuzzy
+#| msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? _Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½Ð¸ Ð¸ Ð³Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? _ÐºÑ?Ð¸Ð³Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../modules/addressbook/addressbook-config.c:736
-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 Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶Ðµ. Ð?Ð¾Ð½Ñ?Ñ?ÐµÐ½ Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð°. Ð?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ? Ð´Ð° Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ."
+#: ../modules/addressbook/addressbook-config.c:746
+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 Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶Ðµ. Ð?Ð¾Ð½Ñ?Ñ?ÐµÐ½ "
+"Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ð²Ð°. Ð?Ð¸Ñ?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð° ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ? Ð´Ð° "
+"Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ."
 
-#: ../modules/addressbook/addressbook-config.c:810
-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 "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð¼ÐµÑ?Ð¾Ð´ Ð·Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?.  Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?ÐµÐ³Ð¾Ð²Ð¾ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° â??Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°â?? Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¸ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?."
+#: ../modules/addressbook/addressbook-config.c:820
+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 ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð¼ÐµÑ?Ð¾Ð´ Ð·Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?.  Ð?Ñ?Ð¸Ð¼ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?ÐµÐ³Ð¾Ð²Ð¾ "
+"Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° â??Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°â?? Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¸ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿ Ð½Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?."
 
-#: ../modules/addressbook/addressbook-config.c:885
-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 "Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ðµ Ð´Ñ?Ð±Ð¸Ð½Ñ? ÐºÐ¾Ñ?Ð¾Ð¼ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð¾Ð±Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ð±Ð»Ð¾ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°. Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??Ð¿Ð¾Ð´â?? Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ñ?Ð½Ð¾Ñ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð´ Ð±Ð°Ð·Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?. Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??Ñ?ÐµÐ´Ð°Ð½â?? Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ?Ð½Ð¾Ñ?Ðµ Ñ?ÐµÐ´Ð°Ð½ Ð½Ð¸Ð²Ð¾ Ð¸Ñ?Ð¿Ð¾Ð´ Ð?Ð°Ñ?Ðµ Ð±Ð°Ð·Ðµ."
+#: ../modules/addressbook/addressbook-config.c:895
+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 ""
+"Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ðµ Ð´Ñ?Ð±Ð¸Ð½Ñ? ÐºÐ¾Ñ?Ð¾Ð¼ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð¾Ð±Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ð±Ð»Ð¾ "
+"Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°. Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??Ð¿Ð¾Ð´â?? Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ñ?Ð½Ð¾Ñ?Ðµ Ð¸Ñ?Ð¿Ð¾Ð´ Ð±Ð°Ð·Ðµ Ð·Ð° "
+"Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?. Ð?Ð±Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ â??Ñ?ÐµÐ´Ð°Ð½â?? Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ Ñ?Ð½Ð¾Ñ?Ðµ Ñ?ÐµÐ´Ð°Ð½ Ð½Ð¸Ð²Ð¾ Ð¸Ñ?Ð¿Ð¾Ð´ Ð?Ð°Ñ?Ðµ "
+"Ð±Ð°Ð·Ðµ."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð¸"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Ð?Ð¾Ð²Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
@@ -13985,12 +14694,23 @@ msgid "Show preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ð²Ñ?Ñ? Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
-msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°. â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ð²Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°. â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ñ?Ð°Ð·Ð¼ÐµÑ?Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð»Ð¾Ð¶Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ? Ð¾Ð´Ð½Ð¾Ñ?Ñ? Ð½Ð° Ñ?Ð¿Ð¸Ñ?Ð°Ðº ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°. "
+"â??0â?? (ÐºÐ»Ð°Ñ?Ð¸Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¾Ð²Ñ? Ð¿Ð¾Ð²Ñ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°. "
+"â??1â?? (Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´) Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð°."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "Ð?Ñ?Ð¾Ñ? Ð·Ð½Ð°ÐºÐ¾Ð²Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð¼Ð¾Ñ?Ð°Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ð½Ð¸."
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Ð?Ñ?Ð¾Ñ? Ð·Ð½Ð°ÐºÐ¾Ð²Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð¼Ð¾Ñ?Ð°Ñ?Ñ? Ñ?ÐºÑ?Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð° Ð´Ð° "
+"Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ð½Ð¸."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
@@ -14001,412 +14721,321 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ð·Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?ÐµÑ?Ñ? Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ? Ð¸Ð¼ÐµÐ½Ð°."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ? Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ð° Ð¸Ð¼ÐµÐ½Ð¾Ð¼ Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°."
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ? Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð±Ð°Ð²ÐµÐ·Ð½Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð¶Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ñ?Ð° Ð¸Ð¼ÐµÐ½Ð¾Ð¼ Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?ÐµÐ½Ð¾Ð³ "
+"ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
 msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ð²Ñ?Ñ? Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° Ñ?Ð°Ð±ÐµÐ»Ðµ:"
-
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/mail/em-mailer-prefs.c:1165
+msgid "_Table column:"
+msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° _Ñ?Ð°Ð±ÐµÐ»Ðµ:"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "Ð¡Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "Ð£Ð²ÐµÐº _Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ? Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?ÐµÐ½Ð¾Ð³ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "Ð?Ð° LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸Ð¼Ð°"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸_Ñ?Ñ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Ð?Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Ð ÐµÐ³Ð¸Ñ?Ñ?Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð½ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ñ?"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ð°Ð¼Ð¾Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð?Ñ?Ñ?Ð°Ñ?Ð° Ð¸ Ñ?Ð¸Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ñ?Ðµ Ð¾Ð´ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ 1.x.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ð¸Ñ? Ð»Ð¸Ñ?Ñ?Ð° Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð?Ð°Ñ?Ð¸Ð½ Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð¼ÐµÑ?Ñ?Ð° Ð½ÐµÐºÐµ Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ñ?ÐµÐ»ÐµÑ?Ð¾Ð½Ð° Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Ð?Ð½ÐµÐ²Ð½Ð¸Ðº Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð° Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¼Ð°Ð¿Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Palm Sync Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ?Ð° Pilot Sync Ñ?Ñ?ÐµÑ?Ð°Ñ?Ð°..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¾Ð³ Ð¸Ð·Ð±Ð¾Ñ?Ð½Ð¸ÐºÐ°"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Ð?Ð²Ð°Ñ? Ð²Ð¸Ñ?ÐµÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð³Ñ?Ñ?Ð¿Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
+#: ../modules/addressbook/e-book-shell-backend.c:312
+msgid "Certificates"
+msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ Ð²Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ _Ñ?Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ? Ð´Ñ?Ñ?Ð³Ð¸"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "Ð?_Ð±Ñ?Ð¸Ñ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ _Ñ?Ð²Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° Ñ? Ð´Ñ?Ñ?Ð³Ð¸"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Ð?Ð¾Ð²Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°_Ñ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð²Ð¾Ñ?Ñ?Ñ?Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "_Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? ÐºÐ°Ð¾ Ð?Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð° ÐºÐ°Ð¾ Ð?Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Ð?Ñ?ÐµÐºÐ¸Ð½Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ð´Ñ?Ñ?Ð³Ð¾Ñ? Ð¾Ñ?Ð¾Ð±Ð¸"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ Ñ? Ð´Ñ?Ñ?Ð³Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "Ð?Ð¾Ð²Ð¸ ÐºÐ¾Ð½_Ñ?Ð°ÐºÑ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "Ð?Ð¾Ð²Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? _Ñ?Ð¿Ð¸Ñ?Ð°Ðº..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?ÐµÐºÑ?Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_Ð Ð°Ð´Ñ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "_Ð?Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "Ð?_Ñ?Ð¾Ð±Ð¸Ð½Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ Ð²Ð?Ð°Ñ?Ñ?Ñ?..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "_Ð?Ð»Ð°Ñ?Ð¸Ñ?Ð½Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð·"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð¸Ñ?Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "_Ð£Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð¿Ð¾Ñ?ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Ð?Ð¸Ð»Ð¾ ÐºÐ¾Ñ?Ð° ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Ð?Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ñ?Ð²Ðµ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð° Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Ð§Ñ?Ð²Ð° ÐºÐ°Ð¾ Ð²Ð?Ð°Ñ?Ñ?Ñ?..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ ÐºÐ°Ð¾ Ð?Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ¾Ð½Ñ?_Ð°ÐºÑ?Ðµ"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð»Ðµ_Ð´Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð°"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½Ð° Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ñ?"
 
@@ -14430,110 +15059,105 @@ msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ?"
 msgid "Contact information for %s"
 msgstr "Ð?Ð¾Ð½Ñ?Ð°ÐºÑ? Ð¿Ð¾Ð´Ð°Ñ?Ð¸ Ð·Ð° %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Ð?Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´Ð° Ð¾Ð²Ð°Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð´Ð¾Ðº Ñ?Ðµ Ð½Ðµ Ð´Ð¾Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð»Ð¸Ð¼Ð¸Ñ?"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Ð?Ñ?Ð¸_Ñ?Ð°Ð²Ð°:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Ð?ÐµÐ´Ð°Ð½"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Ð?Ñ?Ð¾Ð¿Ñ?Ñ?Ð½Ð¸Ðº Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð° Ð·Ð° _Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "Ð?_Ñ?Ð¾Ð¿Ñ?Ñ?Ð½Ð¸Ðº Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "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 "Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ðµ Ð²Ñ?Ñ?Ñ?Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ñ?Ñ?Ð°Ð³Ð°. Ð?ÐºÐ¾ Ñ?Ðµ Ð¾Ð²Ð¾ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸, Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ð°Ð²Ñ?ÐµÐ½Ð° Ð½Ð° Ð²Ñ?Ñ?Ñ?Ð¸ â??Ð¾Ñ?Ð¾Ð±Ð°â??."
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid ""
+"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 ""
+"Ð¤Ð¸Ð»Ñ?ÐµÑ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ñ?Ðµ Ð²Ñ?Ñ?Ñ?Ð° Ð¾Ð±Ñ?ÐµÐºÑ?Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ð¼ Ñ?Ðµ Ñ?Ñ?Ð°Ð³Ð°. Ð?ÐºÐ¾ Ñ?Ðµ Ð¾Ð²Ð¾ Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸, "
+"Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¾Ð±Ð°Ð²Ñ?ÐµÐ½Ð° Ð½Ð° Ð²Ñ?Ñ?Ñ?Ð¸ â??Ð¾Ñ?Ð¾Ð±Ð°â??."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Ð?Ð¾Ð´"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "Ð?Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ð±Ð°Ð·Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?ÐµÐ±Ð½Ð¾ Ð¸Ð¼Ðµ (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "Ð?Ð³Ñ?Ð°Ð½Ð¸Ñ?ÐµÑ?Ðµ Ð·Ð° _Ð¿Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð°Ñ?Ðµ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_Ð?Ð°Ñ?Ð¸ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð±Ð°Ð·Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "Ð?ÐµÑ?Ð¾Ð´ _Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ðµ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Ð?Ð¾Ñ?Ñ?:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Ð?Ð±Ð¸Ð¼ Ð¿_Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Ð Ð¾Ðº:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ñ? Ð²ÐµÐ·Ñ?:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "ÐºÐ°Ñ?Ñ?Ðµ"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "Ð£_Ð²ÐµÐ·Ð¸"
 
@@ -14554,98 +15178,71 @@ msgid "I_mport to Tasks"
 msgstr "Ð£_Ð²ÐµÐ·Ð¸ Ñ? Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Ð?Ð° Ð²ÐµÐ±Ñ?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "Ð Ð¾Ñ?ÐµÐ½Ð´Ð°Ð½Ð¸ Ð¸ Ð³Ð¾Ð´Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Ð¦ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¾ Ð·Ð°_ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¾ Ñ?ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Ð¡_Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ñ?Ñ?ÐµÐ² Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ¾Ð¼"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Ð?Ð°Ð»Ðµ_Ð½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Ð ÐµÐ³Ð¸Ñ?Ñ?Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¾ Ð¸ Ñ?Ð¸Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð¾Ð´ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ 1.Ñ?.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¸Ð· evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° â??%sâ??"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14654,36 +15251,22 @@ msgstr ""
 "Ð?Ñ?ÐµÑ?ÐºÐ° Ð½Ð° %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:237
 msgid "Loading calendars"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#, fuzzy
+#| msgid "_New Calendar"
+msgid "_New Calendar..."
+msgstr "Ð?Ð¾Ð²Ð¸ _ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:681
 msgid "Calendar Selector"
 msgstr "Ð?Ð·Ð±Ð¾Ñ?Ð½Ð¸Ðº ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ð½Ð°Ð²Ð¸Ð³Ð°Ñ?Ð¾Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ñ?Ð¼"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Ð?Ð²Ð°Ñ? Ð²Ð¸Ñ?ÐµÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¼Ð¸Ð½Ð¸Ñ?Ð°Ñ?Ñ?Ñ?Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° Ñ?Ð°Ð´ Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¾Ð¼"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Ð?Ð²Ð°Ñ? Ð²Ð¸Ñ?ÐµÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð³Ñ?Ñ?Ð¿Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð½Ð° %s"
@@ -14694,8 +15277,13 @@ msgid "Print"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ?"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
-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 events."
-msgstr "Ð?Ð²Ð° Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð° Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ñ?Ð¾ÐºÐ°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ."
+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 "
+"events."
+msgstr ""
+"Ð?Ð²Ð° Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð° Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ð¿Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾Ð³ Ñ?Ð¾ÐºÐ°. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ "
+"Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -14707,298 +15295,298 @@ msgstr "Ð?Ð·Ð±Ð°Ñ?Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð´"
 msgid "Copying Items"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ð²ÐºÐ¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ð²ÐºÐ¸"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "Ð?Ð±_Ñ?Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "Ð?Ð´Ð¸ Ð½Ð°Ð·Ð°Ð´"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "Ð?Ð´Ð¸ Ð½Ð°Ð¿Ñ?ÐµÐ´"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ _Ð´Ð°Ð½Ð°Ñ?Ñ?Ð¸ Ð´Ð°Ð½"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð´Ð°Ð½Ð°Ñ?Ñ?Ð¸ Ð´Ð°Ð½"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ _Ð´Ð°Ñ?Ñ?Ð¼"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Ð?Ð¸Ñ?Ð° Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ð¸ Ð´Ð°Ñ?Ñ?Ð¼"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "Ð?Ð¾Ð²Ð¸ _ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "Ð?Ð·Ð±Ð°_Ñ?Ð¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Ð?Ð·Ð±Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð° Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐµ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "Ð?_Ñ?Ð²ÐµÐ¶Ð¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð°Ð¼Ð¾ Ð¾Ð²Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Ð?ÐµÐ»ÐµÐ³Ð¸Ñ?Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¾Ð²Ñ? _Ð¿Ð¾Ñ?Ð°Ð²Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ð°Ð²Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾_Ñ?Ð°Ð²Ðµ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ðµ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Ð?Ð¾Ð²Ð¸ Ñ?ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¸ _Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "_Ð?Ñ?Ð¾Ñ?Ð»ÐµÐ´Ð¸ ÐºÐ°Ð¾ Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Ð?Ð¾Ð²Ð¸ _Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "Ð?Ñ?ÐµÐ½_ÐµÑ?Ð¸ Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Ð?Ð¾Ð²Ð¾ _Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Ð?ÐµÐºÐ° Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ð°Ð²Ð° Ð±Ñ?Ð´Ðµ _Ð¿Ð¾ÐºÑ?ÐµÑ?Ð½Ð°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ñ?ÐµÐºÑ?Ñ?Ðµ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "Ð?_Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_Ð?Ð°ÐºÐ°Ð¶Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Ð?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¸ Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾ Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "Ð?Ñ?Ðµ_Ñ?Ð²Ð¾Ñ?Ð¸ Ñ? Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "Ð?Ñ?ÐµÑ?Ð²Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ñ? Ð·Ð°ÐºÐ°Ð·Ð°Ð½Ð¾"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "Ð?Ð·Ð°Ñ?Ð¸"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Ð?Ð°Ð½"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?ÐµÐ´Ð°Ð½ Ð´Ð°Ð½"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ ÐºÐ°Ð¾ Ñ?Ð¿Ð¸Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "Ð?ÐµÑ?ÐµÑ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?ÐµÐ´Ð°Ð½ Ð¼ÐµÑ?ÐµÑ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Ð?ÐµÐ´ÐµÑ?Ð°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?ÐµÐ´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?ÐµÐ´Ð½Ñ? Ñ?Ð°Ð´Ð½Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Ð?ÐºÑ?Ð¸Ð²Ð½Ð° Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð°Ð½Ð¾ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Ð?Ð¿Ð¸Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "Ð¡Ð°Ð¶ÐµÑ?Ð°Ðº Ñ?Ð°Ð´Ñ?Ð¶Ð¸"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð° Ð¾Ð²Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "Ð?Ð´Ð¸ Ð½Ð°"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "Ð±ÐµÐ»ÐµÑ?ÐºÐ°"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "Ð?Ð¾Ð²Ð° _Ð±ÐµÐ»ÐµÑ?ÐºÐ°"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "Ð?Ð°Ð¿Ð¸Ñ?Ð¸ Ñ?ÐµÐ´Ð½Ñ? Ð½Ð¾Ð²Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Ð?Ð¾Ð³Ð»ÐµÐ´Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ _Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ?"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
@@ -15007,22 +15595,22 @@ msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Ð?Ð¾Ð´ÐµÐ»Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ"
 
@@ -15031,96 +15619,76 @@ msgid "_Mark as Incomplete"
 msgstr "_Ð?Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð½ÐµÐ·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "Ð?Ð±ÐµÐ»ÐµÐ¶Ð°Ð²Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð½ÐµÐ·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Ð?Ð¾Ð²Ð¸ Ð·Ð°Ð´_Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Ð?ÐµÐ»ÐµÑ?Ðº_Ð°"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Ð?ÐµÑ?ÐµÐ½Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐ°"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñ? Ð´ÐµÑ?ÐµÐ½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Ð¡Ð¿Ð¸_Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Ð ÐµÐ³Ð¸Ñ?Ñ?Ð°Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ñ?Ð°Ð±ÐµÐ»Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:231
 msgid "Loading memos"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:603
 msgid "Memo List Selector"
 msgstr "Ð?Ð·Ð±Ð¾Ñ?Ð½Ð¸Ðº Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° Ñ?Ð°Ð´Ñ?Ðµ Ñ?Ð° Ð±ÐµÐ»ÐµÑ?ÐºÐ°Ð¼Ð°"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Ð?Ð²Ð°Ñ? Ð²Ð¸Ñ?ÐµÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð³Ñ?Ñ?Ð¿Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:908
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ñ?Ð° %s Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
@@ -15130,63 +15698,63 @@ msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ñ?Ð° %s Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
 msgid "Print Memos"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "Ð?_Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ? Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "Ð?Ð±_Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "_Ð?Ð¾Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð°Ð¼Ð¾ Ð¾Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "_Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð·Ð° Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
@@ -15197,6 +15765,7 @@ msgid_plural "%d memos"
 msgstr[0] "%d Ð±ÐµÐ»ÐµÑ?ÐºÐ°"
 msgstr[1] "%d Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 msgstr[2] "%d Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
+msgstr[3] "%d Ð±ÐµÐ»ÐµÑ?ÐºÐ°"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:420
 #: ../modules/calendar/e-task-shell-view-private.c:569
@@ -15212,76 +15781,40 @@ msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÐµ"
 msgid "Delete Memo"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "_Ð?Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Ð?Ð¾Ð´ÐµÑ?ÐµÐ½_Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "Ð?Ð¾Ð´ÐµÐ»Ð¸ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°_Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Ð ÐµÐ³Ð¸Ñ?Ñ?Ð°Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ñ?Ð°Ð±ÐµÐ»Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Ð?ÐµÑ?Ñ?Ð¾ Ð¸ Ñ?Ð¸Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð·Ð°Ð´Ñ?Ð¶ÐµÑ?Ð° Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ðµ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð¾Ð´ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ 1.Ñ?.\n"
-"\n"
-"Ð?Ñ?Ð´Ð¸Ñ?Ðµ Ñ?Ñ?Ñ?Ð¿Ñ?Ð¸Ð²Ð¸ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ½Ð¾Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ? Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð·Ð°Ð´Ñ?Ð¶ÐµÑ?Ð° â??%sâ??"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:231
 msgid "Loading tasks"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:603
 msgid "Task List Selector"
 msgstr "Ð?Ð·Ð±Ð¾Ñ?Ð½Ð¸Ðº Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° Ñ?Ð°Ð´Ñ?Ðµ Ñ?Ð° Ð·Ð°Ð´Ð°Ñ?Ð¸Ð¼Ð°"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Ð?Ð²Ð°Ñ? Ð²Ð¸Ñ?ÐµÑ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð³Ñ?Ñ?Ð¿Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:908
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? %s"
@@ -15291,105 +15824,107 @@ msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ? %s"
 msgid "Print Tasks"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ð?Ð²Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¾Ð±ÐµÐ»ÐµÐ¶ÐµÐ½Ðµ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ. Ð?ÐºÐ¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ.\n"
+"Ð?Ð²Ð° Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¾Ð±ÐµÐ»ÐµÐ¶ÐµÐ½Ðµ ÐºÐ°Ð¾ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ. Ð?ÐºÐ¾ "
+"Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ.\n"
 "\n"
 "Ð?Ð°Ð¸Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¾Ð²Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ñ? Ð·Ð°Ð´Ð°Ñ?ÐºÑ?..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ? Ñ? Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾Ð¼ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "Ð?_Ð±Ñ?Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "Ð?Ð¾_Ð²Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Ð?Ñ?ÐµÐ¸Ð¼ÐµÐ½Ñ?Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð°Ð¼Ð¾ Ð¾Ð²Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "Ð?_Ð·Ð½Ð°Ñ?Ð¸ ÐºÐ°Ð¾ Ð½ÐµÐ·Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð·Ð°Ð²Ñ?Ñ?ÐµÐ½Ðµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð°_Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Ð?ÐºÑ?Ð¸Ð²Ð½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð½ÐµÐ´ÐµÑ?Ñ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "Ð?Ñ?ÐµÐºÐ¾Ñ?Ð°Ñ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð¸"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Ð?Ð°Ð´Ð°Ñ?Ð¸ Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸Ð¼Ð°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Ð¨Ñ?Ð°Ð¼Ð¿Ð°Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
 
@@ -15404,6 +15939,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 msgstr[1] "%d Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 msgstr[2] "%d Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
+msgstr[3] "%d Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
@@ -15414,7 +15950,7 @@ msgid "Delete Task"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
@@ -15426,7 +15962,7 @@ msgstr "%d Ð¿Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 # is not permitted.
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
@@ -15449,148 +15985,140 @@ msgstr "_Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?"
 msgid "Create a new mail folder"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Mail Accounts"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð½Ñ?ÐºÐ¸ Ð½Ð°Ð»Ð¾Ð·Ð¸"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:486
 msgid "Mail Preferences"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Composer Preferences"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Network Preferences"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "Ð?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¿Ð¾ Ñ?ÐµÐ¼Ð°Ð¼Ð°"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð³Ñ?Ñ?Ð¿Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ð¾ Ñ?ÐµÐ¼Ð°Ð¼Ð°"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:870
 msgid "_Disable Account"
 msgstr "_Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸ Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Ð¢Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ð½Ð¸ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ñ?Ð²Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¤Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð¸Ð· Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "_Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Ð?Ñ?ÐµÑ?Ð·Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð·Ð° Ð½Ð°Ð»Ð¾Ð³Ðµ Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ? Ð¾Ð·Ð½Ð°Ñ?ÐµÐ½Ðµ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "Ð?Ñ?_Ð¿Ñ?Ð°Ð·Ð½Ð¸ Ð?Ð° Ñ?Ð»Ð°Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð´Ñ?Ñ?Ð³Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "Ð¢Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ð½Ð¸ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "Ð?Ð·Ð±Ð°_Ñ?Ð¸"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Ð¢Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ð½Ð¸ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾_Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "_Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ? Ð´Ñ?Ñ?Ð³Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "_Ð?Ð¾Ð²Ð¾..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ñ?Ð¼ÐµÑ?Ñ?Ð°Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð¾Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "Ð?Ñ?Ð¾Ð¼ÐµÐ½Ð¸ Ð¸Ð¼Ðµ Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ðµ ÐºÐ°Ð¾ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "Ð?Ð¸Ñ?Ð° Ð¿_Ð¾Ð´Ð½Ð¸Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° Ñ?Ð²Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ðµ Ð½Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "_Ð?Ð´Ñ?Ð°Ð²Ð¸ Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ñ?Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "Ð?Ð·Ð±Ð°Ñ?Ð¸ _Ñ?Ð¼ÐµÑ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Ð¢Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ð½Ð¸ Ñ?Ð²Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð° Ñ?Ð²Ð¸Ñ? Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "_Ð?Ð¾Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÐ°"
 
@@ -15599,333 +16127,345 @@ msgstr "_Ð?Ð¾Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÐ°"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "Ð?_Ð¸Ñ?Ñ?Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¿Ñ?Ð¾_Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Ð?Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?Ð°ÐºÑ?Ð¸Ñ? Ñ?Ð²Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¸_Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Ð?Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?Ð°ÐºÑ?Ð¸Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Ð?Ñ?Ð¸_ÐºÐ°Ð¶Ð¸ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ñ?Ñ? Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ð¾ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ? Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ð¼"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "Ð¡ÐºÑ?Ð¿Ð¸ Ñ?Ð²Ðµ _Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "Ð¡ÐºÑ?Ð¿Ð¸ Ñ?ÐµÐ»Ð¾ÐºÑ?Ð¿Ð½Ð¾ Ð³Ñ?Ð°Ð½Ð°Ñ?Ðµ Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "Ð Ð°Ð·Ð³Ñ?Ð°Ð½Ð°Ñ? Ñ?Ð²Ðµ Ñ?Ð°_Ñ?Ð¿Ñ?Ð°Ð²Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "Ð Ð°Ð·Ð³Ñ?Ð°Ð½Ð°Ñ? Ñ?Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð¼Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "Ð¤_Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð·Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¸Ð»Ð¸ Ñ?Ñ?ÐµÐ´Ð¸ Ð¿Ñ?Ð°Ð²Ð¸Ð»Ð° Ð·Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "Ð¤Ð°Ñ?_Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¸Ð»Ð¸ Ñ?Ñ?ÐµÐ´Ð¸ Ð´ÐµÑ?Ð¸Ð½Ð¸Ñ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "_Ð?Ñ?Ð¸Ñ?Ð°Ð²Ðµ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ð¸Ð»Ð¸ Ð¾Ð´Ñ?Ð°Ð²Ð¸ Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¸Ð¼ Ñ?ÐµÑ?Ð²ÐµÑ?Ð¸Ð¼Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "Ð¤Ð°Ñ?_Ñ?Ð¸ÐºÐ»Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "_Ð?Ð·Ð½Ð°ÐºÐ°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "_Ð?Ð¾Ð²Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? _Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð¸Ñ?Ð¾Ð²Ð¾Ð³ Ð¿Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°_Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#| msgid "Show deleted messages"
+msgid "Show _Deleted Messages"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾_Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ (ÐºÐ°Ð¾ Ð¿Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ðµ) Ñ? Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "Ð?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¿Ð¾ Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð¼Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð¾ Ñ?ÐµÐ¼Ð°Ð¼Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ñ?Ð¿Ð¾Ð´ Ð»Ð¸Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ð¾Ñ?ÐµÐ´ Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "Ð¡Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "Ð?Ð°Ð¶Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð·Ð°Ð´Ñ?Ð¸Ñ? 5 Ð´Ð°Ð½Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð·Ð¸Ð¼Ð°"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "Ð?ÐµÐ· Ð¾Ð·Ð½Ð°ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "Ð¡ÐºÐ¾Ñ?Ð°Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "Ð?ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² Ð¸Ð»Ð¸ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ðµ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "Ñ?Ð²Ð¸Ð¼ Ð½Ð°Ð»Ð¾Ð·Ð¸Ð¼Ð°"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼ Ð½Ð°Ð»Ð¾Ð³Ñ?"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "Ñ?ÐµÐºÑ?Ñ?Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:936
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð°,"
 msgstr[1] "%d Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ,"
 msgstr[2] "%d Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸Ñ?,"
+msgstr[3] "%d Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð°,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:947
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¾"
+msgstr[0] "%d Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð°"
 msgstr[1] "%d Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 msgstr[2] "%d Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ?"
+msgstr[3] "%d Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð°"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d Ñ?Ñ?Ð±Ñ?Ðµ"
 msgstr[1] "%d Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
 msgstr[2] "%d Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°"
+msgstr[3] "%d Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:966
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d Ð½Ð°Ñ?Ñ?Ñ?"
 msgstr[1] "%d Ð½Ð°Ñ?Ñ?Ñ?Ð°"
 msgstr[2] "%d Ð½Ð°Ñ?Ñ?Ñ?Ð°"
+msgstr[3] "%d Ð½Ð°Ñ?Ñ?Ñ?"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] "%d Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ð¾"
+msgstr[0] "%d Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 msgstr[1] "%d Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ"
 msgstr[2] "%d Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸Ñ?"
+msgstr[3] "%d Ð½ÐµÐ¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "%d Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¾"
+msgstr[0] "%d Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 msgstr[1] "%d Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ðµ"
 msgstr[2] "%d Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸Ñ?"
+msgstr[3] "%d Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°,"
 msgstr[1] "%d Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ,"
 msgstr[2] "%d Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð¸Ñ?,"
+msgstr[3] "%d Ð½ÐµÐ¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ð°,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d Ñ?ÐºÑ?Ð¿Ð½Ð¾"
 msgstr[1] "%d Ñ?ÐºÑ?Ð¿Ð½Ð¾"
 msgstr[2] "%d Ñ?ÐºÑ?Ð¿Ð½Ð¾"
+msgstr[3] "%d Ñ?ÐºÑ?Ð¿Ð½Ð¾"
 
 #: ../modules/mail/e-mail-shell-view.c:548
 msgid "All Account Search"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ñ?Ð²Ð¸Ñ? Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ð° Ð½Ð°Ð»Ð¾Ð³Ð°"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:868
 msgid "Proxy _Logout"
 msgstr "_Ð?Ð´Ñ?Ð°Ð²Ð° Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:130
+msgid "Evolution Account Assistant"
+msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð½Ð°Ð»Ð¾Ð³Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
+
+#: ../modules/mail/em-account-prefs.c:179
+msgid "Account Editor"
+msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð½Ð°Ð»Ð¾Ð³Ð°"
+
+# has "activatable" set.
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½Ð¾"
+
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Ð?ÐµÐ·Ð¸Ðº(Ñ?Ð¸)"
 
 # bug: requires a comment on usage
 # Ñ?Ð»Ð¸Ñ?Ð½Ð¾ ÐºÐ°Ð¾ Ð·Ð° Ð¼ÐµÑ?ÐµÑ?Ðµ Ð¸ Ð½ÐµÐ´ÐµÑ?Ðµ
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "Ñ?Ð²Ð°ÐºÐ¸ Ð¿Ñ?Ñ?"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð´Ð½ÐµÐ²Ð½Ð¾"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð½ÐµÐ´ÐµÑ?Ð½Ð¾"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ð¼ÐµÑ?ÐµÑ?Ð½Ð¾"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð·Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "Ð?Ð°Ð·Ð¸Ð² Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð¸:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "Ð¡Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722
-#: ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ñ?Ðµ %s Ð´Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¸ Ð±Ð¸Ð½Ð°Ñ?Ð½Ð¸ Ð¾Ð±Ð»Ð¸Ðº Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730
-#: ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, 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 Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½. Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð°ÐºÐµÑ? Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "Ð?ÐµÐ¼Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾Ð³ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?ÐºÐ° Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° _Ñ?Ð°Ð±ÐµÐ»Ðµ:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ _Ð´Ð°Ñ?Ñ?Ð¼Ð°:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»Ð½Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Ð¡Ð²Ð°ÐºÐ¸ Ð¿Ñ?Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ "
+"Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#, fuzzy
+#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ñ?Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸Ð¼ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð¾Ð¼ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¾ Python"
@@ -15942,6 +16482,53 @@ msgstr "Ð¢ÐµÑ?Ñ? Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "Ð?Ð¾ÐºÑ?ÐµÑ?Ð°Ñ? Ñ?ÐµÑ?Ñ? Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?ÐºÐ° Ð·Ð° Python EPlugin."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:393
+msgid "Please select the information that you would like to import:"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:549
+#, c-format
+msgid "From %s:"
+msgstr "Ð?Ð´ %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#, fuzzy
+#| msgid "Importing files"
+msgid "Importing Files"
+msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð´Ð¾Ñ?Ð»Ð¸"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Ð?Ð¾Ð±Ñ?Ð¾ Ð´Ð¾Ñ?Ð»Ð¸ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?. Ð?ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?ÐµÐ´Ð½Ð¸Ñ? ÐµÐºÑ?Ð°Ð½Ð° Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ñ?Ðµ "
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ¶Ðµ Ð½Ð° Ð½Ð°Ð»Ð¾Ð³Ðµ ÐµÐ»ÐµÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð´Ð° Ñ?Ð²ÐµÐ·Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸Ð· Ð´Ñ?Ñ?Ð³Ð¸Ñ? "
+"Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°. \n"
+"\n"
+"Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ â??Ð?Ð°Ð¿Ñ?ÐµÐ´â?? Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
@@ -15951,21 +16538,25 @@ msgid "Local Address Books"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¸"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð·Ð° Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ñ?Ñ?Ð°Ð³Ð°Ñ?Ð¸ Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "List of clues for the attachment reminder plugin to look for in a message body."
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð·Ð° Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ñ?Ñ?Ð°Ð³Ð°Ñ?Ð¸ Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ð·Ð° ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð·Ð° Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð°Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° "
+"Ñ?Ñ?Ð°Ð³Ð°Ñ?Ð¸ Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð½Ðµ Ñ?ÐµÑ?Ð¸"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð»Ð° Ð½ÐµÐºÐµ ÐºÑ?Ñ?Ñ?Ð½Ðµ Ñ?ÐµÑ?Ð¸ ÐºÐ¾Ñ?Ðµ Ð½Ð°Ð²Ð¾Ð´Ðµ Ð´Ð° Ð±Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³, Ð°Ð»Ð¸ Ð¸Ñ?Ñ?Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ðµ."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð»Ð° Ð½ÐµÐºÐµ ÐºÑ?Ñ?Ñ?Ð½Ðµ Ñ?ÐµÑ?Ð¸ ÐºÐ¾Ñ?Ðµ Ð½Ð°Ð²Ð¾Ð´Ðµ Ð´Ð° Ð±Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð´Ð° "
+"Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³, Ð°Ð»Ð¸ Ð¸Ñ?Ñ?Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ðµ."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
@@ -15995,55 +16586,65 @@ msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð¸ Ð°Ñ?Ð´Ð¸Ð¾"
 msgid "Play audio attachments directly in mail messages."
 msgstr "Ð?Ñ?Ñ?Ñ?Ð° Ð°Ñ?Ð´Ð¸Ð¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð¼Ðµ Ð·Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð½Ð°ÐºÐ¾Ð½ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ðµ"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð¼Ðµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð½Ð°ÐºÐ¾Ð½ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?Ð°"
 
-#: ../plugins/backup-restore/backup-restore.c:290
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¸Ð· Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?, ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ, Ð·Ð°Ð´Ð°Ñ?ÐºÐµ, Ð±ÐµÐ»ÐµÑ?ÐºÐµ, ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ. Ð¢Ð°ÐºÐ¾Ñ?Ðµ Ñ?Ðµ  Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð»Ð¸Ñ?Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ, Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?, Ð¸Ñ?Ð´."
+#: ../plugins/backup-restore/backup-restore.c:298
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¸Ð· Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?Ñ?, "
+"ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ, Ð·Ð°Ð´Ð°Ñ?ÐºÐµ, Ð±ÐµÐ»ÐµÑ?ÐºÐµ, ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ. Ð¢Ð°ÐºÐ¾Ñ?Ðµ Ñ?Ðµ  Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð»Ð¸Ñ?Ð½Ðµ "
+"Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ, Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?, Ð¸Ñ?Ð´."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð· Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð°Ñ?Ñ?Ð¸Ð²Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "Ð?Ñ?Ð°Ñ?Ð° Ð¸Ð· Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#: ../plugins/backup-restore/backup-restore.c:361
+#, fuzzy
+#| msgid "_Backup Settings..."
+msgid "_Backup Evolution Settings..."
 msgstr "_Ð?Ð·Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐ·ÐµÑ?Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ñ?ÐµÐ·ÐµÑ?Ð²Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ? Ð°Ñ?Ñ?Ð¸Ð²Ñ?"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#: ../plugins/backup-restore/backup-restore.c:368
+#, fuzzy
+#| msgid "R_estore Settings..."
+msgid "R_estore Evolution Settings..."
 msgstr "Ð?Ð¿_Ð¾Ñ?Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Ð?Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ð° Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¸Ð· Ð°Ñ?Ñ?Ð¸Ð²Ðµ"
 
@@ -16079,7 +16680,8 @@ msgstr "Ð?Ð·Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð½Ð°Ð»Ð¾Ð³Ð° Ð¸ Ð¿Ð¾Ñ?Ñ?
 
 #: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Ð?Ð·Ñ?Ð°Ð´Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ (Ð¿Ð¾Ñ?Ñ?Ð°, ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸, Ð·Ð°Ð´Ð°Ñ?Ð¸, Ð±ÐµÐ»ÐµÑ?ÐºÐµ)"
+msgstr ""
+"Ð?Ð·Ñ?Ð°Ð´Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ (Ð¿Ð¾Ñ?Ñ?Ð°, ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸, Ð·Ð°Ð´Ð°Ñ?Ð¸, Ð±ÐµÐ»ÐµÑ?ÐºÐµ)"
 
 #: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
@@ -16093,7 +16695,9 @@ msgid "Restarting Evolution"
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#, fuzzy
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "Ð?Ð·Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16123,32 +16727,32 @@ msgid "Restoring from the folder %s"
 msgstr "Ð?Ñ?Ñ?Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ? Ð¸Ð· Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð½Ð° ÐºÐ¾Ð¿Ð¸Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "Ð?Ð·Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Ð¡Ð°Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ñ?Ð°Ð²Ð¸ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ñ? ÐºÐ¾Ð¿Ð¸Ñ?Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "Ð?Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Ð¡Ð°Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ Ð´Ð¾Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð²Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ? Ð¿Ñ?Ð²Ð¾Ð±Ð¸Ñ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ðµ."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ð?Ð²Ð¾ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ñ?Ð¸, Ñ? Ð·Ð°Ð²Ð¸Ñ?Ð½Ð¾Ñ?Ñ?Ð¸ Ð¾Ð´ ÐºÐ¾Ð»Ð¸Ñ?Ð¸Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð½Ð° Ð½Ð°Ð»Ð¾Ð³Ñ?."
 
@@ -16166,63 +16770,85 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ??"
 
 #: ../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 "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð· Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸Ð· Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
-msgstr "Ð?Ð·Ñ?Ð°Ð´Ð° Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð° Ñ?Ð°Ð¼Ð¾ ÐºÐ°Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ Ñ?Ð°Ð´Ð¸. Ð?Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð»Ð¸ Ð¸ Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸Ð»Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ðµ Ñ? ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ñ?Ñ?Ðµ Ñ?Ð°Ð´Ð¸Ð»Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ð¼Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ Ð½Ð°ÐºÐ¾Ð½ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¾Ñ?ÐµÐ´Ñ?Ñ?Ðµ, Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ñ? Ð¾Ð¿Ñ?Ð¸Ñ?Ñ?."
+#, fuzzy
+#| msgid "Choose an action:"
+msgid "Close and Backup Evolution"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ñ?:"
 
+# shell:noshell-reason title
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Close and Restore Evolution"
+msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "Ð?ÐµÐ´Ð¾Ð²Ð¾Ñ?Ð½Ð° Ð¾Ð²Ð»Ð°Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð°Ñ?"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "Ð£ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¸Ñ?Ð°Ñ?Ð¸."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
-msgstr "Ð?Ð²Ð¾ Ñ?Ðµ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð²Ðµ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¸ Ð¿Ð¾Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ð¸ Ð¸Ñ? Ð¸Ð· Ñ?ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ. Ð?Ð²Ð° Ð¿Ñ?Ð¾Ñ?ÐµÐ´Ñ?Ñ?Ð° Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ ÐºÐ°Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ðµ Ñ?Ð°Ð´Ð¸. Ð?Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ñ?Ñ?Ðµ Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸Ð»Ð¸ Ñ?Ð²Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ðµ Ñ? ÐºÐ¾Ñ?Ð¸Ð¼Ð° Ñ?Ñ?Ðµ Ñ?Ð°Ð´Ð¸Ð»Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ð°Ð¼Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ Ð½Ð°ÐºÐ¾Ð½ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¾Ñ?ÐµÐ´Ñ?Ñ?Ðµ, Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð²Ñ? Ð¾Ð¿Ñ?Ð¸Ñ?Ñ?."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:686
-#: ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ñ?Ð½Ð¾Ñ?Ðµ Ñ? _Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð¿Ñ?Ð¸ Ñ?Ð»Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð·Ð° Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Ð?Ñ?Ð·Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸Ð¼Ð° Ð¸ Ñ?Ð»Ð¸ÐºÐ°Ð¼Ð° Ñ?Ð° Ð»Ð¸Ñ?Ñ?Ð¾Ð¼ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð° Ñ? Ð?Ð¸Ñ?Ð¸Ð½Ñ?"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Ð?Ð¸Ñ?Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð·Ð° Pidgin Ð»Ð¸Ñ?Ñ?Ñ? Ð¿Ñ?Ð¸Ñ?Ð°Ñ?ÐµÑ?Ð°"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸ Ñ?Ð° _Ð»Ð¸Ñ?Ñ?Ð¾Ð¼ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð° Ñ?Ð°Ð´Ð°"
 
@@ -16234,34 +16860,37 @@ msgstr "BBDB"
 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 lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "Ð?Ñ?Ð»Ð¾Ð±Ð°Ñ?Ð° Ð?Ð°Ñ? Ñ?ÐµÑ?ÐºÐ¾Ð³ Ñ?Ð°Ð´Ð° Ñ? Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¾Ð¼.\n"
 "\n"
-"Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð¸Ð¼ÐµÐ½Ð¸Ð¼Ð° Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ ÐºÐ°Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð¢Ð°ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð±Ñ?Ð·Ð¸Ð¼ Ð³Ð»Ð°Ñ?Ð½Ð¸ÐºÐ¾Ð¼ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð°."
+"Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð° Ð°Ð´Ñ?ÐµÑ?Ð°Ñ? Ð¸Ð¼ÐµÐ½Ð¸Ð¼Ð° Ð¸ Ð°Ð´Ñ?ÐµÑ?Ð°Ð¼Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ ÐºÐ°Ð´Ð° Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°Ñ?Ðµ Ð½Ð° "
+"Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð¢Ð°ÐºÐ¾Ñ?Ðµ Ð¿Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð±Ñ?Ð·Ð¸Ð¼ Ð³Ð»Ð°Ñ?Ð½Ð¸ÐºÐ¾Ð¼ Ð¸Ð· Ñ?Ð¿Ð¸Ñ?ÐºÐ° Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð°."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ? Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½. Ð?Ñ?Ð²Ð¾ Ð³Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ðµ."
 
 #. 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:162
+#: ../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:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Ð?Ð°Ð²Ð¸Ñ?Ð°Ð½ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð° Ð½Ðµ Ñ?ÐµÐ°Ð³Ñ?Ñ?Ðµ, Ð³Ð°Ñ?Ð¸Ð¼..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Ð§ÐµÐºÐ°Ñ?Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸Ñ?Ð°Ð½ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð° Ð¾Ð¼ÐµÑ?ÐµÐ½Ð¾, Ð¿Ñ?ÐµÐºÐ¸Ð´Ð°Ð¼..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Ð¦ÐµÐ² ÐºÐ° Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ?Ñ? Ñ?Ðµ Ð¿Ñ?ÐºÐ»Ð°, Ð¾Ð·Ð½Ð°ÐºÐ° Ð³Ñ?ÐµÑ?ÐºÐµ: %d."
@@ -16275,8 +16904,12 @@ msgid "Convert mail messages to Unicode"
 msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ Ñ? Ð£Ð½Ð¸ÐºÐ¾Ð´"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð£Ð½Ð¸ÐºÐ¾Ð´ UTF-8 Ñ?Ð°Ð´Ð¸ Ð¾Ð±Ñ?ÐµÐ´Ð¸Ñ?Ð°Ð²Ð°Ñ?Ð° spam/ham Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ñ?Ð¸Ñ?Ð¸ Ñ?Ñ? Ñ?Ð·Ñ?Ð¾Ðº Ñ?Ð°Ð·Ð»Ð¸Ñ?Ð¸Ñ?Ð¸ ÐºÐ¾Ð´Ð½Ð¸ Ñ?Ð°Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð¸."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Ð?Ñ?ÐµÐ±Ð°Ñ?Ñ?Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð£Ð½Ð¸ÐºÐ¾Ð´ UTF-8 Ñ?Ð°Ð´Ð¸ Ð¾Ð±Ñ?ÐµÐ´Ð¸Ñ?Ð°Ð²Ð°Ñ?Ð° spam/ham Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° "
+"Ñ?Ð¸Ñ?Ð¸ Ñ?Ñ? Ñ?Ð·Ñ?Ð¾Ðº Ñ?Ð°Ð·Ð»Ð¸Ñ?Ð¸Ñ?Ð¸ ÐºÐ¾Ð´Ð½Ð¸ Ñ?Ð°Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð¸."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Junk Filter"
@@ -16290,15 +16923,15 @@ msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Ð¤Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½ÐµÐ¶ÐµÑ?ÐµÐ½Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "Ð?Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð°. Ð¡ÐµÑ?Ð²ÐµÑ? Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ñ? Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Ð?Ð°Ñ?Ñ? Ð°Ð´Ñ?ÐµÑ?Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16307,37 +16940,31 @@ msgstr ""
 "Ð¡ÐµÑ?Ð²ÐµÑ? Ñ?Ðµ Ð´Ð°Ð¾ Ð½ÐµÐ¾Ñ?ÐµÐºÐ¸Ð²Ð°Ð½ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "Ð?Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð¸"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð´Ð¾Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÑ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ð½Ð¸Ñ?ÐµÐ´Ð°Ð½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?."
 
@@ -16351,67 +16978,64 @@ msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ¾: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ¾, ÐºÐ¾Ð´ %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
-#, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#: ../plugins/caldav/caldav-browse-server.c:801
+#, fuzzy, c-format
+#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° <b>%s</b> Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ñ? <b>%s</b>"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ soup Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð·Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? â??%sâ??"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "Ð¢Ñ?Ð°Ð¶ÐµÑ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "Ð?Ð¾Ð´Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ð½Ð¸Ð·Ð°: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð° â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð°"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Ð¢Ñ?Ð°Ð³Ð° Ð·Ð° CalDAV ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¾Ð¼"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_Ð?Ð´Ñ?ÐµÑ?Ð° :"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ñ? Ð²ÐµÐ·Ñ?"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Ð?Ð¾_Ñ?Ñ?Ð°Ð¶Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ñ?"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "Ð?_Ñ?Ð²ÐµÐ¶Ð¸:"
 
@@ -16423,34 +17047,34 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ñ?ÐºÑ? Ð·Ð° CalDAV Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 msgid "CalDAV Support"
 msgstr "Ð?Ð¾Ð´Ñ?Ñ?ÐºÐ° Ð·Ð° CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_Ð?Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Ð?Ñ?Ð¸ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ñ?"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Ð?Ð¾Ð´ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "Ð?ÐµÑ?Ð¸Ð¾Ð´Ð¸Ñ?Ð½Ð¾"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Ð¤Ð¾Ñ?Ñ?Ð¸Ñ?Ð° _Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
@@ -16462,11 +17086,11 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Ð»Ð¾ÐºÐ°Ð»Ð½Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 msgid "Local Calendars"
 msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ñ? Ð²ÐµÐ·Ñ?"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾_Ð¸Ð¼Ðµ:"
 
@@ -16514,7 +17138,7 @@ msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð²ÐµÐ´Ñ?Ð° Ð½Ð¾Ñ?"
 msgid "Weather: Thunderstorms"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ: Ð³Ñ?Ð¼Ñ?Ð°Ð²Ð¸Ð½Ðµ"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ñ?Ð¾"
 
@@ -16524,21 +17148,21 @@ msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ñ?Ð¾"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Ð?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ðµ:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "Ð?ÐµÑ?Ñ?Ð¸Ñ?Ð½Ðµ (Ð¦ÐµÐ»Ð·Ð¸Ñ?Ñ?Ñ?, Ñ?Ð¼, Ð¸Ñ?Ð´.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Ð?Ð¼Ð¿ÐµÑ?Ð¸Ñ?Ð°Ð»Ð½Ðµ (Ð¤Ð°Ñ?ÐµÐ½Ñ?Ð°Ñ?Ñ?, Ð¸Ð½Ñ?Ð¸, Ð¸Ñ?Ð´.)"
 
@@ -16567,43 +17191,53 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ ÐºÐ°Ñ?Ñ?Ñ? Ñ?Ð° Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð¾Ð¼ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°, ÐºÐ°Ð´
 msgid "Map for contacts"
 msgstr "Ð?Ð°Ñ?Ñ?Ð° Ð·Ð° ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ðµ"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to import OE folder into"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ð·Ð° Ñ?Ð²Ð¾Ð·"
 
-#: ../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."
-msgstr "Ð¡Ð²Ð°ÐºÐ¸ Ð¿Ñ?Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾ÐºÑ?ÐµÐ½Ðµ, Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸ Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?."
+#: ../plugins/dbx-import/dbx-importer.c:251
+#, fuzzy
+#| msgid "Importing Outlook data"
+msgid "Importing Outlook Express data"
+msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Outlook Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Ð?Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð°Ð²Ð° Ð´Ð° Ð»Ð¸ Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ?."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import Outlook messages from PST file"
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Ð£Ð²Ð¾Ð·Ð¸ Outlook Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð¸Ð· Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ PST"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ð·Ð° Ð¿Ð¾Ñ?Ñ?Ñ? "
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+#| msgid "Outlook PST import"
+msgid "Outlook DBX import"
+msgstr "Outlook PST Ñ?Ð²Ð¾Ð·"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ñ?Ð¸Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸Ð¼ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð¾Ð¼ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+#| msgid "Outlook personal folders (.pst)"
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Ð?Ð¸Ñ?Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Outlook (.pst)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ _Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Ð¡Ð°Ð¼Ð¾_Ð´Ð¾Ð¿Ñ?Ð½Ð¸ Ð¾Ð²Ð¸Ð¼ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð¾Ð¼"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ _Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ _Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ _Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸"
 
@@ -16620,8 +17254,14 @@ msgid "List of Custom Headers"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
-msgstr "Ð?Ñ?Ñ?Ñ? Ð½Ð°Ð²Ð¾Ð´Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° ÐºÐ¾Ñ?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¾Ð´Ð»Ð°Ð·Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸. Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ð·Ð° Ð½Ð°Ð²Ð¾Ñ?ÐµÑ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¸ Ñ?ÐµÐ³Ð¾Ð²Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ðµ: Ð½Ð°Ð·Ð¸Ð² Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾Ð³ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°, Ð·Ð°Ñ?Ð¸Ð¼ â??=â?? Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð¾Ð´Ð²Ð¾Ñ?ÐµÐ½Ðµ Ñ?Ð° â??;â??"
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"Ð?Ñ?Ñ?Ñ? Ð½Ð°Ð²Ð¾Ð´Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° ÐºÐ¾Ñ?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð¸ Ð¾Ð´Ð»Ð°Ð·Ð½Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸. "
+"Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ð·Ð° Ð½Ð°Ð²Ð¾Ñ?ÐµÑ?Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ð¸ Ñ?ÐµÐ³Ð¾Ð²Ðµ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ñ?Ðµ: Ð½Ð°Ð·Ð¸Ð² Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾Ð³ "
+"Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°, Ð·Ð°Ñ?Ð¸Ð¼ â??=â?? Ð¸ Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð¾Ð´Ð²Ð¾Ñ?ÐµÐ½Ðµ Ñ?Ð° â??;â??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
@@ -16656,12 +17296,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16669,12 +17309,12 @@ msgstr ""
 "Ð¤Ð¾Ñ?Ð¼Ð°Ñ? Ð·Ð° Ð½Ð°Ð²Ð¾Ñ?ÐµÑ?Ðµ ÐºÑ?Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾Ð³ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ñ?Ðµ:\n"
 "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð½Ð°Ð·Ð¸Ð² ÐºÑ?Ñ?Ñ?Ð° Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾Ð³ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° Ñ?Ñ? Ñ?Ð°Ð·Ð´Ð²Ð¾Ñ?ÐµÐ½Ð¸ Ñ?Ð° â??;â??."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "Ð?Ñ?Ñ?Ñ?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸"
 
@@ -16693,10 +17333,11 @@ 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 "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ñ?Ñ? Ñ?Ð°Ñ?Ñ?ÐµÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
+msgstr ""
+"Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ñ?Ñ? Ñ?Ð°Ñ?Ñ?ÐµÑ? Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð¿Ñ?Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ? Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
@@ -16708,11 +17349,11 @@ msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
 msgid "The default command that must be used as the editor."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð° ÐºÐ¾Ñ?Ð° Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ ÐºÐ°Ð¾ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Ð?Ð°Ñ?ÐµÐ´Ð±Ð° Ð·Ð° Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð°Ð´Ð¸ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16720,8 +17361,8 @@ msgstr ""
 "Ð?Ð° Ð?Ð¼Ð°ÐºÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ â??xemacsâ??\n"
 "Ð?Ð° VI ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ â??gvim -fâ??"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð° Ñ? Ñ?Ð¿Ð¾Ñ?Ð½Ð¾Ð¼ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ñ?"
 
@@ -16742,28 +17383,44 @@ msgid "Editor not launchable"
 msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ñ?Ðµ Ð½Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ðµ"
 
 #: ../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."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ. Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ ÐºÐ°Ñ?Ð½Ð¸Ñ?Ðµ."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?Ð¸Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ðµ. "
+"Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ ÐºÐ°Ñ?Ð½Ð¸Ñ?Ðµ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 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 "Ð?Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ? Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?. Ð?Ñ?Ð¾Ð·Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð·Ð°Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð´Ð¾Ðº Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?."
+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."
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð½Ð°Ð²ÐµÐ»Ð¸ Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ð´Ð¾Ð´Ð°Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¸. Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð´Ð° Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÐ¾Ñ?Ðµ Ñ?Ñ?Ðµ Ð½Ð°Ð²ÐµÐ»Ð¸ Ñ? Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ°Ð¼Ð° Ð´Ð¾Ð´Ð°Ñ?ÐºÐ° Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¸. "
+"Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð´Ð° Ð½Ð°Ð²ÐµÐ´ÐµÑ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ð¼ÐµÑ?Ðµ Ñ?Ð»Ð¸ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
-msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ð¼ÐµÑ?Ðµ Ñ?Ð»Ð¸ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ñ?Ðµ Ð¾Ð²Ð¾Ð³Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð»Ð¸ÐºÑ?, Ð¸Ð½Ð°Ñ?Ðµ Ñ?Ðµ Ð½Ð¸Ñ?Ñ?Ð° Ð½ÐµÑ?Ðµ Ð´ÐµÑ?Ð¸Ñ?Ð¸."
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ?Ð¼ÐµÑ?Ðµ Ñ?Ð»Ð¸ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?Ñ?Ðµ Ð¾Ð²Ð¾Ð³Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ "
+"Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ñ?Ð»Ð¸ÐºÑ?, Ð¸Ð½Ð°Ñ?Ðµ Ñ?Ðµ Ð½Ð¸Ñ?Ñ?Ð° Ð½ÐµÑ?Ðµ Ð´ÐµÑ?Ð¸Ñ?Ð¸."
 
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
@@ -16781,7 +17438,7 @@ msgstr "_Ð£Ð¼ÐµÑ?Ð½Ð¸ Ñ?Ð»Ð¸ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð° Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 msgid "Load new _Face picture"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ñ? Ð½Ð¾Ð²Ñ? _Ñ?Ð»Ð¸ÐºÑ? ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸ _Ñ?Ð»Ð¸ÐºÑ?"
 
@@ -16813,22 +17470,20 @@ msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð³ Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð° .png. Ð?Ñ?ÐµÑ?ÐºÐ°: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Ð¡ÐµÑ?Ð²ÐµÑ?</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#, fuzzy
+#| msgid "_Server:"
+msgid "Server"
+msgstr "Ð¡_ÐµÑ?Ð²ÐµÑ?:"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° %s Ñ?Ð°Ð´Ð¸ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¸Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°."
+msgstr ""
+"Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ° %s Ñ?Ð°Ð´Ð¸ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° Ð»Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¸Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16837,18 +17492,20 @@ msgstr ""
 "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ?Ð° Ñ?ÐµÑ?Ð²ÐµÑ?Ð° Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "Ð?ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ?Ð° Ð³Ñ?ÐµÑ?ÐºÐ°."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Ð?Ð°Ð»_ÐµÐ½Ð´Ð°Ñ?:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#, fuzzy
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
 msgstr "Ð?Ð¾Ð²Ñ?Ñ?Ð¸ _Ð»Ð¸Ñ?Ñ?Ñ?"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16859,7 +17516,7 @@ msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Google ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 msgid "Google Calendars"
 msgstr "Google ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð¸"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº"
 
@@ -16891,12 +17548,12 @@ msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð· Ñ?ÐµÐ·ÐµÑ?Ð²Ñ?"
 msgid "Rese_nd Meeting..."
 msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð¾ _Ñ?Ð°Ñ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16921,19 +17578,19 @@ msgstr ""
 "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ â??Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸â?? Ð·Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð°Ñ?Ð¸Ñ?Ñ? Ð´ÐµÑ?ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Ð?Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ? Ð´ÐµÑ?ÐµÐ½Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ?"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "Ð?Ð½Ñ?Ñ?Ð°Ð»Ð°Ñ?Ð¸Ñ?Ð° Ð´ÐµÑ?ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ð±Ñ?Ðµ"
@@ -16946,11 +17603,6 @@ msgstr "Ð?-Ð¿Ð¾Ñ?Ñ?Ð°:"
 msgid "Junk List:"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ñ?Ð±Ñ?ÐµÑ?Ð°:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð¸"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ð¸"
@@ -16969,11 +17621,15 @@ msgstr "_Ð£ÐºÐ»Ð¾Ð½Ð¸"
 msgid "Message Retract"
 msgstr "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
-msgstr "Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¸Ð· Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¾Ð²Ð¾ Ð´Ð° Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ðµ? "
+#: ../plugins/groupwise-features/mail-retract.c:90
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this?"
+msgstr ""
+"Ð?Ð¾Ð²Ð»Ð°Ñ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ?Ðµ Ð¼Ð¾Ð¶Ðµ Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ð¸ Ð¸Ð· Ñ?Ð°Ð½Ð´Ñ?Ñ?ÐµÑ?Ð° Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð°. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¾Ð²Ð¾ Ð´Ð° "
+"Ñ?Ñ?Ð°Ð´Ð¸Ñ?Ðµ? "
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð¾Ð²Ñ?Ñ?ÐµÐ½Ð° Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð¾"
 
@@ -17016,8 +17672,12 @@ 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 "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° ÐºÐ°Ð¾ &quot;{0}&quot; Ð½Ð¸Ñ?Ðµ Ð±Ð¸Ð»Ð° Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð°. Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° ÐºÐ°Ð¾ &quot;{0}&quot; Ð½Ð¸Ñ?Ðµ Ð±Ð¸Ð»Ð° Ñ?Ñ?Ð¿ÐµÑ?Ð½Ð°. Ð?Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ "
+"Ð°Ð´Ñ?ÐµÑ?Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
@@ -17039,11 +17699,13 @@ 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.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ Ð·Ð° Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÑ?."
+msgstr ""
+"Ð?Ð¾Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð²ÐµÑ?Ñ?Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ Ð·Ð° Ð´Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð°Ð²Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÑ?."
 
 #: ../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 "Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¼ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ¾Ð¼ user &quot;{0}&quot;"
+msgstr ""
+"Ð?Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ Ð¾Ð²Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ñ? Ñ?Ð° Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸Ð¼ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ¾Ð¼ user &quot;{0}&quot;"
 
 #: ../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"
@@ -17071,11 +17733,16 @@ 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 "Ð?Ð²Ð¾ Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð´ÐµÑ?Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°. "
+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 "Ð?Ð²Ð¾ Ñ?Ðµ Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ñ?Ð° Ð´ÐµÑ?Ð°Ñ?Ð¸Ð¼Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¸Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°ÐºÐ°. Ð?Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð·Ð° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð¼Ð¾Ñ?Ð°Ñ?Ðµ Ñ?Ð½ÐµÑ?Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð¾."
+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-process-meeting.error.xml.h:9
@@ -17088,25 +17755,27 @@ msgid "Would you like to decline it?"
 msgstr "Ð?Ð´Ð±Ð¸Ñ?Ð°Ñ?Ðµ?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð·Ð° Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð°Ñ?Ðµ"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Ð?Ð¾Ð½_Ñ?Ð°ÐºÑ?Ð¸..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð´ÐµÑ?ÐµÐ½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "Ð£Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¸Ð¼Ð¸Ñ?Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+#, fuzzy
+#| msgid "Users"
+msgid "Users:"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Ð?Ð¸Ñ?Ðµ Ð´ÐµÑ?ÐµÐ½Ð¾"
@@ -17166,50 +17835,61 @@ msgid "Proxy"
 msgstr "Ð?Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Ð?Ð¼Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Ð?Ð¼Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð·Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 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.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "Ð?ÐµÐ·Ð¸Ñ?Ð°Ðº Ð·Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ñ?Ð°Ð¼Ð¾ ÐºÐ°Ð´Ð° Ð½Ð°Ð»Ð¾Ð³ Ð±Ñ?Ð´Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸."
+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 "Ð?ÐµÐ·Ð¸Ñ?Ð°Ðº Ð·Ð° Ð¼Ñ?ÐµÐ¶Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½ Ñ?Ð°Ð¼Ð¾ ÐºÐ°Ð´Ð° Ð½Ð°Ð»Ð¾Ð³ Ð±Ñ?Ð´Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?ÐµÐ½."
+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:700
+#, fuzzy
+#| msgid "Proxy"
+msgctxt "GW"
+msgid "Proxy"
+msgstr "Ð?Ñ?ÐµÐ¶Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº"
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐ°"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ñ?Ð»Ð°Ñ?Ð°"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ð¸"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐµ Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð¾Ð²Ð»Ð°Ñ?Ñ?ÐµÑ?Ð°"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "Ð?ÐµÑ?ÐµÑ?Ðµ"
 
@@ -17217,67 +17897,59 @@ msgstr "Ð?ÐµÑ?ÐµÑ?Ðµ"
 msgid "Custom Notification"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "Ð?Ð¾Ð´Ð°Ñ? "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Ð¡Ñ?Ð°Ñ?Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð²:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Ð¨Ð°Ñ?Ðµ:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ð°:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Ð?Ñ?Ð¸Ð¼Ð°Ð»Ð°Ñ?:"
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "Ð?Ñ?Ð¿Ð¾Ñ?Ñ?Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ð½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Ð?Ð´Ð±Ð¸Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "Ð?Ð°Ð²Ñ?Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ð¾Ñ?Ñ?Ñ?ÐµÐ½Ð¾:"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Ð?Ð¾Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ñ?ÐºÑ? Ð·Ð° Hula Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Ð?Ð¾Ð´Ñ?Ñ?ÐºÐ° Ð·Ð° Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ñ?Ð»Ð¸ÐºÐ°"
@@ -17286,12 +17958,12 @@ msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð° Ñ?Ð»Ð¸ÐºÐ°"
 msgid "View image attachments directly in mail messages."
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ñ?Ð° Ñ?Ð»Ð¸ÐºÐ°Ð¼Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°"
@@ -17302,10 +17974,12 @@ msgstr "Ð?Ñ?Ð½Ð¾Ð²Ð½Ð° Ð¸ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° _Ð?Ð¾Ð¿Ð¸Ñ?Ð½Ð¸Ñ? Ð»Ð¸Ñ?Ñ?Ð° (Ð?Ð¾Ð´
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Ð?Ð¾ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð¿Ñ?ÐµÑ?Ð·ÐµÑ?Ð¸ Ð·Ð°Ñ?ÐµÐ´Ð½Ð¾ Ñ?Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸Ð¼ Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð¸Ð¼Ð°. \n"
+"Ð?Ð¾ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ð¾Ð´Ð°Ñ?Ð½Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð° ÐºÐ¾Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð¿Ñ?ÐµÑ?Ð·ÐµÑ?Ð¸ Ð·Ð°Ñ?ÐµÐ´Ð½Ð¾ Ñ?Ð° Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´Ð½Ð¸Ð¼ "
+"Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð¸Ð¼Ð°. \n"
 "Ð?Ð·Ð±Ð¾Ñ?Ð¾Ð¼ â??Ð¡Ð²Ð° Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ð°â?? Ð¾Ð²Ð¾ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¸Ð³Ð½Ð¾Ñ?Ð¸Ñ?Ð°Ñ?Ð¸."
 
 #: ../plugins/imap-features/imap-headers.ui.h:6
@@ -17336,34 +18010,37 @@ msgstr "Ð¤Ð¸Ð½Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ IMAP Ð½Ð°Ð»Ð¾Ð³Ðµ."
 msgid "IMAP Features"
 msgstr "IMAP Ð¼Ð¾Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ð¸"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
-#, c-format
-msgid "Failed to load the calendar '%s'"
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
+#, fuzzy, c-format
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð°Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Ð?ÐµÐ´Ð½Ð¾ Ð·Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? â??%sâ?? Ñ?Ðµ Ñ? Ð¸Ñ?Ñ?Ð¾ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð´ Ð¸ Ð¾Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Ð?Ð°ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ð¾ Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ð½Ð¸Ñ?ÐµÐ´Ð°Ð½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð½Ð¸ Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð¼ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð½Ð¸ Ñ? Ñ?ÐµÐ´Ð½Ð¾Ð¼ Ñ?Ð¿Ð¸Ñ?ÐºÑ? Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Ð?Ð¸Ñ?ÐµÐ´Ð°Ð½ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¾Ð²Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?"
 
@@ -17470,7 +18147,9 @@ msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1588
 #: ../plugins/itip-formatter/itip-formatter.c:1599
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?, Ð°Ð»Ð¸ Ñ?Ð°Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1639
@@ -17482,90 +18161,97 @@ msgstr "Ð¡Ñ?Ð°Ð²ÐºÐ° Ñ? ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð°"
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 #: ../plugins/itip-formatter/itip-formatter.c:1668
 #: ../plugins/itip-formatter/itip-formatter.c:1774
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?, Ð°Ð»Ð¸ Ð¾Ð½ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ, Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¸Ð»Ð¸ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ."
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Ð?Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð°Ð´Ñ?Ð¶Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?, Ð°Ð»Ð¸ Ð¾Ð½ Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ, Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð¸Ð»Ð¸ Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾/"
+"Ð·Ð°Ñ?Ð·ÐµÑ?Ð¾ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð²Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ð²ÐºÐ¸"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1682
-msgid "To process all of these items, the file should be saved and the calendar imported"
-msgstr "Ð Ð°Ð´Ð¸ Ð¾Ð±Ñ?Ð°Ð´Ðµ Ñ?Ð²Ð¸Ñ? Ð¾Ð²Ð¸Ñ? Ñ?Ñ?Ð°Ð²ÐºÐ¸, Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð²ÐµÑ?Ñ?Ð¸"
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Ð Ð°Ð´Ð¸ Ð¾Ð±Ñ?Ð°Ð´Ðµ Ñ?Ð²Ð¸Ñ? Ð¾Ð²Ð¸Ñ? Ñ?Ñ?Ð°Ð²ÐºÐ¸, Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ñ?Ð²ÐµÑ?Ñ?Ð¸"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "Ð?Ð²Ð°Ñ? Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "Ð?Ð²Ð°Ñ? Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ñ?Ðµ Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "Ð?Ð²Ð° Ñ?Ðµ Ð±ÐµÐ»ÐµÑ?ÐºÐ° Ð¿Ð¾Ð½Ð°Ð²Ñ?Ð°"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "_Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½Ð°ÐºÐ¾Ð½ Ñ?Ð°Ð´Ñ?Ðµ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ Ð·Ð° Ð¿Ñ?ÐµÐºÐ»Ð°Ð¿Ð°Ñ?Ð¸Ð¼Ð°"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Ð?Ð¸Ñ?Ð° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ðµ Ð·Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ? Ð¿Ñ?ÐµÐºÐ»Ð°Ð¿Ð°Ñ?Ð° Ñ? Ñ?Ð°Ñ?Ñ?Ð°Ð½Ñ?Ð¸Ð¼Ð°"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Ð?Ð°Ð½Ð°Ñ? %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Ð?Ð°Ð½Ð°Ñ? %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Ð?Ð°Ð½Ð°Ñ? %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð° %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð° %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð° %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Ð¡Ñ?Ñ?Ñ?Ð° %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -17575,69 +18261,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -17647,350 +18333,417 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+#, fuzzy, c-format
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
 msgstr "Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ñ? Ð¸Ð¼Ðµ <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
 msgstr "Ð?Ñ?Ð¸Ð¼Ñ?ÐµÐ½Ð¾ Ñ? Ð¸Ð¼Ðµ <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð¾ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
+#: ../plugins/itip-formatter/itip-view.c:381
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> Ð?Ð°Ð¼ Ð´ÐµÐ»ÐµÐ³Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:384
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð?Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?ÐµÐ¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð?Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?ÐµÐ¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:392
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð¸ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð¸ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ð¼Ð¸ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ðº Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:404
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ñ?Ð°Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
-#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> Ñ?Ð°Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð·Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
-#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº."
 
-#: ../plugins/itip-formatter/itip-view.c:404
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:416
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¿Ñ?ÐµÐ´Ð»Ð°Ð¶Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°."
 
-#: ../plugins/itip-formatter/itip-view.c:406
-#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐ´Ð»Ð°Ð¶Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°."
 
-#: ../plugins/itip-formatter/itip-view.c:410
-#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#: ../plugins/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ð´Ð±Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
-#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> Ð¾Ð´Ð±Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ð½ÐºÐ°."
 
-#: ../plugins/itip-formatter/itip-view.c:450
-#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
-#, c-format
-msgid "<b>%s</b> has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð·Ð°Ð´Ñ?Ð¶ÐµÑ?Ðµ:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
-#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#: ../plugins/itip-formatter/itip-view.c:469
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð´Ð° %s Ð¿Ñ?ÐµÑ?Ð·Ð¼Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
-#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:472
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð?Ð°Ð¼ Ð´Ð¾Ð´ÐµÑ?Ñ?Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
-#, c-format
-msgid "<b>%s</b> has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> Ð?Ð°Ð¼ Ð´Ð¾Ð´ÐµÑ?Ñ?Ñ?Ðµ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:480
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ð·Ð°Ð´Ð°Ñ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ "
+"Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð½Ð¾Ð²Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:492
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð²Ñ?Ð°Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> Ñ?Ð°Ñ?Ðµ Ð½Ð°Ð·Ð°Ð´ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð° Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:498
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:504
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¿Ñ?ÐµÐ´Ð»Ð°Ð¶Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ? Ð´Ð¾Ð´ÐµÐ»Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
-#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐ´Ð»Ð°Ð¶Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ñ? Ð´Ð¾Ð´ÐµÐ»Ð¸ Ð·Ð°Ð´Ð°Ñ?ÐºÐ°:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
-#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:510
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ð´Ð±Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
-#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> Ð¾Ð´Ð±Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð´Ð¾Ð´ÐµÑ?ÐµÐ½Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
 msgstr "<b>%s</b> Ð¾Ð±Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:556
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¾Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> Ð¶ÐµÐ»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð° Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¾Ñ? Ð±ÐµÐ»ÐµÑ?Ñ?Ð¸:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:562
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> Ð¿Ñ?ÐµÐºÐ¾ %s Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð´ÐµÑ?ÐµÐ½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b> Ð¾Ñ?ÐºÐ°Ð·Ñ?Ñ?Ðµ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð´ÐµÑ?ÐµÐ½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Ð¦ÐµÐ»Ð¾Ð´Ð½ÐµÐ²Ð½Ð¾:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð°Ðº Ð´Ð°Ð½Ð°:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐºÐ°:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Ð?Ñ?Ð°Ñ? Ð´Ð°Ð½Ð°:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð·Ð°Ð²Ñ?Ñ?ÐµÑ?ÐºÐ°:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Ð?Ð´Ð±Ð¸Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "Ð?Ñ?Ð¸_Ñ?Ð²Ð°Ñ?Ð¸"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#, fuzzy
+#| msgid "Accept"
+msgid "A_ccept"
+msgstr "Ð?Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "Ð?Ð´_Ð±Ð¸Ñ? Ñ?Ð²Ðµ"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Ð¡Ð²Ðµ Ñ?Ð° Ñ?Ðµ_Ð·ÐµÑ?Ð²Ð¾Ð¼"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "Ð¡Ð° _Ñ?ÐµÐ·ÐµÑ?Ð²Ð¾Ð¼"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#, fuzzy
+#| msgid "_Accept all"
+msgid "A_ccept all"
 msgstr "Ð?_Ñ?Ð¸Ñ?Ð²Ð°Ñ?Ð¸ Ñ?Ð²Ðµ"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ð´Ð°Ñ?_ÐºÐµ"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ? Ñ?Ñ?Ð°Ñ?Ðµ Ñ?Ñ?ÐµÑ?Ð½Ð¸_ÐºÐ°"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_Ð?Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ñ?"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ñ?:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Ð?Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ð¸Ñ?Ð°Ð¾Ñ?Ñ?"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ _Ð°Ð¶Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ñ?Ð¸Ð¼Ð°"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "Ð?Ñ?Ð¸_Ð¼ÐµÐ½Ð¸ Ð½Ð° Ñ?Ð²Ðµ Ð½Ð¸Ð²Ð¾Ðµ"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð²Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð¾ _Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð½Ð¾"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_Ð?Ñ?Ñ?Ð²Ð°Ñ? Ð¼Ð¾Ñ? Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Ð?Ð°Ñ?Ð»ÐµÐ´Ð¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "Ð?Ð°_Ð´Ð°Ñ?Ð¸:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_Ð?ÐµÐ»ÐµÑ?ÐºÐµ:"
 
@@ -18003,15 +18756,22 @@ msgid "Itip Formatter"
 msgstr "Itip Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ñ?Ðµ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
-msgstr "&quot;{0}&quot; Ð´ÐµÐ»ÐµÐ³Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð´ÐµÐ»ÐµÐ³Ð°Ñ?Ð° &quot;{1}&quot; ?"
+#, fuzzy
+#| msgid ""
+#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
+#| "delegate &quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+"&quot;{0}&quot; Ð´ÐµÐ»ÐµÐ³Ð¸Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð´ÐµÐ»ÐµÐ³Ð°Ñ?Ð° &quot;{1}"
+"&quot; ?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 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?"
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ð?Ð²Ð°Ñ? Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ð¾ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð°Ð½ Ñ?Ñ?ÐµÑ?Ð½Ð¸Ðº. Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð³Ð° Ñ? Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ðµ?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -18035,8 +18795,12 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Ð¡Ñ?Ð²Ð°Ñ?Ð° D-BUS Ð¿Ð¾Ñ?Ñ?ÐºÑ? ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?Ð°."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
-msgstr "Ð¡Ð²Ð¸Ñ?Ð½Ðµ Ð°ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð½Ð° â??trueâ?? (Ñ?Ð°Ñ?Ð½Ð¾), Ð° Ð¸Ð½Ð°Ñ?Ðµ Ð¿Ñ?Ñ?Ñ?Ð° Ð·Ð²Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Ð¡Ð²Ð¸Ñ?Ð½Ðµ Ð°ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð½Ð° â??trueâ?? (Ñ?Ð°Ñ?Ð½Ð¾), Ð° Ð¸Ð½Ð°Ñ?Ðµ Ð¿Ñ?Ñ?Ñ?Ð° Ð·Ð²Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? "
+"ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18048,7 +18812,9 @@ msgstr "Ð?Ñ?Ñ?Ñ?Ð° Ð·Ð²Ñ?Ðº ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "Ð?Ñ?Ñ?Ñ?Ð° Ð·Ð²Ñ?Ðº Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð¸Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ñ?Ð¸Ñ?ÐµÐ½Ð¾Ð¼."
+msgstr ""
+"Ð?Ñ?Ñ?Ñ?Ð° Ð·Ð²Ñ?Ðº Ñ?ÐµÐ¼Ðµ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð¸Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ "
+"Ñ?Ð¸Ñ?ÐµÐ½Ð¾Ð¼."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18056,7 +18822,8 @@ msgstr "Ð?Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð¾Ð¼."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¸ÐºÐ¾Ð½Ñ? Ð·Ð° Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ñ? Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¸ÐºÐ¾Ð½Ñ? Ð·Ð° Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?Ñ? Ñ? Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
@@ -18064,7 +18831,9 @@ msgstr "Ð?Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð·Ð° Ð¿Ñ?Ñ?Ñ?Ð°Ñ?Ðµ."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "Ð?Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð·Ð° Ð¿Ñ?Ñ?Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð¸Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ñ?Ð¸Ñ?ÐµÐ½Ð¾Ð¼."
+msgstr ""
+"Ð?Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð·Ð° Ð¿Ñ?Ñ?Ñ?Ð°Ñ?Ðµ ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°, Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð¸Ñ?Ðµ Ñ?ÐºÑ?Ñ?Ñ?ÐµÐ½Ð¾ "
+"Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ñ?Ð¸Ñ?ÐµÐ½Ð¾Ð¼."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Use sound theme"
@@ -18086,16 +18855,15 @@ msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¸ÐºÐ¾Ð½Ð° Ñ?Ñ?ÐµÐ¿Ñ?Ðµ Ð¸Ð»Ð¸ Ð½Ðµ."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð¸ Ð¾ Ð½Ð¾Ð²Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ñ?Ð¸ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ð¡Ð°Ð½Ð´Ñ?Ñ?Ðµ."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:369
 msgid "Evolution's Mail Notification"
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸Ð½Ð¾ Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ðµ Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¸"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:391
 msgid "Mail Notification Properties"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?ÐµÑ?Ð° Ð¾ Ð¿Ð¾Ñ?Ñ?Ð¸"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18112,69 +18880,75 @@ msgstr[1] ""
 msgstr[2] ""
 "Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ %d Ð½Ð¾Ð²Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°\n"
 "Ñ? %s."
+msgstr[3] ""
+"Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ %d Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?\n"
+"Ñ? %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:539
 #, c-format
 msgid "From: %s"
 msgstr "Ð?Ð´: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:552
 #, c-format
 msgid "Subject: %s"
 msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð²: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:562
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ %d Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 msgstr[1] "Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ %d Ð½Ð¾Ð²Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 msgstr[2] "Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ %d Ð½Ð¾Ð²Ð¸Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
+msgstr[3] "Ð?Ñ?Ð¸Ð¼Ð¸Ð»Ð¸ Ñ?Ñ?Ðµ Ð½Ð¾Ð²Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "New email"
 msgstr "Ð?Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:652
 msgid "Show icon in _notification area"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¸ÐºÐ¾Ð½Ñ? Ñ? _Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:680
 msgid "B_link icon in notification area"
 msgstr "Ð¢Ñ?Ðµ_Ð¿ÐµÑ?Ð¸ Ð¸ÐºÐ¾Ð½Ð° Ñ? Ð¾Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ñ?Ð½Ð¾Ñ? Ð·Ð¾Ð½Ð¸ "
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "Popup _message together with the icon"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð·Ð°Ñ?ÐµÐ´Ð½Ð¾ Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð¾Ð¼"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:877
 msgid "_Play sound when new messages arrive"
 msgstr "_Ð?Ñ?Ñ?Ñ?Ð¸ Ð·Ð²Ñ?Ðº ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:906
 msgid "_Beep"
 msgstr "_Ð¡Ð²Ð¸Ñ?Ð½Ð¸"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:919
 msgid "Use sound _theme"
 msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð·Ð²Ñ?Ðº _Ñ?ÐµÐ¼Ðµ"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:938
 msgid "Play _file:"
 msgstr "Ð?Ñ?Ñ?Ñ?Ð¸ _Ð·Ð²Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:949
 msgid "Select sound file"
 msgstr "Ð?Ð¸Ñ?Ð° Ð·Ð²Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:1007
 msgid "Notify new messages for _Inbox only"
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?Ð¸ Ð¾ Ð½Ð¾Ð²Ð¸Ð¼ Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð° Ñ?Ð°Ð¼Ð¾ Ð·Ð° _Ð¡Ð°Ð½Ð´Ñ?Ñ?Ðµ"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1016
 msgid "Generate a _D-Bus message"
 msgstr "Ð¡Ñ?Ð²Ð°Ñ?Ð° _D-Bus Ð¿Ð¾Ñ?Ñ?ÐºÑ?"
 
@@ -18187,124 +18961,215 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Ð?Ð±Ð°Ð²ÐµÑ?Ñ?Ð°Ð²Ð° Ð?Ð°Ñ? ÐºÐ°Ð´Ð° Ñ?Ñ?Ð¸Ð³Ð½Ðµ Ð½Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Ð¡Ð°Ñ?Ð¸Ñ?ÐµÐ½Ð¾ Ð¸Ð· Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ¾Ñ?Ñ? Ñ?Ð°Ñ?Ðµ %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ??"
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸ "
+"Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ? â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ??"
-
-#: ../plugins/mail-to-task/mail-to-task.c:519
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½ÐµÐºÐµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
-
-#: ../plugins/mail-to-task/mail-to-task.c:522
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½ÐµÐºÐµ Ð·Ð°Ð´Ð°Ñ?ÐºÐµ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ? â??%sâ??. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ñ?Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½ÐµÐºÐµ Ð±ÐµÐ»ÐµÑ?ÐºÐµ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð½ÐµÐºÐµ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ðµ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
-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] "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
+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:549
-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] "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
+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:555
-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] "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
+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] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð° Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+msgstr[3] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸?"
+
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
+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] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+msgstr[3] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¸?"
+
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
+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] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÐ¸ Ð·Ð° Ð´Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ðµ?"
+msgstr[3] ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð²ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ? Ð·Ð° Ð´Ð°Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?. Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð¸Ð¿Ð°Ðº Ð´Ð° "
+"Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ñ??"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Ð?ÐµÐ· Ñ?Ð°Ð¶ÐµÑ?ÐºÐ°]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð¾Ð±Ñ?ÐµÐºÐ°Ñ? Ð²Ñ?Ð°Ñ?ÐµÐ½ Ð¾Ð´ Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ð?Ð°Ð²Ð¸Ð»Ð° Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? Ð¾Ð±Ñ?Ð°Ð´Ð¸: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
+#: ../plugins/mail-to-task/mail-to-task.c:743
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?. "
+"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
+#: ../plugins/mail-to-task/mail-to-task.c:746
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº. "
+"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ?. Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
+#: ../plugins/mail-to-task/mail-to-task.c:749
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+"Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ð¸Ð·Ð²Ð¾Ñ? Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ, Ñ?Ñ?Ð¾Ð³Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ñ?Ñ? Ð½Ð°Ð¿Ñ?Ð°Ð²Ð¸Ñ?Ð¸ Ð±ÐµÐ»ÐµÑ?ÐºÑ?. "
+"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð¸ Ð¸Ð·Ð²Ð¾Ñ?."
 
 # mail:no-copy-folder-nostore secondary
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð´Ð¾Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ð·Ð²Ð¾Ñ?Ð°. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ _Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ? Ð¾Ð´ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð±ÐµÐ»ÐµÑ?Ðº_Ñ?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ? Ð¾Ð´ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ _Ð·Ð°Ð´Ð°Ñ?Ð°Ðº"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°Ðº Ð¾Ð´ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ _Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð¾Ð´ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
@@ -18312,55 +19177,55 @@ msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ñ?Ð°Ñ?Ñ?Ð°Ð½Ð°Ðº Ð¾Ð´ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ð¾Ñ?Ñ?
 msgid "Convert a mail message to a task."
 msgstr "Ð?Ñ?ÐµÑ?Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ñ? Ð·Ð°Ð´Ð°Ñ?Ð°Ðº."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Ð?Ñ?Ð¸Ð±Ð°Ð²Ð¸ _Ð°Ñ?Ñ?Ð¸Ð²Ñ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Ð?Ñ?Ð¸Ð±Ð°Ð²Ð¸ Ð°Ñ?Ñ?Ð¸Ð²Ñ? Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Ð?Ñ?Ð¸Ð±Ð°Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ _ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Ð?Ñ?Ð¸Ð±Ð°Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ñ? Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "_Ð?Ð»Ð°Ñ?Ð½Ð¸Ðº ÐºÐ¾Ð½Ñ?Ð°ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Ð?Ð°Ð²Ð¸Ñ?Ðµ Ñ?Ðµ Ð²Ð»Ð°Ñ?Ð½Ð¸ÐºÑ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ðµ Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½Ð° Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð°Ð²Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð·Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ? ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "Ð?Ñ?Ð¸_Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ð½Ð° Ð»Ð¸Ñ?Ñ?Ñ?"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ? ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "Ð?_Ð´Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ð»Ð¸Ñ?Ñ?Ðµ"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Ð?Ð´Ñ?Ð°Ð²Ð¸ Ñ?Ðµ Ñ?Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ðµ Ð»Ð¸Ñ?Ñ?Ðµ ÐºÐ¾Ñ?Ð¾Ñ? Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð°"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "Ð?Ð¾Ð¿Ð¸Ñ?Ð½Ð° _Ð»Ð¸Ñ?Ñ?Ð°"
 
@@ -18378,11 +19243,14 @@ msgstr "Ð Ð°Ð´Ñ?Ð° Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð° Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? â??{0}â??. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸, Ð¸Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð²Ð¾ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ð¸ Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸.\n"
+"Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð° Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ñ? â??{0}â??. Ð?Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð´Ð° "
+"Ð¿Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸, Ð¸Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð²Ð¾ Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ð¸ Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð¸.\n"
 "\n"
 "Ð¢Ñ?ÐµÐ±Ð°Ð»Ð¾ Ð±Ð¸ Ð´Ð° Ð´Ð¾Ð±Ð¸Ñ?ÐµÑ?Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ? Ñ?Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ðµ Ð»Ð¸Ñ?Ñ?Ðµ Ñ?Ð±Ñ?Ð·Ð¾ Ð½Ð°ÐºÐ¾Ð½ Ñ?Ð»Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
@@ -18399,8 +19267,12 @@ msgid "Posting not allowed"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½Ð¾"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-msgstr "Ð¡Ð»Ð°Ñ?Ðµ Ð½Ð° Ð¾Ð²Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½Ð¾. Ð?Ð¾Ð¶Ð´Ð° Ñ?Ðµ Ð¾Ð²Ð° Ð»Ð¸Ñ?Ñ?Ð° Ñ?Ð°Ð¼Ð¾ Ð·Ð° Ñ?Ð¸Ñ?Ð°Ñ?Ðµ. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð²Ð»Ð°Ñ?Ð½Ð¸ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ Ð·Ð° Ð´ÐµÑ?Ð°Ñ?Ðµ."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Ð¡Ð»Ð°Ñ?Ðµ Ð½Ð° Ð¾Ð²Ñ? Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? Ð»Ð¸Ñ?Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ?ÐµÐ½Ð¾. Ð?Ð¾Ð¶Ð´Ð° Ñ?Ðµ Ð¾Ð²Ð° Ð»Ð¸Ñ?Ñ?Ð° Ñ?Ð°Ð¼Ð¾ Ð·Ð° "
+"Ñ?Ð¸Ñ?Ð°Ñ?Ðµ. Ð?Ð±Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ñ?Ðµ Ð²Ð»Ð°Ñ?Ð½Ð¸ÐºÑ? Ð»Ð¸Ñ?Ñ?Ðµ Ð·Ð° Ð´ÐµÑ?Ð°Ñ?Ðµ."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18408,11 +19280,13 @@ msgstr "Ð?Ð¾Ñ?Ð»Ð°Ñ?Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð½Ð° Ð´Ð¾Ð¿Ð¸Ñ?Ð½Ñ? 
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Ð Ð°Ð´Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð¸. Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð·Ð° Ð¾Ð²Ñ? Ñ?Ð°Ð´Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð»Ð¾ Ð¾Ð±Ñ?Ð°Ð´Ð¸Ð²Ñ? Ñ?Ð°Ð´Ñ?Ñ?.\n"
+"Ð Ð°Ð´Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð¸. Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ð·Ð° Ð¾Ð²Ñ? Ñ?Ð°Ð´Ñ?Ñ? Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ð»Ð¾ Ð¾Ð±Ñ?Ð°Ð´Ð¸Ð²Ñ? "
+"Ñ?Ð°Ð´Ñ?Ñ?.\n"
 "\n"
 "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ: {0}"
 
@@ -18427,7 +19301,9 @@ msgstr ""
 "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "Ð?Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð½Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ñ? Ð·Ð°Ð³Ð»Ð°Ð²Ñ?Ñ? Ð·Ð° Ð¾Ð²Ñ? Ñ?Ð°Ð´Ñ?Ñ?."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18443,19 +19319,23 @@ msgid "Also mark messages in subfolders?"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸Ñ?Ð¸ Ñ?Ð°ÐºÐ¾Ñ?Ðµ Ð¸ Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, Ð¸Ð»Ð¸ Ð¸ Ð¾Ð½Ðµ Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°? "
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Ð?ÐµÐ»Ð¸Ñ?Ðµ Ð»Ð¸ Ð´Ð° Ð¾Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ñ?Ð°Ð¼Ð¾ Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸, Ð¸Ð»Ð¸ Ð¸ "
+"Ð¾Ð½Ðµ Ñ? Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "Ð£ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¸ _Ð¿Ð¾Ð´Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°Ð¼Ð°"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "Ð¡Ð°Ð¼Ð¾ Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ñ? _Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "Ð?Ð·Ð½Ð°Ñ?Ð¸ Ð¿Ð¾_Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð½Ðµ"
 
@@ -18514,35 +19394,43 @@ msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð´Ð°Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ñ?"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ ÐºÐ°Ð¾ Ð¾Ð±Ð¸Ñ?Ð°Ð½ Ñ?ÐµÐºÑ?Ñ?, Ñ?Ð°Ðº Ð¸ Ð°ÐºÐ¾ Ñ?Ð°Ð´Ñ?Ð¶Ðµ HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ HTML Ð°ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Ð?ÐµÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ð·Ð°Ð±ÐµÑ?Ðµ Ð½Ð°Ñ?Ð±Ð¾Ñ?Ð¸ Ð´ÐµÐ¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð±Ð¸Ñ?Ð°Ð½ Ñ?ÐµÐºÑ?Ñ? Ð°ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
-msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð´ÐµÐ¾ Ñ?Ð° Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼, Ð°ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸, Ð¸Ð½Ð°Ñ?Ðµ Ð½ÐµÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ð·Ð°Ð±ÐµÑ?Ðµ Ð½Ð°Ñ?Ð±Ð¾Ñ?Ð¸ Ð´ÐµÐ¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·."
+#: ../plugins/prefer-plain/prefer-plain.c:199
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð´ÐµÐ¾ Ñ?Ð° Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼, Ð°ÐºÐ¾ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸, Ð¸Ð½Ð°Ñ?Ðµ Ð½ÐµÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¸Ð·Ð°Ð±ÐµÑ?Ðµ "
+"Ð½Ð°Ñ?Ð±Ð¾Ñ?Ð¸ Ð´ÐµÐ¾ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð·."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "Ð?Ñ?ÐºÑ?Ñ?Ñ?Ð¸Ð²Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ? Ð¾Ð±Ð¸Ñ?Ð°Ð½ Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
-msgid "Always show plain text part and make attachments from other parts, if requested."
-msgstr "Ð£Ð²ÐµÐº Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´ÐµÐ¾ Ñ?Ð° Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼, Ð¿Ñ?Ð¸Ð»Ð°Ð¶Ñ?Ñ?Ð¸ Ð¾Ñ?Ñ?Ð°Ð»Ðµ Ð´ÐµÐ»Ð¾Ð²Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?, Ð¿Ð¾ Ð¸Ð·Ð±Ð¾Ñ?Ñ?."
+#: ../plugins/prefer-plain/prefer-plain.c:200
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Ð£Ð²ÐµÐº Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´ÐµÐ¾ Ñ?Ð° Ð¾Ð±Ð¸Ñ?Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼, Ð¿Ñ?Ð¸Ð»Ð°Ð¶Ñ?Ñ?Ð¸ Ð¾Ñ?Ñ?Ð°Ð»Ðµ Ð´ÐµÐ»Ð¾Ð²Ðµ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ?, Ð¿Ð¾ "
+"Ð¸Ð·Ð±Ð¾Ñ?Ñ?."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾_Ñ?Ð¸Ñ?Ð½Ñ?Ñ?Ðµ HTML Ð´ÐµÐ»Ð¾Ð²Ðµ ÐºÐ°Ð¾ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML _Ñ?ÐµÐ¶Ð¸Ð¼"
 
@@ -18566,32 +19454,35 @@ msgstr "Outlook PST Ñ?Ð²Ð¾Ð·"
 msgid "Outlook personal folders (.pst)"
 msgstr "Ð?Ð¸Ñ?Ð½Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "_Ð?Ð¾Ñ?Ñ?Ð°"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð°:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "_Ð?Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "Ð?Ð°_ÐºÐ°Ð·Ð°Ð½Ð¾"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Ð?Ð°Ð´Ð°Ñ?Ð¸"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "Ð£Ð½Ð¾Ñ?Ð¸ Ñ? _Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Outlook Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
@@ -18749,55 +19640,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ð±Ñ?Ð°Ð²Ð¸Ñ?Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?: Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¸ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð²Ð¸Ñ?Ðµ Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Ð?Ð¾Ð²Ð° Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ð°"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Ð£Ñ?ÐµÐ´Ð¸ Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Ð£Ð±Ð¸Ñ?Ð° Ñ?Ð¿Ð°Ð¼Ð° Ð½Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½, ÐºÐ¾Ð´: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Ð?Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾ Ð¿Ñ?Ð°Ð²Ñ?ÐµÑ?Ðµ Ñ?ÐµÐ²Ð¸: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ð¾ Ð¸Ð·Ð´Ð²Ð°Ñ?Ð°Ñ?Ñ?: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Ð?Ð°Ð²Ð¸Ñ?Ð°Ð½ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð£Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð°Ð¼Ð° Ð½Ð¸Ñ?Ðµ Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñ?Ð¸Ð¾, Ñ?Ð±Ð¸Ñ?Ð°Ð¼..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Ð§ÐµÐºÐ°Ñ?Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸Ñ?Ð°Ð½ Ð¿Ñ?Ð¾Ñ?ÐµÑ? Ð£Ð±Ð¸Ñ?Ðµ Ñ?Ð¿Ð°Ð¼Ð° Ð¾Ð¼ÐµÑ?ÐµÐ½Ð¾, Ð¿Ñ?ÐµÐºÐ¸Ð´Ð°Ð¼..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Ð¦ÐµÐ² ÐºÐ° Ð£Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð°Ð¼Ð° Ñ?Ðµ Ð¿Ñ?ÐºÐ»Ð°, Ð¾Ð·Ð½Ð°ÐºÐ° Ð³Ñ?ÐµÑ?ÐºÐµ: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "Ð£Ð±Ð¸Ñ?Ð° Ñ?Ð¿Ð°Ð¼Ð° Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ð½. Ð?Ñ?Ð²Ð¾ Ð³Ð° Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ñ?Ñ?Ðµ."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ð?Ð²Ð¾ Ñ?Ðµ Ñ?Ñ?Ð¸Ð½Ð¸Ñ?Ð¸ Ð£Ð±Ð¸Ñ?Ñ? Ñ?Ð¿Ð°Ð¼Ð° Ð¿Ð¾Ñ?Ð·Ð´Ð°Ð½Ð¸Ñ?Ð¸Ð¼, Ð°Ð»Ð¸ Ñ?Ð¿Ð¾Ñ?Ð¸Ñ?Ð¸Ð¼"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "Ð£_ÐºÑ?Ñ?Ñ?Ð¸ Ð¼Ñ?ÐµÐ¶Ð½Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?Ðµ"
 
@@ -18914,75 +19805,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF Ð¾Ð±Ð»Ð¸Ðº (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Ð¤Ð¾Ñ?Ð¼Ð°Ñ?:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ? Ð½Ð° Ð´Ð¸Ñ?Ðº"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ñ? Ð±ÐµÐ»ÐµÑ?ÐºÑ? Ð½Ð° Ð´Ð¸Ñ?Ðº"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ð½Ð° Ð´Ð¸Ñ?Ðº"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Ð?Ð¾Ð´Ð¸ Ð?Ð°Ñ? ÐºÑ?Ð¾Ð· Ð¿Ñ?Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "Ð?Ð¾Ð±Ñ?Ð¾ Ð´Ð¾Ñ?Ð»Ð¸"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Ð?Ð¾Ð±Ñ?Ð¾ Ð´Ð¾Ñ?Ð»Ð¸ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?. Ð?ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð½Ð°Ñ?ÐµÐ´Ð½Ð¸Ñ? ÐµÐºÑ?Ð°Ð½Ð° Ñ?Ðµ Ð¾Ð¼Ð¾Ð³Ñ?Ñ?Ð¸Ñ?Ð¸ Ð´Ð° Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²ÐµÐ¶Ðµ Ð½Ð° Ð½Ð°Ð»Ð¾Ð³Ðµ ÐµÐ»ÐµÑ?Ñ?Ð¾Ð½Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ðµ Ð¸ Ð´Ð° Ñ?Ð²ÐµÐ·Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸Ð· Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°. \n"
-"\n"
-"Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ â??Ð?Ð°Ð¿Ñ?ÐµÐ´â?? Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ ÐºÐ¾Ñ?Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "Ð?Ð´ %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "Ð£Ð²Ð¾Ð¶ÐµÑ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°."
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "Ð¡Ð°Ñ?ÐµÐºÐ°Ñ?Ñ?Ðµ"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?ÐµÐ¼Ð° Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ?."
@@ -18996,27 +19838,31 @@ msgid "Thread messages by subject"
 msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐµ Ñ? Ñ?Ð°Ñ?Ð¿Ñ?Ð°Ð²Ð¸ Ð¿Ñ?ÐµÐ¼Ð° Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ?"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Ð?Ñ?Ð°_Ñ?Ð¸ Ñ?Ðµ Ð½Ð° Ð½Ð¸Ð·Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð¾ Ð½Ð°Ñ?Ð»Ð¾Ð²Ñ?"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
-msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð°Ñ?Ð¾Ð²Ð° ÐºÑ?Ñ?Ñ?Ð½Ð°-Ñ?ÐµÑ?/Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? ÐºÐ¾Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð¨Ð°Ð±Ð»Ð¾Ð½Ð° Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ñ? Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ð°Ñ?Ð¾Ð²Ð° ÐºÑ?Ñ?Ñ?Ð½Ð°-Ñ?ÐµÑ?/Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? ÐºÐ¾Ñ?Ðµ Ð¿Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð¨Ð°Ð±Ð»Ð¾Ð½Ð° Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ñ? "
+"Ñ?ÐµÐ»Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
 msgstr "Ð?Ñ?Ð¸ÐºÑ?Ñ?Ñ?Ð°Ðº Ð·Ð° Ð¾Ð±Ñ?Ð°Ð·Ð°Ñ? Ð½Ð°Ñ?Ñ?Ñ?Ð°"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "Ð?ÐµÐ· Ð·Ð²Ð°Ñ?Ð°"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? ÐºÐ°Ð¾ _Ñ?Ð°Ð±Ð»Ð¾Ð½"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "Ð§Ñ?Ð²Ð° ÐºÐ°Ð¾ Ñ?Ð°Ð±Ð»Ð¾Ð½"
 
@@ -19036,28 +19882,29 @@ msgstr "Ð£Ð³Ñ?ÐµÐ¶Ð´ÐµÐ½Ðµ Ð²Ð?Ð°Ñ?Ñ?Ðµ"
 msgid "Show vCards directly in mail messages."
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð²Ð?Ð°Ñ?Ñ?Ðµ Ð½ÐµÐ¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¾ Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÐ°Ð¼Ð°."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?Ð½Ñ? Ð²Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ð°Ð¶ÐµÑ?Ñ? Ð²Ð?Ð°Ñ?Ñ?Ñ?"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ?Ð¾Ñ? Ñ?ÐµÐ´Ð°Ð½ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ?Ð¾Ñ? %d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?."
 msgstr[1] "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ?Ð¾Ñ? %d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°."
 msgstr[2] "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ?Ð¾Ñ? %d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°."
+msgstr[3] "Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸ Ñ?Ð¾Ñ? %d ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ñ? Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?"
 
@@ -19073,11 +19920,11 @@ msgstr "WebDAV ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð° :"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Ð?Ð·Ð±ÐµÐ³Ð°Ð²Ð°Ñ? IfMatch (Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ð½Ð° Ð?Ð¿Ð°Ñ?Ñ? < 2.2.8)"
 
@@ -19118,13 +19965,15 @@ msgid "Default window width"
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸ ÐµÐºÑ?Ð¿Ñ?ÐµÑ?Ð½Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° HTTP/Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ð½ HTTP Ð¿Ñ?ÐµÐºÐ¾ Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"Ð?Ð¼Ð¾Ð³Ñ?Ñ?Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° ÐºÐ°Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð° HTTP/Ñ?Ð¸Ð³Ñ?Ñ?Ð°Ð½ HTTP Ð¿Ñ?ÐµÐºÐ¾ "
+"Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ?Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
@@ -19151,8 +20000,16 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Ð?Ð? Ð¸Ð»Ð¸ Ð°Ð»Ð¸Ñ?Ð°Ñ? Ð´ÐµÐ»Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ñ?."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr "Ð?ÐºÐ¾ Ñ?Ðµ Ñ?Ð°Ñ?Ð½Ð¾, Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?. Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ Ñ?Ðµ Ñ?Ð¸Ñ?Ð° Ð¸Ð· ÐºÑ?Ñ?Ñ?Ð° GConf â??/apps/evolution/shell/network_config/authentication_userâ??, Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¸Ð»Ð¸ Ð¸Ð· gnome-keyring, Ð¸Ð»Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ ~/.gnome2_private/Evolution."
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Ð?ÐºÐ¾ Ñ?Ðµ Ñ?Ð°Ñ?Ð½Ð¾, Ð¿Ð¾Ð²ÐµÐ·Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ñ?. Ð?Ð¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ "
+"Ð¸Ð¼Ðµ Ñ?Ðµ Ñ?Ð¸Ñ?Ð° Ð¸Ð· ÐºÑ?Ñ?Ñ?Ð° GConf â??/apps/evolution/shell/network_config/"
+"authentication_userâ??, Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¸Ð»Ð¸ Ð¸Ð· gnome-keyring, Ð¸Ð»Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ "
+"~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19167,15 +20024,20 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Ð?Ð¾Ð»Ð°Ð·Ð½Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð° Ð·Ð° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?Ð°Ð´ GtkFileChooser."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
-msgstr "Ð?Ð¾Ð»Ð°Ð·Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð° Ð°Ð»Ð°Ñ?ÐºÐµ Ñ?Ñ?Ð°ÐºÐµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. â??0â?? Ñ?Ðµ Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð°Ð¼Ð°, â??1â?? Ñ?Ðµ Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð¸Ð¼Ð°."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Ð?Ð¾Ð»Ð°Ð·Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð·Ð° Ð°Ð»Ð°Ñ?ÐºÐµ Ñ?Ñ?Ð°ÐºÐµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°. â??0â?? Ñ?Ðµ Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð°Ð¼Ð°, â??1â?? Ñ?Ðµ "
+"Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ? Ñ?Ð¿Ð¸Ñ?ÐºÐ¾Ð²Ð¸Ð¼Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ð° Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð°"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð¿Ñ?Ñ?Ð°Ñ?Ð° Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð·Ð° Ñ?Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð½Ð° Ð´Ð¸Ñ?ÐºÑ? Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -19207,8 +20069,15 @@ msgid "Secure HTTP proxy port"
 msgstr "Ð?Ð¾Ñ?Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ð³ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð·Ð° HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ð½ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°. Ð?Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ñ?Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ 0 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµâ??, 1 â??Ð±ÐµÐ· Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°â??, 2 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?Ñ?Ð½Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°â?? Ð¸ 3 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð¸â??."
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½Ð°Ñ?Ð¸Ð½ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°. Ð?Ð¾Ð´Ñ?Ð¶Ð°Ð½Ðµ Ñ?Ñ? Ð²Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ 0 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ "
+"Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ?ÐºÐµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµâ??, 1 â??Ð±ÐµÐ· Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°â??, 2 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?Ñ?Ð½Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° "
+"Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°â?? Ð¸ 3 â??ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° Ð½Ð° Ð°Ð´Ñ?ÐµÑ?Ð¸â??."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -19218,8 +20087,7 @@ msgstr "Ð?Ð¾Ñ?Ð½Ð° Ñ?Ñ?Ð°ÐºÐ° Ñ?Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
 msgid "Skip development warning dialog"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ¾Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?Ðµ Ñ?Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ð¾ Ñ?Ð°Ð·Ð²Ð¾Ñ?Ñ?"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Ð?Ð¾Ñ?Ð½Ð¸ Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
@@ -19228,8 +20096,12 @@ msgid "Statusbar is visible"
 msgstr "Ð¢Ñ?Ð°ÐºÐ° Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ñ?Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Ð?ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ, Ñ?Ð° Ð³Ð»Ð°Ð²Ð½Ð¸Ð¼/Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð½Ð¸Ð¼/Ð½Ð¸Ð²Ð¾Ð¾Ð¼ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° (Ð½Ð° Ð¿Ñ?Ð¸Ð¼ÐµÑ? â??2.6.0â??)."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Ð?ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ, Ñ?Ð° Ð³Ð»Ð°Ð²Ð½Ð¸Ð¼/Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð½Ð¸Ð¼/Ð½Ð¸Ð²Ð¾Ð¾Ð¼ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° (Ð½Ð° "
+"Ð¿Ñ?Ð¸Ð¼ÐµÑ? â??2.6.0â??)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -19252,8 +20124,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð° Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ, Ñ? Ð¿Ð¸ÐºÑ?ÐµÐ»Ð¸Ð¼Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ð° Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ, Ñ?Ð° Ð³Ð»Ð°Ð²Ð½Ð¸Ð¼/Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð½Ð¸Ð¼/Ð½Ð¸Ð²Ð¾Ð¾Ð¼ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° (Ð½Ð° Ð¿Ñ?Ð¸Ð¼ÐµÑ? â??2.6.0â??)."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Ð?Ð¾Ñ?Ð»ÐµÐ´Ñ?Ð° Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ñ?ÐµÐ½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ, Ñ?Ð° Ð³Ð»Ð°Ð²Ð½Ð¸Ð¼/Ñ?Ð¿Ð¾Ñ?ÐµÐ´Ð½Ð¸Ð¼/"
+"Ð½Ð¸Ð²Ð¾Ð¾Ð¼ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° (Ð½Ð° Ð¿Ñ?Ð¸Ð¼ÐµÑ? â??2.6.0â??)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -19268,24 +20144,50 @@ msgid "The machine name to proxy socks through."
 msgstr "Ð?Ð°Ð·Ð¸Ð² Ð¼Ð°Ñ?Ð¸Ð½Ðµ Ð·Ð° Ð¿Ñ?Ñ?Ñ?Ð°Ñ?Ðµ socks Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
-msgstr "Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/http_hostâ?? ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/http_hostâ?? "
+"ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
-msgstr "Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/secure_hostâ?? ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/secure_hostâ?? "
+"ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
-msgstr "Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/socks_hostâ?? ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Ð?Ð¾Ñ?Ñ? Ð½Ð° Ð¼Ð°Ñ?Ð¸Ð½Ð¸ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½ Ñ? â??/apps/evolution/shell/network_config/socks_hostâ?? "
+"ÐºÐ¾Ñ?Ð¸ Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸Ðº Ð¿Ñ?Ñ?Ñ?Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "Ð¡Ñ?Ð¸Ð» Ð´Ñ?Ð³Ð¼Ð°Ð´Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°. Ð?Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ â??textâ?? (Ñ?ÐµÐºÑ?Ñ?), â??iconsâ?? (Ð¸ÐºÐ¾Ð½Ðµ), â??bothâ?? (Ð¾Ð±Ð¾Ñ?Ðµ), â??toolbarâ?? (Ñ?Ñ?Ð°ÐºÐ° Ð°Ð»Ð°Ñ?Ð°). Ð?ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ â??toolbarâ??, Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ñ?Ð°ÐºÐµ Ð°Ð»Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ð»."
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"Ð¡Ñ?Ð¸Ð» Ð´Ñ?Ð³Ð¼Ð°Ð´Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°. Ð?Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ â??textâ?? (Ñ?ÐµÐºÑ?Ñ?), â??iconsâ?? (Ð¸ÐºÐ¾Ð½Ðµ), "
+"â??bothâ?? (Ð¾Ð±Ð¾Ñ?Ðµ), â??toolbarâ?? (Ñ?Ñ?Ð°ÐºÐ° Ð°Ð»Ð°Ñ?Ð°). Ð?ÐºÐ¾ Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ â??toolbarâ??, "
+"Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¾ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ñ?Ð°ÐºÐµ Ð°Ð»Ð°Ñ?Ð° Ñ?Ñ?Ð²Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ð»."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-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 (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr "Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸, Ð±ÐµÐ· ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð° Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° (Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð°Ð½). Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð¸, Ð´Ð¾Ð¼ÐµÐ½Ð¸ (Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¾Ð¼ Ñ?Ð¾ÐºÐµÑ?Ð° Ð¿Ð¾Ð¿Ñ?Ñ? *.foo.com), IP Ð°Ð´Ñ?ÐµÑ?Ðµ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð° (IPv4 Ð¸ IPv6) Ð¸ Ð¼Ñ?ÐµÐ¶Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð°Ñ?ÐºÐ¾Ð¼ (Ð½ÐµÑ?Ñ?Ð¾ ÐºÐ°Ð¾ 192.168.0.0/24)."
+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 "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"Ð?Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ñ?Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð½Ð¾ Ð¿Ð¾Ð²ÐµÐ·Ð°Ð½Ð¸, Ð±ÐµÐ· ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð° "
+"Ð¿Ð¾Ñ?Ñ?ÐµÐ´Ð½Ð¸ÐºÐ° (Ñ?ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð°Ð½). Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð¸ Ð¼Ð¾Ð³Ñ? Ð±Ð¸Ñ?Ð¸ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð¸, Ð´Ð¾Ð¼ÐµÐ½Ð¸ "
+"(Ñ?Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð¾Ð¼ Ñ?Ð¾ÐºÐµÑ?Ð° Ð¿Ð¾Ð¿Ñ?Ñ? *.foo.com), IP Ð°Ð´Ñ?ÐµÑ?Ðµ Ð´Ð¾Ð¼Ð°Ñ?Ð¸Ð½Ð° (IPv4 Ð¸ IPv6) Ð¸ "
+"Ð¼Ñ?ÐµÐ¶Ð½Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ Ñ?Ð° Ð¼Ð°Ñ?ÐºÐ¾Ð¼ (Ð½ÐµÑ?Ñ?Ð¾ ÐºÐ°Ð¾ 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -19324,8 +20226,11 @@ msgid "Whether the toolbar should be visible."
 msgstr "Ð?Ð° Ð»Ð¸ Ð´Ð° Ñ?Ñ?Ð°ÐºÐ° Ð°Ð»Ð°Ñ?Ð° Ð±Ñ?Ð´Ðµ Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?Ðµ Ñ?Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ñ? Ñ?Ð°Ð·Ð²Ð¾Ñ?Ð½Ð¸Ð¼ Ð²ÐµÑ?Ð·Ð¸Ñ?Ð°Ð¼Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ñ?Ðµ Ñ?Ð° Ñ?Ð¿Ð¾Ð·Ð¾Ñ?ÐµÑ?ÐµÐ¼ Ñ? Ñ?Ð°Ð·Ð²Ð¾Ñ?Ð½Ð¸Ð¼ Ð²ÐµÑ?Ð·Ð¸Ñ?Ð°Ð¼Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ "
+"Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð°Ð½Ð¾."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
@@ -19339,146 +20244,46 @@ msgstr "Ð¡Ñ?Ð¸Ð» Ð´Ñ?Ð³Ð¼Ð°Ð´Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
 msgid "Window buttons are visible"
 msgstr "Ð?Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
 
-#: ../shell/e-shell-content.c:577
-#: ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../shell/e-shell-migrate.c:287
-#: ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:921
 msgid "Sho_w:"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°_Ð¶Ð¸: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
 msgid "Sear_ch:"
 msgstr "Ð?_Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr " _Ñ? "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ñ?Ð°ÐºÐµ Ð°Ð»Ð°Ñ?Ð°"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Ð¡Ñ?Ð¸Ð» Ð¿Ð°Ð»ÐµÑ?Ðµ Ð°Ð»Ð°Ñ?Ð° Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð°"
-
-#: ../shell/e-shell-switcher.c:465
-#: ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Ð¢Ñ?Ð°ÐºÐ° Ð°Ð»Ð°Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "Ð²Ð?Ð°Ñ?Ñ?Ð° (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "Ð¸Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ? (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Ð¡Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Ð Ð°Ð´Ñ?Ð° Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð°"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "Ð Ð°Ð´Ñ?Ð° Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð·Ð° Ð¾Ð²Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Ð?Ñ?Ð¾Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Ð?Ñ?Ð¾Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ ÐºÑ?Ð¸Ð¶Ð¸Ñ?Ðµ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Ð?Ñ?Ð°Ð²Ð¸Ð»Ð¾ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Ð£Ñ?Ð»Ð¾Ð² Ð·Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ðµ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "Ð?Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?ÐºÐ¸ EShellBackend Ð·Ð° Ð¾Ð²Ð°Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð°"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ? Ð´ÐµÑ?Ð½Ð¾Ñ? Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ð±Ð¾Ñ?Ð½Ðµ Ñ?Ñ?Ð°ÐºÐµ"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ñ? Ð»ÐµÐ²Ð¾Ñ? Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ñ?Ñ?Ð°ÐºÐµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "Ð?Ð¸Ñ?ÐµÑ? Ñ?Ñ?Ð°ÐºÐµ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ñ?Ñ?Ðµ Ð½Ð° Ð´Ð½Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Ð?Ñ?Ð¾Ð·Ð¾Ñ? Ñ?ÐºÐ¾Ñ?ÐºÐµ"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "Ð?Ñ?Ð¾Ð·Ð¾Ñ? ÐºÐ¾Ð¼Ðµ Ð¿Ñ?Ð¸Ð¿Ð°Ð´Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "Ð?Ñ?Ñ?Ñ? ÐºÐ¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ñ?Ð°Ñ?Ðµ Ð²Ð¸Ñ?ÐµÑ?Ð°"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Ð?Ð°Ñ?Ð»Ð¾Ð² Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "Ð?Ð? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "Ð?Ð? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ð³ GAL Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19494,407 +20299,302 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Ð?ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "Ð?Ñ?Ð±Ð°Ð¶Ð´Ð°Ñ?Ð¸Ð½ Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð½Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "Ð?Ñ?Ð±Ð°Ð¶Ð´Ð°Ñ?Ð¸Ð½ Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?."
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "Ð?Ð½Ð¾Ð¼Ð¾Ð² Ð?Ð¸Ð»Ð¾Ñ? Ð½Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½."
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "Ð?Ð½Ð¾Ð¼Ð¾Ð² Ð?Ð¸Ð»Ð¾Ñ? Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±Ð¸Ñ?Ð¸ Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?."
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¾ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "_Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "_Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð¸Ð½Ð¾ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¾ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð¾"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "Ð?Ð¾Ð¼Ð¾Ñ? Ð·Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð° Ð²ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ñ? Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¾ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?Ð°Ð½Ð¸Ð¼ Ð¿Ð¸Ñ?Ð°Ñ?Ð¸Ð¼Ð°"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "Ð?Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸ _Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "Ð?Ð°Ð±Ð¾Ñ?Ð°Ð²Ð¸ Ñ?Ð²Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "_Ð£Ð²ÐµÐ·Ð¸..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸Ð· Ð´Ñ?Ñ?Ð³Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "Ð?Ð¾Ð² Ð¿_Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð° Ð½Ð¾Ð² Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¾Ð²Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "_Ð?Ñ?Ð°Ñ?ÐºÐ¸ Ð¿Ð¾Ð´Ñ?ÐµÑ?Ð½Ð¸Ðº"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "Ð?Ð·Ð»Ð°Ð·Ð°Ðº Ð¸Ð· Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "_Ð?Ð°Ð¿Ñ?ÐµÐ´Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "Ð?Ð±Ñ?Ð°Ð·Ñ?Ñ? Ð½Ð°Ð¿Ñ?ÐµÐ´Ð½Ð¸Ñ?Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "Ð?Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "_Ð£Ñ?ÐµÐ´Ð¸ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð° Ð?Ð°Ñ?Ð¸Ð¼ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð½Ð¸Ð¼ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ð°Ð¼Ð°"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ð¸Ñ?Ðµ Ð²Ñ?Ñ?Ñ?Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "Ð?Ñ?Ð¾_Ð½Ð°Ñ?Ð¸ Ñ?Ð°Ð´Ð°"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "Ð?Ð·Ð²Ñ?Ñ?Ð¸ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "Ð¡Ð»Ð°Ñ?Ðµ / Ð¿_Ñ?Ð¸Ð¼Ð°Ñ?Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "Ð¨Ð°Ñ?Ðµ Ð¿Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ñ?ÐµÐ½Ðµ Ð¸ Ð´Ð¾Ð²Ð»Ð°Ñ?Ð¸ Ð½Ð¾Ð²Ðµ Ñ?Ñ?Ð°Ð²ÐºÐµ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ _Ð³Ñ?ÐµÑ?Ñ?Ð¸..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ Ð³Ñ?ÐµÑ?Ñ?Ð¸ Ð?Ñ?Ð±Ð°Ð¶Ð´Ð°Ñ?Ð¸Ð½Ð¸Ð¼ Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸ÐºÐ¾Ð¼"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "_Ð£Ñ?ÐºÐ»Ð°Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ð° Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¸Ð¼ Ð?Ð¸Ð»Ð¾Ñ?Ð¾Ð¼..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸ Ð?Ð½Ð¾Ð¼Ð¾Ð²Ð¾Ð³ Ð?Ð¸Ð»Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "Ð Ð°_Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ? Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "_Ð Ð°Ð´ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ? Ñ?Ð°Ð´ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "_Ð Ð°Ñ?Ð¿Ð¾Ñ?ÐµÐ´"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "_Ð?Ð¾Ð²Ð¾"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "_Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "Ð?Ð·Ð³Ð»ÐµÐ´ _Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "Ð?Ñ?Ð¾_Ð·Ð¾Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð±Ð¾Ñ?Ð½Ñ? _Ñ?Ñ?Ð°ÐºÑ?"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð±Ð¾Ñ?Ð½Ñ? Ñ?Ñ?Ð°ÐºÑ?"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð´Ñ?Ð³Ð¼Ð°Ð´"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð°ÐºÑ? _Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð°ÐºÑ? Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð°ÐºÑ? _Ð°Ð»Ð°Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ñ?Ñ?Ð°ÐºÑ? Ð°Ð»Ð°Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "Ð¡Ð°Ð¼Ð¾ _Ð¸ÐºÐ¾Ð½Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð°Ð¼Ð°"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "Ð¡Ð°Ð¼Ð¾ _Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð°Ð¼Ð¾ Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "Ð?ÐºÐ¾Ð½Ðµ _Ð¸ Ñ?ÐµÐºÑ?Ñ?"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ñ?Ð° Ð¸ÐºÐ¾Ð½Ð°Ð¼Ð° Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð¾Ð¼"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "Ð¡Ñ?Ð¸Ð» Ñ?Ñ?Ð°_ÐºÐµ Ð°Ð»Ð°Ñ?Ð°"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ñ?ÐµÐ°ÐºÐµ Ð°Ð»Ð°Ñ?Ð° Ñ?Ð°Ð´Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸Ð½Ðµ"
+msgstr ""
+"Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?ÐµÐ¼ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ñ?ÐµÐ°ÐºÐµ Ð°Ð»Ð°Ñ?Ð° Ñ?Ð°Ð´Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸Ð½Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ðµ..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð¸Ð»Ð¸ Ð¼ÐµÑ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ðµ"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "Ð§Ñ?Ð²Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ñ?ÐºÐ¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "Ð¢_Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "Ð¢Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ñ?Ðµ ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ð¾Ð´ÐµÑ?Ð¸Ð¾"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "Ð?Ð·Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ñ?Ñ?Ð°Ð¼Ð¿Ð°Ñ?"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ð½Ð° %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "Ð?Ð·Ð²Ñ?Ñ?Ð¸ Ð¾Ð²Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð°"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "Ð?Ð¾Ð²Ð¾"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Ð?ÐºÑ?Ð¸Ð²Ð°Ð½ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Ð?Ð¼Ðµ Ð°ÐºÑ?Ð¸Ð²Ð½Ð¾Ð³ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "EFocusTracker Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-window.c:646
-#: ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Ð?ÐµÐ¾Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ð°"
-
-#: ../shell/e-shell-window.c:647
-#: ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "Ð?Ð¾Ñ?ÐµÑ?Ð½Ð¸ Ð½Ð¸Ð· Ð³ÐµÐ¾Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ð¼ Ñ?ÐµÐ¶Ð¸Ð¼Ñ?"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "Ð?Ð¾Ñ?Ð½Ð° Ñ?Ñ?Ð°ÐºÐ° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð±Ð¾Ñ?Ð½Ð° Ñ?Ñ?Ð°ÐºÐ° Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ñ? Ð´Ñ?Ð³Ð¼Ð°Ð´ Ð¿Ñ?ÐµÐ±Ð°Ñ?Ð¸Ð²Ð°Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Ð¢Ñ?Ð°ÐºÐ° Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ñ?Ñ?Ð°ÐºÐ° Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ñ?Ñ?Ð°ÐºÐ° Ð°Ð»Ð°Ñ?Ð° Ð²Ð¸Ð´Ñ?Ð¸Ð²Ð°"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Ð£Ð¿Ñ?Ð°Ð²Ð½Ð¸Ðº Ñ?Ð°Ð´Ð½Ð¾Ð³ Ð¾ÐºÑ?Ñ?Ð¶ÐµÑ?Ð°"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "GtkUIManager Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð° Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð° Ð·Ð° Ñ?Ð°Ð´ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "Ð?Ñ?Ð¸Ð¿Ñ?ÐµÐ¼Ð° Ð·Ð° ÐºÑ?Ð°Ñ?..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð¼Ð¾Ð´Ñ?Ð»Ð°"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð·Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "Ð?Ñ?ÐµÐ¶Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ð¼Ñ?ÐµÐ¶Ð° Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°"
-
-#: ../shell/e-shell.c:851
-#: ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Ð?Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Ð?Ð° Ð»Ð¸ Ñ?Ðµ Ñ?ÐºÐ¾Ñ?ÐºÐ° Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19929,7 +20629,7 @@ msgstr ""
 "Ð?Ð°Ð´Ð°Ð¼Ð¾ Ñ?Ðµ Ð´Ð° Ñ?ÐµÑ?Ðµ Ñ?Ð¶Ð¸Ð²Ð°Ñ?Ð¸ Ñ? Ð¿Ð»Ð¾Ð´Ð¾Ð²Ð¸Ð¼Ð° Ð½Ð°Ñ?ÐµÐ³ Ð½Ð°Ð¿Ð¾Ñ?Ð½Ð¾Ð³ Ñ?Ð°Ð´Ð°, Ð¸ \n"
 "Ð¶ÐµÑ?Ð½Ð¾ Ð¸Ñ?Ñ?ÐµÐºÑ?Ñ?ÐµÐ¼Ð¾ Ð?Ð°Ñ? Ð´Ð¾Ð¿Ñ?Ð¸Ð½Ð¾Ñ?!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19937,61 +20637,56 @@ msgstr ""
 "Ð¥Ð²Ð°Ð»Ð°\n"
 "Ð¢Ð¸Ð¼ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "Ð?ÐµÐ¼Ð¾Ñ? Ð¼Ð¸ Ð¿Ð¾Ð½Ð¾Ð²Ð¾ Ñ?ÐµÑ?Ð¸"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ñ?Ð· Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð¸ Ð´ÐµÐ¾"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸ Ð´Ð°Ñ?Ñ? Ð³ÐµÐ¾Ð¼ÐµÑ?Ñ?Ð¸Ñ?Ñ? Ð½Ð° Ð³Ð»Ð°Ð²Ð½Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "Ð?Ð¾Ñ?Ð½Ð¸ Ñ?Ð°Ð´ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
 
-#: ../shell/main.c:330
-#| msgid "Start in online mode"
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "Ð?Ð¾Ñ?Ð½Ð¸ Ñ? â??ÐµÐºÑ?Ð¿Ñ?ÐµÑ?Ð½Ð¾Ð¼â?? Ñ?ÐµÐ¶Ð¸Ð¼Ñ?"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Ð¡Ð¸Ð»Ð¾Ð¼ Ñ?Ð³Ð°Ñ?Ð¸ Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Ð?Ñ?Ð¸Ð¼Ð¾Ñ?Ð°Ñ? Ð¿Ð¾Ð½Ð¾Ð²Ð°Ð½ Ð¿Ñ?ÐµÐ½Ð¾Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸Ð· Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:341
 msgid "Send the debugging output of all components to a file."
 msgstr "Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸Ð·Ð»Ð°Ð· Ð¾ Ð³Ñ?ÐµÑ?ÐºÐ°Ð¼Ð° Ð¸Ð· Ñ?Ð²Ð¸Ñ? Ð´ÐµÐ»Ð¾Ð²Ð° Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ Ñ?Ð²Ð¸Ñ? Ð´Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Ð?Ð½ÐµÐ¼Ð¾Ð³Ñ?Ñ?Ð°Ð²Ð° Ð¾ÐºÐ½Ð¾ Ð·Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´ Ð¿Ð¾Ñ?Ñ?Ðµ, ÐºÐ¾Ð½Ñ?Ð°ÐºÐ°Ñ?Ð° Ð¸ Ð·Ð°Ð´Ð°Ñ?Ð°ÐºÐ°."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð°Ð´Ñ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð´Ð°Ñ?Ð¸Ñ? ÐºÐ°Ð¾ Ð¾Ñ?Ñ?Ð°Ñ?Ð°Ðº Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð°."
 
 # shell:noshell-reason title
-#: ../shell/main.c:350
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "Ð?Ð°Ñ?Ñ?ÐµÐ²Ð°Ñ? ÐºÑ?Ð°Ñ? Ð¿Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð¾Ð³ Ð¿Ñ?Ð¾Ñ?ÐµÑ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ñ?ÐºÐ¾Ð²Ð¾Ð´Ð¸Ð»Ð°Ñ? Ð»Ð¸Ñ?Ð½Ð¸Ð¼ Ð¿Ð¾Ð´Ð°Ñ?Ð°Ñ?Ð¸Ð¼Ð° Ð¸ ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ? Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20004,87 +20699,59 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Ð¡Ð¸Ð³Ñ?Ñ?Ð½Ð¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð±Ñ?Ð´Ñ? Ð·Ð°Ð±Ð¾Ñ?Ð°Ð²Ñ?ÐµÐ½Ðµ?"
 
+# shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð²Ð¸"
+#, fuzzy
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸Ð· Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ {0}?"
 
-# shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸Ð· Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ {0}?"
+#, fuzzy
+#| msgid "Continue"
+msgid "Continue Anyway"
+msgstr "Ð?Ð°Ñ?Ñ?Ð°Ð²Ð¸"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "Ð?Ð°Ð±Ð¾Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ñ?Ðµ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ. Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ñ?ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ñ?Ñ? Ð±Ñ?Ð´Ñ? Ð±Ð¸Ð»Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ."
-
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Ð?ÐµÐ´Ð¾Ð²Ð¾Ñ?Ð½Ð¾ Ð¼ÐµÑ?Ñ?Ð° Ð½Ð° Ð´Ð¸Ñ?ÐºÑ? Ð·Ð° Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ð´Ñ?Ñ?."
-
-# shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Ð?Ð°Ð¸Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ?"
-
-#: ../shell/shell.error.xml.h:8
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 msgstr ""
-"Ð¦ÐµÐ¾ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ &quot;evolution&quot; Ñ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ð¾Ð±Ñ?Ð¸Ñ?Ð°Ð½.\n"
-"\n"
-"Ð¡Ð°Ð²ÐµÑ?Ñ?Ñ?ÐµÐ¼Ð¾ Ð´Ð° Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð° Ð»Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°, ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð¸ Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?, Ð¸ Ð´Ð° Ð»Ð¸ Ð¾Ð²Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?Ð°Ð´Ð¸ Ð¿Ñ?Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð°Ñ?Ð¸Ñ? Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°.\n"
-"\n"
-"Ð?Ð¾Ñ?Ð»Ðµ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ð°, Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ñ?Ðµ Ð²Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð±ÐµÐ· Ñ?Ñ?Ñ?Ð½Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð²ÐµÐ½Ñ?Ð¸Ñ?Ðµ.\n"
 
-#: ../shell/shell.error.xml.h:14
+#: ../shell/shell.error.xml.h:5
 msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
 msgstr ""
-"Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ñ?Ð¼ÐµÑ?Ñ?Ð°Ð»Ð° Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð½Ð° Ð´Ñ?Ñ?Ð³Ñ? Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ñ?.\n"
-"\n"
-"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ, Ñ?ÐµÐ¾ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð° &quot;evolution&quot; Ð±Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ñ?Ð½Ð¾ Ñ?ÐºÐ»Ð¾Ñ?ÐµÐ½. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ñ?Ðµ Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ð·Ð°Ð´Ñ?Ð¶Ð¸Ñ?Ðµ Ð¾Ð²Ðµ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ, Ð¼Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ñ?Ñ?Ñ?Ð½Ð¾ Ð´Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ñ?Ðµ Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¸Ð· &quot;evolution&quot; ÐºÐ°Ð´Ð° Ð?Ð°Ð¼ Ð¾Ð´Ð³Ð¾Ð²Ð°Ñ?Ð°.\n"
+"Ð?Ð°Ð±Ð¾Ñ?Ð°Ð²Ñ?Ð°Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¸ Ñ?Ðµ Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ð¸ Ñ?Ð²Ðµ Ð·Ð°Ð¿Ð°Ð¼Ñ?ÐµÐ½Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ. Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ñ?ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ "
+"Ñ?Ð¿Ð¸Ñ?Ð°Ð½Ð¸ ÐºÐ°Ð´Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ð¿Ñ?Ñ? Ð±Ñ?Ð´Ñ? Ð±Ð¸Ð»Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ðµ."
 
-#: ../shell/shell.error.xml.h:18
+#: ../shell/shell.error.xml.h:7
+#, fuzzy
+#| msgid "Quit"
+msgid "Quit Now"
+msgstr "Ð?Ð·Ð°Ñ?Ð¸"
+
+#: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
 msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð° Ð½Ð°Ð´Ð¾Ð³Ñ?Ð°Ð´Ñ?Ð° Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ðµ Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you can continue."
-msgstr ""
-"Ð?Ð°Ð´Ð¾Ð³Ñ?Ð°Ð´Ñ?Ð° Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸ Ñ?Ðµ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð°Ñ?Ð¸ Ð´Ð¾ {0} Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ?Ð° Ð½Ð° Ð´Ð¸Ñ?ÐºÑ?, Ð°Ð»Ð¸ Ð¸Ð¼Ð°Ñ?Ðµ Ð½Ð° Ñ?Ð°Ñ?Ð¿Ð¾Ð»Ð°Ð³Ð°Ñ?Ñ? Ñ?Ð°Ð¼Ð¾ {1}.\n"
-"\n"
-"Ð?Ð¾Ñ?Ð°Ñ?ÐµÑ?Ðµ Ð´Ð° Ð¾Ñ?Ð»Ð¾Ð±Ð¾Ð´Ð¸Ñ?Ðµ Ð²Ð¸Ñ?Ðµ Ð¼ÐµÑ?Ñ?Ð° Ñ? Ð»Ð¸Ñ?Ð½Ð¾Ñ? Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ð¸ Ð¿Ñ?Ðµ Ð½ÐµÐ³Ð¾ Ñ?Ñ?Ð¾ Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "Ð?Ð°_Ð±Ð¾Ñ?Ð°Ð²Ð¸"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_Ð?Ð°Ð´Ñ?Ð¶Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Ð?Ð¾Ð´Ñ?ÐµÑ?Ð¸ Ð¼Ðµ ÐºÐ°Ñ?Ð½Ð¸Ñ?Ðµ"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{0}\n"
 "\n"
-"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð¸Ñ?Ðµ Ð½ÐµÐºÐ¸Ð¼ Ñ?Ñ?Ð°Ñ?Ð¸Ð¼ Ð¿Ð¾Ð´Ð°Ñ?Ð¸Ð¼Ð°.\n"
+"Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¾Ð´Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð´Ð° Ð½Ð°Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ðµ, Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?ÐµÑ?Ðµ Ð¼Ð¾Ñ?Ð¸ Ð´Ð° Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð¿Ð¸Ñ?Ðµ Ð½ÐµÐºÐ¸Ð¼ Ñ?Ñ?Ð°Ñ?Ð¸Ð¼ "
+"Ð¿Ð¾Ð´Ð°Ñ?Ð¸Ð¼Ð°.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -20167,7 +20834,7 @@ msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð°:"
 msgid "Show session management options"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ?Ð° Ñ?ÐµÑ?Ð¸Ñ?Ð¾Ð¼"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20179,74 +20846,96 @@ msgstr ""
 "Ð£Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ð°:"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð¾ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¾Ð½Ð´Ð° Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸ Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð¾Ð²Ð´Ðµ Ð½Ðµ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð¸Ñ?Ðµ"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"Ð?Ð¾Ñ?Ñ?Ð¾ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¾Ð½Ð´Ð° Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸ Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? "
+"Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð¾Ð²Ð´Ðµ Ð½Ðµ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð¸Ñ?Ðµ"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð¾ Ð½Ðµ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¾Ð½Ð´Ð° Ð½Ðµ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð¸ Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð¾Ð²Ð´Ðµ Ð½Ðµ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð¸Ñ?Ðµ"
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"Ð?Ð¾Ñ?Ñ?Ð¾ Ð½Ðµ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¾Ð½Ð´Ð° Ð½Ðµ Ð²ÐµÑ?Ñ?Ñ?ÐµÑ?Ðµ Ð½Ð¸ Ñ? "
+"Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð¾Ñ?Ð¸Ð¼ Ð°ÐºÐ¾ Ð¾Ð²Ð´Ðµ Ð½Ðµ Ð½Ð°Ð·Ð½Ð°Ñ?Ð¸Ñ?Ðµ Ð´Ñ?Ñ?Ð³Ð°Ñ?Ð¸Ñ?Ðµ"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð·Ð° Ñ?Ð²Ð¾Ð·..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Ð¡Ð²Ðµ PKCS12 Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Ð¡Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#, fuzzy
+#| msgid "Imported Certificate"
+msgid "Failed to import user's certificate"
+msgstr "Ð£Ð²ÐµÐ¶ÐµÐ½ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Ð?Ð¼Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Ð?Ð°Ð¼ÐµÐ½Ðµ"
 
-#: ../smime/gui/certificate-manager.c:292
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Ð¡ÐµÑ?Ð¸Ñ?Ñ?ÐºÐ¸ Ð±Ñ?Ð¾Ñ?"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "Ð?Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Ð¡Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to import contact's certificate"
+msgstr "Ð?ÐµÑ?Ñ?Ð¿ÐµÐ»Ð¾ Ð±Ñ?Ð¸Ñ?Ð°Ñ?Ðµ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "Ð?Ð»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÐ° Ð°Ð´Ñ?ÐµÑ?Ð°"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Ð¡Ð²Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ CA Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr ""
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Ð£Ð½ÐµÑ?Ð¸Ñ?Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑ? Ð·Ð° â??%sâ??"
 
 #. we're setting the password initially
@@ -20277,7 +20966,7 @@ msgstr ""
 "Ð?Ð·Ð´Ð°Ð¾:\n"
 "  Ð?Ð°Ñ?Ð»Ð¾Ð²: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
 
@@ -20290,179 +20979,173 @@ msgid "Authorities"
 msgstr "Ð?Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ð¸"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð°"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
+#, fuzzy
+#| msgid "Backup All"
+msgid "Backup _All"
 msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð° Ñ?Ð²ÐµÐ³Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "Ð?Ñ?Ðµ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð° Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¿Ñ?Ð²Ð¾ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ñ?ÐµÐ³Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?, Ð¿Ð¾Ð»Ð¸Ñ?Ð¸ÐºÑ? Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÐ´Ñ?Ñ?Ðµ (Ð°ÐºÐ¾ Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸)."
+#: ../smime/gui/smime-ui.ui.h:4
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Ð?Ñ?Ðµ Ð²ÐµÑ?Ð¾Ð²Ð°Ñ?Ð° Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°, Ð¿Ñ?Ð²Ð¾ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ñ?ÐµÐ³Ð¾Ð² Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?, "
+"Ð¿Ð¾Ð»Ð¸Ñ?Ð¸ÐºÑ? Ð¸ Ð¿Ñ?Ð¾Ñ?ÐµÐ´Ñ?Ñ?Ðµ (Ð°ÐºÐ¾ Ñ?Ñ? Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¸)."
 
-#: ../smime/gui/smime-ui.ui.h:6
-#: ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Ð?Ð¾Ð²ÐµÑ?ÐµÑ?Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Ð?Ð¾Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Ð¥Ð¸Ñ?ÐµÑ?Ð°Ñ?Ñ?Ð¸Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Ð?ÐµÑ?Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "Ð?Ð°Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ¾ Ð¸Ð¼Ðµ (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸ ÐºÐ¾Ð½Ñ?Ð°ÐºÑ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ð?Ðµ Ð²ÐµÑ?Ñ?Ñ? Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ð° Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ñ?Ð¸Ð¼Ð°Ð¾Ñ?Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸ÐºÐ° Ðµ-Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "Ð?Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Ð?Ñ?Ð¸Ñ?Ñ?Ð¸"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Ð£Ð²ÐµÐ·Ð¸"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Ð?Ð·Ð´Ð°Ñ?Ð¾ Ð¾Ð´"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Ð?Ð·Ð´Ð°Ñ?"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Ð?Ð·Ð´Ð°Ñ?Ð¾ Ð·Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 Ð¾Ñ?Ð¸Ñ?Ð°Ðº"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ð° (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Ð?Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ð¾Ð½Ð° Ñ?ÐµÐ´Ð¸Ð½Ð¸Ñ?Ð° (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Ð¾Ñ?Ð¸Ñ?Ð°Ðº"
 
-#: ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? SSL ÐºÐ»Ð¸Ñ?ÐµÐ½Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:33
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? SSL Ñ?ÐµÑ?Ð²ÐµÑ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Ð?Ð²Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ñ?Ðµ Ð¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½ Ð·Ð° Ð½Ð°Ñ?ÐµÐ´Ð½Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ðµ:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Ð?ÐµÑ?Ñ?Ñ? Ñ? Ð°Ñ?Ñ?ÐµÐ½Ñ?Ð¸Ñ?Ð½Ð¾Ñ?Ñ? Ð¾Ð²Ð¾Ð³ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Ð?ÐµÑ?Ñ?Ñ? Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ?Ðµ Ðµ-Ð°Ð´Ñ?ÐµÑ?Ð°."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Ð?ÐµÑ?Ñ?Ñ? Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÑ?Ð°."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
 msgstr "Ð?ÐµÑ?Ñ?Ñ? Ð¾Ð²Ð¾Ð¼ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ð·Ð° Ð¿Ñ?ÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ?Ðµ Ð²ÐµÐ± Ñ?Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð°."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Ð?Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ñ?Ñ?"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Ð?Ð¼Ð°Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ Ð¾Ð²Ð¸Ñ? Ð¾Ñ?Ð³Ð°Ð½Ð¸Ð·Ð°Ñ?Ð¸Ñ?Ð° ÐºÐ¾Ñ?Ð¸ Ð²Ð°Ñ? Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ñ?:"
 
-#: ../smime/gui/smime-ui.ui.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../smime/gui/smime-ui.ui.h:40
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "Ð?Ñ?Ð¶Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ ÐºÐ¾Ñ?Ð¸ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ñ? Ð¾Ð²Ðµ Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "Ð?Ñ?Ð¶Ð¸Ñ?Ðµ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ðµ ÐºÐ¾Ñ?Ð¸ Ð¾Ð´Ñ?ÐµÑ?Ñ?Ñ?Ñ? Ð¾Ð²Ðµ Ð¾Ñ?Ð¾Ð±Ðµ:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "Ð?Ð°Ñ?Ð¸ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+#| msgid "Backup"
+msgid "_Backup"
+msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð°"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "_Ð£Ñ?ÐµÐ´Ð¸ Ð¿Ð¾Ð²ÐµÑ?ÐµÑ?Ðµ Ñ? CA"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "Ð¡ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ? Ð²ÐµÑ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸"
 
-#: ../smime/lib/e-cert.c:228
-#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
@@ -20503,129 +21186,149 @@ msgstr "PKCS #1 MD5 Ñ?Ð° RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?ÐµÐ¼"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 Ñ?Ð° RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?ÐµÐ¼"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 Ñ?Ð° RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?ÐµÐ¼"
+
+#: ../smime/lib/e-cert.c:642
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 Ñ?Ð° RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?ÐµÐ¼"
+
+#: ../smime/lib/e-cert.c:645
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 Ñ?Ð° RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?ÐµÐ¼"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ñ?Ðµ"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Ð£Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð° ÐºÑ?Ñ?Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape Ñ?Ð¸Ð¿ Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? ÐºÑ?Ñ?Ñ?Ð° Ð¸Ð·Ð´Ð°Ð²Ð°Ð¾Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð° (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "Ð?Ð´Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð°"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Ð?Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð¸ Ð°Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð¼Ð°"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Ð?Ð¾Ð´Ð°Ñ?Ð¸ Ð¾ Ñ?Ð°Ð²Ð½Ð¾Ð¼ ÐºÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ð±Ñ?ÐµÐºÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Ð?Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ñ?Ð°Ð²Ð½Ð¾Ð³ ÐºÑ?Ñ?Ñ?Ð° Ñ?Ñ?Ð±Ñ?ÐµÐºÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Ð?Ð°Ð²Ð½Ð¸ ÐºÑ?Ñ?Ñ? Ñ?Ñ?Ð±Ñ?ÐµÐºÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:806
-#: ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "Ð?Ñ?ÐµÑ?ÐºÐ°: Ð½Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ð° Ð¾Ð±Ñ?Ð°Ð´Ð° Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:827
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸Ðº Ð¿Ñ?ÐµÐ´Ð¼ÐµÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL Ð¸Ð·Ð´Ð°Ð²Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "Ð?Ð·Ð´Ð°Ð²Ð°Ñ? Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð° Ðµ-Ð¿Ð¾Ñ?Ñ?Ðµ"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Ð?ÐµÐ· Ð¾Ð´Ñ?Ð¸Ñ?Ð°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "Ð?Ð°Ð¼Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ ÐºÑ?Ñ?Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "Ð?Ð°Ð¼Ñ?Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ°"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Ð¡Ð°Ð³Ð»Ð°Ñ?Ð½Ð¾Ñ?Ñ? ÐºÑ?Ñ?Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Ð?Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸Ðº Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð½Ð¸Ðº"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾"
 
-#: ../smime/lib/e-cert.c:937
-#: ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Ð?Ð¸Ñ?Ðµ ÐºÑ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¾"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¸Ñ?ÐµÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085
-#: ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Ð?Ð»Ð³Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Ð?Ð·Ð´Ð°Ð²Ð°Ð»Ð°Ñ?"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "Ð?ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¸ Ð?Ð? Ð¸Ð·Ð´Ð°Ð²Ð°Ñ?Ð°"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "Ð?ÐµÐ´Ð¸Ð½Ñ?Ñ?Ð²ÐµÐ½Ð¸ Ð?Ð? Ñ?Ñ?Ð±Ñ?ÐµÐºÑ?Ð°"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ð¿Ð¸Ñ?Ð° Ñ?ÐµÑ?Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð°"
 
@@ -20649,8 +21352,7 @@ msgstr "Ð?Ñ?ÐµÐ¼Ð° _Ð¿Ñ?ÐµÐ´Ñ?Ð·ÐµÑ?Ñ?"
 msgid "_Address Cards"
 msgstr "_Ð?Ð°Ñ?Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´ _Ñ?Ð¿Ð¸Ñ?ÐºÐ°"
 
@@ -20717,11 +21419,11 @@ msgstr "Ð¡Ð° _Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð¼"
 # Ð£Ð½Ð¸Ð²ÐµÑ?Ð·Ð°Ð»Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ, Ð¸Ð»Ð¸ Ð£Ð¢
 # Ð?Ð°Ñ?Ð´Ð° Ð£Ð??
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -20739,7 +21441,8 @@ msgstr "Ð?ÐµÐ½Ð¸ Ð·Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð»ÐµÐ²Ð¸ Ñ?Ð°Ñ?Ñ?ÐµÑ? Ð¼Ð¸Ñ?Ð° Ð´Ð° Ñ?Ð²ÐµÑ?Ð°Ñ?Ðµ Ð¼Ð°Ð¿Ñ? Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÑ? Ð·Ð¾Ð½Ñ?.\n"
@@ -20749,19 +21452,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Ð?Ð·Ð°Ð±Ð¾Ñ?"
 
-#: ../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:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ðµ Ð·Ð° %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ðµ"
 
@@ -20774,12 +21472,7 @@ msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ðµ Ð·Ð° â??%sâ??"
 msgid "Table"
 msgstr "Ð¢Ð°Ð±ÐµÐ»Ð°"
 
-# bug(slobo): Ð¸Ð½Ñ?Ñ?Ð°Ð½Ñ?Ð°, Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ð°Ðº, Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Ð¡Ñ?Ñ?Ñ?ÐºÑ?Ñ?Ñ?Ð°"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
@@ -20791,11 +21484,7 @@ msgstr "_Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½Ð¾Ð²Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 msgid "_Replace existing view"
 msgstr "_Ð?Ð°Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐµÑ?Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñ?Ð°"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Ð?Ð´Ñ?ÐµÐ´Ð¸ Ð½Ð¾Ð²Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
@@ -20815,22 +21504,10 @@ msgstr "Ð¢Ð¸Ð¿ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°:"
 msgid "De_fault"
 msgstr "Ð?Ð¾Ð´_Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Ð?Ð¼Ðµ Ð½Ð°Ð»Ð¾Ð³Ð°"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Ð?Ñ?Ð¾Ñ?Ð¾ÐºÐ¾Ð»"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Ð Ð°Ð´Ñ?Ð°"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Ð Ð°Ð´Ñ?Ð° GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Ð?Ñ?Ð¾Ð±Ð¸Ð½Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
@@ -20848,20 +21525,21 @@ msgstr "MIME Ñ?Ð¸Ð¿:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_Ð?Ñ?ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð°Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ñ?Ð¸ÐºÐ°Ð· Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ð¸Ñ?Ð¸ ÐºÐ°Ð¾ Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "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] "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?Ð»Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
+msgstr[0] "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÐ¼ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
+msgstr[1] "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÐ¼ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
+msgstr[2] "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÐ¼ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
+msgstr[3] "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?Ð°Ñ?ÐµÐ¼ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
 msgid "_Send To..."
@@ -20871,13 +21549,13 @@ msgstr "_Ð?Ð¾Ñ?Ð°Ñ?Ð¸ Ð·Ð°..."
 msgid "Send the selected attachments somewhere"
 msgstr "Ð¨Ð°Ñ?Ðµ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ Ð½ÐµÐ³Ð´Ðµ"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Ð§Ñ?Ð²Ð°Ñ?Ðµ"
 
@@ -20886,13 +21564,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ð¿Ñ?Ð¸_Ð»Ð¾Ð³Ð°"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "Show Attachment _Bar"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ð¿_Ñ?Ð¸Ð»Ð¾Ð³Ð°"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð»Ð¸Ð½Ð¸_Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
@@ -20906,37 +21581,49 @@ msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 msgstr[1] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
-msgstr[2] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð°"
+msgstr[2] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ðµ"
+msgstr[3] "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779
-#: ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:346
 msgid "S_ave All"
 msgstr "Ð¡Ð°Ñ?_Ñ?Ð²Ð°Ñ? Ñ?Ð²Ðµ"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:372
 msgid "A_dd Attachment..."
 msgstr "Ð?Ð¾_Ð´Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:396
 msgid "_Hide"
 msgstr "_Ð¡Ð°ÐºÑ?Ð¸Ñ?"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:403
+#, fuzzy
+#| msgid "S_ave All"
+msgid "Hid_e All"
+msgstr "Ð¡Ð°Ñ?_Ñ?Ð²Ð°Ñ? Ñ?Ð²Ðµ"
+
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "_View Inline"
 msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð½Ñ?Ñ?Ð°Ñ?"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:417
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "Ð?Ñ?Ðµ_Ð³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð½Ñ?Ñ?Ð°Ñ?"
+
+#: ../widgets/misc/e-attachment-view.c:734
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ñ?Ð° â??%sâ??"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:737
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³ Ñ? %s"
@@ -20945,62 +21632,60 @@ msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¾Ð²Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³ Ñ? %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "Ð?Ñ?Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð° Ð¿Ð¾Ñ?Ñ?ÐºÐ°"
 
-#: ../widgets/misc/e-attachment.c:1820
-#: ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ð° Ð²ÐµÑ? Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
 
-#: ../widgets/misc/e-attachment.c:1828
-#: ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "Ð?Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ð° Ñ?Ñ?Ð²Ð°Ñ?Ð° Ð²ÐµÑ? Ñ?Ðµ Ñ? Ñ?Ð¾ÐºÑ?"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ? Ð¿Ñ?Ð¸Ð»Ð¾Ð³Ð° Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¸Ñ?Ð°Ð½"
 
 # * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ð?Ð¸Ñ?Ðµ Ð¼Ð¾Ð³Ñ?Ñ?Ðµ Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¿Ñ?Ð¸Ð»Ð¾Ð³"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "Ð?Ñ?Ð¶Ð¸Ñ?Ðµ Ð»ÐµÐ²Ð¸ ÐºÐ»Ð¸Ðº Ð¸ Ctrl Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ð²ÐµÐ·Ñ?"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -21008,70 +21693,6 @@ msgstr "%B %Y."
 msgid "Month Calendar"
 msgstr "Ð?ÐµÑ?ÐµÑ?Ð½Ð¸ ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472
-#: ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Ð?Ð¾Ñ?Ð° Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
-#: ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407
-#: ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK Ð±Ð¾Ñ?Ð° Ð¸Ñ?Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
-#: ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "Ð?Ñ?Ñ?Ð°Ñ?ÐºÐ°Ñ?"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "Ð¥1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Ð?Ð°Ñ?Ð¼Ð°Ñ?Ð° Ñ?Ð¸Ñ?Ð¸Ð½Ð°"
-
-#: ../widgets/misc/e-canvas-vbox.c:101
-#: ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Ð Ð°Ð·Ð¼Ð°Ðº"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Ð?Ð¾Ð´Ð½Ð° Ñ?Ñ?Ñ?Ð°Ð½Ð°"
@@ -21084,27 +21705,27 @@ msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ¾Ð´Ð½Ñ? Ñ?Ñ?Ñ?Ð°Ð½Ñ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ"
 msgid "Other..."
 msgstr "Ð?Ñ?Ñ?Ð³Ð¾..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Ð?Ð°Ñ?Ñ?Ð¼ Ð¸ Ð²Ñ?ÐµÐ¼Ðµ"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Ð?ÐµÐ¾ Ñ?ÐµÐºÑ?Ñ?Ð° Ð·Ð° Ñ?Ð½Ð¾Ñ? Ð´Ð°Ñ?Ñ?Ð¼Ð°"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð´Ñ?Ð³Ð¼Ðµ Ð·Ð° Ð¿Ñ?Ð¸ÐºÐ°Ð· ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð°"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Ð?ÐºÐ²Ð¸Ñ? Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ð°"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Ð¡Ð°Ð´Ð°"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Ð?Ð°Ð½Ð°Ñ?"
 
@@ -21115,7 +21736,7 @@ msgstr "_Ð?Ð°Ð½Ð°Ñ?"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "Ð?Ð¸Ñ?Ñ?_Ð°"
 
@@ -21126,169 +21747,155 @@ msgstr "Ð?Ð¸Ñ?Ñ?_Ð°"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703
-#: ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð°Ð½ Ð´Ð°Ñ?Ñ?Ð¼"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ð²Ñ?ÐµÐ¼Ðµ"
 
-#: ../widgets/misc/e-import-assistant.c:238
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ¾Ñ?Ñ? Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ¾Ñ?ÐµÐ³ Ñ?Ðµ Ñ?Ð¸Ð¿Ð° Ñ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸Ð· Ð»Ð¸Ñ?Ñ?Ðµ."
+#: ../widgets/misc/e-import-assistant.c:246
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? ÐºÐ¾Ñ?Ñ? Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ? Ð¸ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ¾Ñ?ÐµÐ³ Ñ?Ðµ "
+"Ñ?Ð¸Ð¿Ð° Ñ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸Ð· Ð»Ð¸Ñ?Ñ?Ðµ."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:263
 msgid "F_ilename:"
 msgstr "_Ð?Ð¼Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:273
 msgid "Select a file"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:287
+#: ../widgets/misc/e-import-assistant.c:462
 msgid "File _type:"
 msgstr "_Ð¢Ð¸Ð¿ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:330
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¾Ð´Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ Ð·Ð° Ð¾Ð²Ð°Ñ? Ñ?Ð²Ð¾Ð·"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Choose the type of importer to run:"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð¸Ð¿ Ñ?Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import data and settings from _older programs"
 msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ Ð¸ Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð¸Ð· _Ñ?Ñ?Ð°Ñ?Ð¸Ñ?Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:371
 msgid "Import a _single file"
 msgstr "Ð£Ð²ÐµÐ·Ð¸ _Ñ?ÐµÐ´Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../widgets/misc/e-import-assistant.c:439
+#: ../widgets/misc/e-import-assistant.c:523
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð·Ð° Ñ?Ð²Ð¾Ð· Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ð»Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°: Pine, Netscape, "
+"Elm, iCalendar. Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð° Ð±Ð¸ Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ñ?Ð²ÐµÑ?Ñ?Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° "
+"Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ â??Ð?Ð°Ð·Ð°Ð´â??."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:770
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel Import"
+msgstr "Ð?Ñ?ÐºÐ°Ð¶Ð¸"
+
+#: ../widgets/misc/e-import-assistant.c:912
+#, fuzzy
+#| msgid "Preview the message to be printed"
+msgid "Preview data to be imported"
+msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ñ?ÐµÐ´ Ñ?Ñ?Ð°Ð¼Ð¿Ñ?"
+
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1356
+msgid "Import Data"
+msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ"
+
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ñ?Ð° Ñ?Ð¿Ð¸Ñ?ÐºÐ° ÐºÐ¾Ñ?Ðµ Ð²Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÑ?Ðµ."
 
-#: ../widgets/misc/e-import-assistant.c:516
-msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ð·Ð° Ñ?Ð²Ð¾Ð· Ð¿Ñ?Ð¾Ð²ÐµÑ?Ð¸Ð»Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸Ñ? Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ð°: Pine, Netscape, Elm, iCalendar. Ð?ÐµÐ¼Ð° Ð¿Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° ÐºÐ¾Ñ?Ð° Ð±Ð¸ Ñ?Ðµ Ð¼Ð¾Ð³Ð»Ð° Ñ?Ð²ÐµÑ?Ñ?Ð¸. Ð£ÐºÐ¾Ð»Ð¸ÐºÐ¾ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾ÐºÑ?Ñ?Ð°Ñ?Ðµ Ð¿Ð¾Ð½Ð¾Ð²Ð¾, ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð´Ñ?Ð³Ð¼Ðµ â??Ð?Ð°Ð·Ð°Ð´â??."
-
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:1271
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid "Evolution Import Assistant"
 msgstr "Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð²Ð¾Ð·"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1335
 msgid "Import Location"
 msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð»Ð¾ÐºÐ°Ñ?Ð¸Ñ?Ñ?"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1299
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing external files into Evolution."
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 msgstr ""
 "Ð?Ð¾Ð±Ñ?Ð¾ Ð´Ð¾Ñ?Ð»Ð¸ Ñ? Ð?Ð¾Ð¼Ð¾Ñ?Ð½Ð¸ÐºÐ° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ð²Ð¾Ð·.\n"
-"Ð?Ð²Ð°Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ñ?Ðµ Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð¸ ÐºÑ?Ð¾Ð· Ð¿Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ðº Ñ?Ð²Ð¾Ð·Ð° Ñ?Ð¿Ð¾Ñ?Ð½Ð¸Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
+"Ð?Ð²Ð°Ñ? Ð¿Ð¾Ð¼Ð¾Ñ?Ð½Ð¸Ðº Ñ?Ðµ Ð²Ð°Ñ? Ð¿Ñ?Ð¾Ð²ÐµÑ?Ñ?Ð¸ ÐºÑ?Ð¾Ð· Ð¿Ð¾Ñ?Ñ?Ñ?Ð¿Ð°Ðº Ñ?Ð²Ð¾Ð·Ð° Ñ?Ð¿Ð¾Ñ?Ð½Ð¸Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ? "
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1313
 msgid "Importer Type"
 msgstr "Ð¢Ð¸Ð¿ Ñ?Ð²Ð¾Ð·Ð½Ð¸ÐºÐ°"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ñ? Ð·Ð° Ñ?Ð²Ð¾Ð·"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1328
 msgid "Select a File"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1342
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° â??Ð?Ñ?Ð¸Ð¼ÐµÐ½Ð¸â?? Ð´Ð° Ð·Ð°Ð¿Ð¾Ñ?Ð½ÐµÑ?Ðµ Ñ?Ð²Ð¾Ð· Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ? Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ñ?. "
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Ð£Ð²ÐµÐ·Ð¸ Ð¿Ð¾Ð´Ð°Ñ?ÐºÐµ"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Ð?Ð°Ñ?Ñ?Ð° Ñ?Ð²ÐµÑ?Ð°"
 
-#: ../widgets/misc/e-map.c:631
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "Ð?Ð»Ð°Ñ? Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ð¼Ð¸Ñ?Ð°. Ð¢Ð°Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð¼ Ñ?Ðµ Ð¸Ð·Ð±Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð²Ñ?Ñ?Ð¸ Ð¸Ð· Ð´Ð¾Ñ?ÐµÐ³ Ð¾ÐºÐ²Ð¸Ñ?Ð°."
+#: ../widgets/misc/e-map.c:626
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Ð?Ð»Ð°Ñ? Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ Ð¿Ð¾Ð¼Ð¾Ñ?Ñ? Ð¼Ð¸Ñ?Ð°. Ð¢Ð°Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¾Ð¼ Ñ?Ðµ Ð¸Ð·Ð±Ð¾Ñ? Ð²Ñ?ÐµÐ¼ÐµÐ½Ñ?ÐºÐµ Ð·Ð¾Ð½Ðµ "
+"Ð²Ñ?Ñ?Ð¸ Ð¸Ð· Ð´Ð¾Ñ?ÐµÐ³ Ð¾ÐºÐ²Ð¸Ñ?Ð°."
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð´Ñ?Ð³Ð¼Ðµ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ðµ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð´Ñ?Ð³Ð¼Ðµ Ð·Ð° Ñ?Ð°Ð´ Ð²Ð°Ð½ Ð¼Ñ?ÐµÐ¶Ðµ."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð´Ñ?Ð³Ð¼Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ?Ðµ."
+msgstr ""
+"Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸. Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð¾ Ð´Ñ?Ð³Ð¼Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ð²ÐµÐ¶ÐµÑ?Ðµ."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾ Ð½Ð¸Ñ?Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸ Ñ?ÐµÑ? Ð½Ð¸Ñ?Ðµ Ð´Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð°."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Ð¡Ñ?Ð°Ñ?Ðµ Ð´Ñ?Ð³Ð¼ÐµÑ?Ð° Ñ?Ðµ Ð½Ð° Ð¼Ñ?ÐµÐ¶Ð¸"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Ð¥Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð½Ð° Ð¿Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð°"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð° Ñ?Ð¾Ñ?Ð¸Ð·Ð¾Ð½Ñ?Ð°Ð»Ð½Ð¾"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Ð?ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð° Ð¿Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð°"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ?Ð¸ ÐºÐ°Ð´Ð° Ñ?Ðµ Ð¾ÐºÑ?ÐµÐ½Ñ?Ñ?Ð° Ð²ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¾"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Ð?Ð´Ð½Ð¾Ñ?"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Ð?Ð´Ð½Ð¾Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ð´Ñ?Ñ?Ð³Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Ð¤Ð¸ÐºÑ?Ð¸Ñ?Ð°Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Ð?Ðµ Ð´Ð¸Ñ?Ð° Ð´Ñ?Ñ?Ð³Ñ? Ð¿Ð¾Ð²Ñ?Ñ? Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ñ?Ð¾Ð¼ÐµÐ½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸ Ñ?Ð°:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸ Ð»Ð¸Ñ?Ð½Ðµ Ð·Ð°Ð¿Ð¸Ñ?Ðµ:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Ð£Ñ?ÐºÐ»Ð°Ð´Ð¸ ÐºÐ°Ñ?ÐµÐ³Ð¾Ñ?Ð¸Ñ?Ðµ:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:276
 msgid "Evolution Preferences"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
@@ -21298,69 +21905,46 @@ msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð°Ñ?Ð° Ð?Ð²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 msgid "Matches: %d"
 msgstr "Ð?Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ð°: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ñ?Ñ?Ð°ÐºÑ? Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ðµ"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "Ð?Ñ?Ð¾_Ð½Ð°Ñ?Ð¸:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "Ð?Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð³Ñ?"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¾"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "Ð?Ð°Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¾ Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ð·Ðµ"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_Ð¡Ð»ÐµÐ´ÐµÑ?Ðµ"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "Ð?Ð°Ñ?Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ñ?Ð¸Ð²Ð°Ñ?Ðµ Ñ?Ñ?Ð°Ð·Ðµ"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Ð?Ð°_Ð·Ð¸ Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð°"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Ð¡Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð½Ð° Ð´Ð¾ Ð´Ð½Ð°, Ð½Ð°Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð¾Ð´ Ð²Ñ?Ñ?Ð°"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Ð¡Ñ?Ñ?Ð°Ð½Ð¸Ñ?Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð½Ð° Ð´Ð¾ Ð²Ñ?Ñ?Ð°, Ð½Ð°Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ð¾ Ð¾Ð´ Ð´Ð½Ð°"
 
-#: ../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:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
-
-# bug(slobo): Ð¼Ð¾Ð¶Ð´Ð° Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¸Ð·Ð±Ð¾Ñ?Ð°"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ Ð¾Ð±Ñ?Ð¸_Ñ?Ð°Ð½Ð¾:"
@@ -21433,43 +22017,48 @@ msgstr "Ð?Ð¾ Ð·Ð°Ð²Ñ?Ñ?_ÐµÑ?ÐºÑ?:"
 msgid "When decli_ned:"
 msgstr "Ð?Ð°Ð´Ð° Ñ?Ðµ Ð¾Ð´Ð±Ð¸_Ñ?ÐµÐ½Ð¾:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "Ð£Ð½_Ñ?Ñ?Ð°Ñ?"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Ð?Ð¾Ñ?Ð»Ðµ:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#| msgid "_After:"
+msgid "_After"
+msgstr "_Ð?Ð¾Ñ?Ð»Ðµ"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Ð¡Ð²Ð¸ Ð¿Ð¾Ð´Ð°Ñ?Ð¸"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Ð?Ð»Ð°Ñ?Ð¸Ñ?Ð¸ÐºÐ°Ñ?Ð¸Ñ?Ð°:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_Ð?Ð´Ð»Ð¾Ð¶Ð¸ Ð¸Ñ?Ð¿Ð¾Ñ?Ñ?ÐºÑ? Ð¿Ð¾Ñ?Ñ?ÐºÐµ"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_Ð?Ñ?Ð¿Ð¾Ñ?Ñ?Ñ?ÐµÐ½Ð¾"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ñ?Ð¾Ðº"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Ð?Ð¾:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#| msgid "_Until:"
+msgid "_Until"
+msgstr "_Ð?Ð¾"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Ð?Ð°Ð´Ð° Ñ?Ðµ Ð·Ð³Ð¾Ð´Ð½Ð¾"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Ð?Ð°Ð´Ð° Ñ?Ðµ Ð¾Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð¾:"
 
@@ -21526,43 +22115,41 @@ msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ðµ Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð²Ñ?Ñ?Ð½Ð°."
 msgid "Click here to go to URL"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð¾Ð²Ð´Ðµ Ð´Ð° Ð¿Ð¾Ñ?ÐµÑ?Ð¸Ñ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ñ?"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¼ÐµÑ?Ñ?Ð¾ Ð²ÐµÐ·Ðµ"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð²ÐµÐ·Ñ? Ñ? Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ð¸Ñ?ÐµÑ?Ð°ÐºÐ°"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "_Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð²ÐµÐ·Ñ? Ñ? Ñ?Ð¸Ñ?Ð°Ñ?Ñ?"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð²ÐµÐ·Ñ? Ñ? Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ? Ð²ÐµÐ±Ð°"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "_Ð£Ð¼Ð½Ð¾Ð¶Ð¸ ÐµÐ»ÐµÐºÑ?Ñ?Ð¾Ð½Ñ?ÐºÑ? Ð°Ð´Ñ?ÐµÑ?Ñ?"
 
-#: ../widgets/misc/e-web-view.c:397
-#: ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ñ?Ð°Ð² Ñ?ÐµÐºÑ?Ñ? Ð¸ Ñ?Ð»Ð¸ÐºÐµ"
 
-#: ../widgets/misc/e-web-view.c:752
-#: ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "Ð?Ð»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ð·Ð¾Ð²ÐµÑ?Ðµ %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°ÐºÑ?Ð¸Ñ?ÐµÑ?Ðµ/Ð¾Ñ?ÐºÑ?Ð¸Ñ?ÐµÑ?Ðµ Ð°Ð´Ñ?ÐµÑ?Ðµ"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "Ð?Ñ?Ð¸Ñ?Ð¸Ñ?Ð½Ð¸Ñ?Ðµ Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ %s"
@@ -21581,7 +22168,7 @@ msgstr "Ð?Ð°Ð»ÐµÐ½Ð´Ð°Ñ?: Ð¾Ð´ %s Ð´Ð¾ %s"
 msgid "evolution calendar item"
 msgstr "Ñ?Ñ?Ð°Ð²ÐºÐ° ÐºÐ°Ð»ÐµÐ½Ð´Ð°Ñ?Ð° ÐµÐ²Ð¾Ð»Ñ?Ñ?Ð¸Ñ?Ðµ"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "Ð¸Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð° Ð»Ð¸Ñ?Ñ?Ð°"
 
@@ -21604,7 +22191,7 @@ msgstr "Ð?Ð¸Ñ?Ñ?Ð°"
 msgid "OK"
 msgstr "Ð£ Ñ?ÐµÐ´Ñ?"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ñ? Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?: %s"
@@ -21613,55 +22200,17 @@ msgstr "Ð?Ñ?ÐµÐ¼Ðµ Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ñ? Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ñ?: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ð?Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?ÐºÐ° Ð¼Ð¾Ñ?Ð° Ð±Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÑ?Ñ? 0 Ð¸ 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Ð¤Ð¾ÐºÑ?Ñ?Ð¸Ñ?Ð°Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Ð?ÐµÐ¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Ð?Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "Ð?Ð¾Ð´Ð²Ñ?Ñ?ÐµÐ½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Ð?Ð¾Ð´ÐµÐ±Ñ?Ð°Ð½Ð° ÐºÐ¾Ð»Ð¾Ð½Ð°"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° Ñ? Ð±Ð¾Ñ?Ð¸"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Ð?Ð¾Ð»Ð¾Ð½Ð° Ð±Ð¾Ñ?Ð° Ñ? Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ð¸"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "ÐºÐ»Ð¸ÐºÐ½Ð¸Ñ?Ðµ Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Ð¡Ñ?Ð°Ñ?Ðµ"
-
-#: ../widgets/table/e-table-config.c:381
-#: ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ð Ð°Ñ?Ñ?Ñ?Ñ?Ðµ)"
 
-#: ../widgets/table/e-table-config.c:381
-#: ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(Ð?Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?Ðµ)"
 
@@ -21673,12 +22222,12 @@ msgstr "Ð?Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð½Ð¾"
 msgid "No grouping"
 msgstr "Ð?ÐµÐ· Ð³Ñ?Ñ?Ð¿Ð¸Ñ?Ð°Ñ?Ð°"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¿Ð¾Ñ?Ð°"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð¿Ð¾Ñ?Ð°"
 
@@ -21687,7 +22236,7 @@ msgid "A_vailable Fields:"
 msgstr "Ð?Ð¾_Ñ?Ñ?Ñ?Ð¿Ð½Ð° Ð¿Ð¾Ñ?Ð°:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "Ð Ð°Ñ?Ñ?Ñ?Ñ?Ðµ"
 
@@ -21700,7 +22249,7 @@ msgid "Clear _All"
 msgstr "Ð?Ñ?Ð¸Ñ?Ñ?Ð¸ _Ñ?Ð²Ðµ"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "Ð?Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?Ðµ"
 
@@ -21760,7 +22309,7 @@ msgstr "_Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð²Ð° Ð¿Ð¾Ñ?Ð° Ð¿Ð¾ Ñ?ÐµÐ´Ñ?:"
 msgid "_Sort..."
 msgstr "_Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ñ?..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? ÐºÐ¾Ð»Ð¾Ð½Ñ?"
 
@@ -21772,267 +22321,117 @@ msgstr ""
 "Ð?Ð° Ð´Ð¾Ð´Ð°Ð²Ð°Ñ?Ðµ ÐºÐ¾Ð»Ð¾Ð½Ðµ Ñ? Ñ?Ð°Ð±ÐµÐ»Ñ?, Ð¿Ñ?ÐµÐ²Ñ?Ñ?Ð¸Ñ?Ðµ\n"
 "Ñ?Ðµ Ð½Ð° Ð¼ÐµÑ?Ñ?Ð¾ Ð³Ð´Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ðµ Ð¿Ð¾Ñ?Ð°Ð²Ð¸."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+#| msgid "%s : %s (%d item)"
+#| msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d Ñ?Ñ?Ð°Ð²ÐºÐ°)"
 msgstr[1] "%s : %s (%d Ñ?Ñ?Ð°Ð²ÐºÐµ)"
 msgstr[2] "%s : %s (%d Ñ?Ñ?Ð°Ð²ÐºÐ¸)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d Ñ?Ñ?Ð°Ð²ÐºÐ°)"
 msgstr[1] "%s (%d Ñ?Ñ?Ð°Ð²ÐºÐµ)"
 msgstr[2] "%s (%d Ñ?Ñ?Ð°Ð²ÐºÐ¸)"
+msgstr[3] "%s (%d Ñ?Ñ?Ð°Ð²ÐºÐ°)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842
-#: ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Ð ÐµÐ´Ð¾Ð²Ð¸ Ð½Ð°Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ?Ð½Ð¸Ñ? Ð±Ð¾Ñ?Ð°"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849
-#: ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373
-#: ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "Ð?Ð¾Ð»Ð¾Ð¶ÐµÐ½Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ñ?Ð°Ñ?Ðµ"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856
-#: ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379
-#: ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Ð£Ñ?Ð¿Ñ?Ð°Ð²Ð½Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð·Ð° Ñ?Ñ?Ñ?Ð°Ñ?Ðµ"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863
-#: ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385
-#: ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "Ð¡Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ðµ Ñ?Ñ?Ñ?Ð°Ñ?Ð°"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870
-#: ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "Ð ÐµÐ¶Ð¸Ð¼ ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835
-#: ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ?"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877
-#: ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339
-#: ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "Ð?Ð°Ñ?Ð²ÐµÑ?Ð° Ð´Ñ?Ð¶Ð¸Ð½Ð°"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911
-#: ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346
-#: ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "Ð£Ñ?ÐµÐ´Ð½Ð°Ñ?ÐµÐ½Ð° Ð²Ð¸Ñ?Ð¸Ð½Ð° Ñ?ÐµÐ´Ð¾Ð²Ð°"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../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:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ð´Ð¸Ñ?Ðµ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ñ? _Ñ?Ð°Ñ?Ñ?Ñ?Ñ?Ðµ"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Ð Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ñ? _Ð¾Ð¿Ð°Ð´Ð°Ñ?Ñ?Ñ?Ðµ"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "_Ð?Ðµ Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "Ð?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¿Ð¾ Ð¾Ð²Ð¾Ð¼Ðµ _Ð¿Ð¾Ñ?Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "Ð?Ñ?Ñ?Ð¿Ð¸Ñ?Ð¸ Ð¿Ð¾ _Ð¾ÐºÐ²Ð¸Ñ?Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¾Ð²Ñ? _ÐºÐ¾Ð»Ð¾Ð½Ñ?"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "Ð?Ð¾Ð´Ð°Ñ? ÐºÐ¾_Ð»Ð¾Ð½Ñ?..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "Ð?Ð¾_Ñ?Ð°Ð²Ð½Ð°Ñ?Ðµ"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "Ð?Ð°_Ñ?Ð±Ð¾Ñ?Ðµ Ñ?ÐºÐ»Ð°Ð¿Ð°Ñ?Ðµ"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Ð?Ð±Ð»Ð¸ÐºÑ?Ñ? ÐºÐ¾Ð»Ð¾_Ð½Ðµ..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "Ð?Ñ?Ð¸Ð»Ð°_Ð³Ð¾Ð´Ð¸ Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_Ð?Ð¾Ñ?ÐµÑ?Ð°Ñ? Ð¿Ð¾"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_Ð?Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?ÐµÐ½Ð¾"
 
-#: ../widgets/table/e-table-item.c:2821
-#: ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Ð?Ð°Ð³Ð»Ð°Ð²Ñ?Ðµ Ñ?Ð°Ð±ÐµÐ»Ðµ"
-
-#: ../widgets/table/e-table-item.c:2828
-#: ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Ð?Ð¾Ð´ÐµÐ» Ñ?Ð°Ð±ÐµÐ»Ðµ"
-
-#: ../widgets/table/e-table-item.c:2904
-#: ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Ð ÐµÐ´ ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Ð?ÐµÑ?Ð°Ñ?Ð¸ Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°"
-
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Ð£Ð²ÐµÐº Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ ÐºÐ»Ð¸Ðº Ð´Ð° Ð´Ð¾Ð´Ð°Ñ?Ðµ"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Ð?ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð½Ð¸ Ñ?Ð°Ð·Ð¼Ð°Ðº Ñ?ÐµÐ´Ð¾Ð²Ð°"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Ð?ÐµÑ?Ñ?Ð¸ÐºÐ°Ð»Ð°Ð½ Ð¿Ñ?Ð¾Ñ?Ñ?Ð¾Ñ? Ð¸Ð·Ð¼ÐµÑ?Ñ? Ñ?ÐµÐ´Ð¾Ð²Ð°. Ð?Ð¾Ð´Ð°Ñ?Ðµ Ñ?Ðµ Ð½Ð° Ð²Ñ?Ñ? Ð¸ Ð´Ð½Ð¾ Ñ?ÐµÐ´Ð°"
-
-#: ../widgets/table/e-tree.c:3392
-#: ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree Ð¿Ñ?Ð¸Ð»Ð°Ð³Ð¾Ñ?Ð¸Ð²Ð°Ñ? Ñ?Ð°Ð±ÐµÐ»Ðµ"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Ð¡Ñ?Ð°Ñ?Ð¸Ð½Ñ?ÐºÐ¸ Ð¸Ð·Ð³Ð»ÐµÐ´"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð° Ð»Ð¸Ð½Ð¸Ñ?Ðµ Ð¸ +/- Ð³Ñ?Ð°Ð½Ð¸Ñ?Ð½Ð¸ÐºÐµ."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ñ?Ð°Ð±Ð»Ð°"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ñ?Ñ?ÐµÐ»Ð¸Ñ?Ðµ Ñ?Ñ?Ð°Ð±Ð»Ð°"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "Ð¸Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ðµ"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "Ð¸Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¾"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "Ð¿Ð¾Ñ?Ð½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?ÐµÐ¼ Ð¾Ð²Ðµ Ñ?ÐµÐ»Ð¸Ñ?Ðµ"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "Ð±Ð¸Ñ?Ð°Ñ?Ðµ"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "Ð±Ð¸Ñ?Ð°Ñ?Ðµ Ñ?ÐµÐ»Ð¸Ñ?Ðµ"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "Ñ?Ð°Ð·Ð³Ñ?Ð°Ð½Ð°Ð²Ð°"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "Ñ?Ð°Ð·Ð³Ñ?Ð°Ð½Ð°Ð²Ð° Ñ?ÐµÐ´ Ñ? ETree Ð³Ð´Ðµ Ñ?Ðµ Ñ?ÐµÐ»Ð¸Ñ?Ð° Ð½Ð°Ð»Ð°Ð·Ð¸"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "Ñ?ÐºÑ?Ð¿Ñ?Ð°"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "Ñ?ÐºÑ?Ð¿Ñ?Ð° Ñ?ÐµÐ´ Ñ? ETree Ð³Ð´Ðµ Ñ?Ðµ Ñ?ÐµÐ»Ð¸Ñ?Ð° Ð½Ð°Ð»Ð°Ð·Ð¸"
 
@@ -22048,141 +22447,10 @@ msgstr "ÐºÐ»Ð¸Ðº"
 msgid "sort"
 msgstr "Ñ?Ð°Ð·Ð²Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ðµ"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ñ?Ð²Ðµ"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "Ð?ÐµÑ?Ð¾Ð´Ð¸ Ñ?Ð½Ð¾Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3315
-#: ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "Ð?Ð±Ñ?Ð°Ñ?Ð¸Ð²Ð°Ñ? Ð´Ð¾Ð³Ð°Ñ?Ð°Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3322
-#: ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Ð¢ÐµÐºÑ?Ñ?"
-
-#: ../widgets/text/e-text.c:3329
-#: ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Ð?Ð¾Ð´ÐµÐ±Ñ?Ð°Ð½Ð¾"
-
-#: ../widgets/text/e-text.c:3336
-#: ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Ð?Ñ?ÐµÑ?Ñ?Ñ?Ð°Ð½Ð¾"
-
-#: ../widgets/text/e-text.c:3343
-#: ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Ð?ÐµÐ·Ð°"
-
-#: ../widgets/text/e-text.c:3350
-#: ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Ð?Ð±Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ð¾"
-
-#: ../widgets/text/e-text.c:3357
-#: ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ñ?Ð¸Ñ?Ð¸Ð½Ñ?"
-
-#: ../widgets/text/e-text.c:3364
-#: ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Ð?Ñ?ÐµÑ?Ð¸ Ð²Ð¸Ñ?Ð¸Ð½Ñ?"
-
-#: ../widgets/text/e-text.c:3371
-#: ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Ð?Ñ?ÐµÑ?Ð¸"
-
-#: ../widgets/text/e-text.c:3378
-#: ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Ð?Ñ?Ð¿Ñ?Ð½Ð¸ Ð¿Ñ?Ð°Ð²Ð¾Ñ?Ð³Ð°Ð¾Ð½Ð¸Ðº Ð¸Ñ?ÐµÑ?ÐºÐ°"
-
-#: ../widgets/text/e-text.c:3385
-#: ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X Ð¿Ð¾Ð¼ÐµÑ?Ð°Ñ?Ðµ"
-
-#: ../widgets/text/e-text.c:3392
-#: ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y Ð¿Ð¾Ð¼ÐµÑ?Ð°Ñ?Ðµ"
-
-#: ../widgets/text/e-text.c:3427
-#: ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3434
-#: ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Ð?Ð¸Ñ?Ð¸Ð½Ð° Ñ?ÐµÐºÑ?Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3448
-#: ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ñ?Ð¸ Ñ?Ð°Ñ?ÐºÐµ"
-
-#: ../widgets/text/e-text.c:3455
-#: ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Ð¢Ñ?Ð¸ Ñ?Ð°Ñ?ÐºÐµ"
-
-#: ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Ð?Ñ?ÐµÐ»Ð¾Ð¼ Ñ?ÐµÐ´Ð°"
-
-#: ../widgets/text/e-text.c:3469
-#: ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Ð?Ð½Ð°Ñ?Ð¸ Ð·Ð° Ð¿Ñ?ÐµÐ»Ð¾Ð¼"
-
-#: ../widgets/text/e-text.c:3476
-#: ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "Ð?Ð°Ñ?Ð²Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3497
-#: ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ñ? Ð¸Ð²Ð¸Ñ?Ðµ"
-
-#: ../widgets/text/e-text.c:3504
-#: ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Ð?Ð¾Ð·Ð²Ð¾Ð»Ð¸ Ð½Ð¾Ð²Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ðµ"
-
-#: ../widgets/text/e-text.c:3511
-#: ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ñ? Ð¿Ð¾Ð·Ð°Ð´Ð¸Ð½Ñ?"
-
-#: ../widgets/text/e-text.c:3518
-#: ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ð°Ñ? Ð´Ñ?Ð³Ð¼Ðµ"
-
-#: ../widgets/text/e-text.c:3525
-#: ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Ð?Ð¾Ð·Ð¸Ñ?Ð¸Ñ?Ð° ÐºÑ?Ñ?Ñ?Ð¾Ñ?Ð°"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533
-#: ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Ð?Ð¾Ð½Ñ?ÐµÐºÑ?Ñ? Ð¼ÐµÑ?Ð¾Ð´Ð° Ñ?Ð½Ð¾Ñ?Ð°"
-
-#: ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Ð£Ð¿Ñ?Ð°Ð²Ñ?Ð°Ñ? Ð¸Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð¸Ð¼ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð¾Ð¼"
diff --git a/po/sr latin po b/po/sr latin po
index f7ff0ef..9c1ae14 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -5,28 +5,39 @@
 #
 # Maintainer: Igor NestoroviÄ? <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by Igor NestoroviÄ? <igor prevod org>
+# MiloÅ¡ PopoviÄ? <gpopac gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution\n";
-"POT-Creation-Date: 2010-03-22 17:33+0000\n"
-"PO-Revision-Date: 2010-03-22 21:34+0100\n"
-"Last-Translator: Igor NestoroviÄ? <igor prevod org>\n"
-"Language-Team: Serbian (sr) <gnom prevod org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution\n"
+"POT-Creation-Date: 2010-08-12 05:37+0000\n"
+"PO-Revision-Date: 2010-09-22 15:01+0200\n"
+"Last-Translator: MiloÅ¡ PopoviÄ? <gpopac gmail com>\n"
+"Language-Team: Serbian <gnom prevod 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=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
-msgid "'{0}' is a read-only address book and cannot be modified. Please select a different address book from the side bar in the Contacts view."
-msgstr "Adresar â??{0}â?? je samo za Ä?itanje i nije podloÅ¾an izmenama. Izaberite drugi adresar sa boÄ?ne trake u pregledu Kontakti."
+msgid ""
+"'{0}' is a read-only address book and cannot be modified. Please select a "
+"different address book from the side bar in the Contacts view."
+msgstr ""
+"Adresar â??{0}â?? je samo za Ä?itanje i nije podloÅ¾an izmenama. Izaberite drugi "
+"adresar sa boÄ?ne trake u pregledu Kontakti."
 
 #: ../addressbook/addressbook.error.xml.h:3
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
-msgstr "Kontakt sa ovom adresom veÄ? postoji. Å½elite li ipak da dodate novu kartu sa istom adresom?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
+msgstr ""
+"Kontakt sa ovom adresom veÄ? postoji. Å½elite li ipak da dodate novu kartu sa "
+"istom adresom?"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Address '{0}' already exists."
@@ -45,8 +56,14 @@ msgid "Category editor not available."
 msgstr "UreÄ?ivaÄ? kategorija nije dostupan."
 
 #: ../addressbook/addressbook.error.xml.h:8
-msgid "Check to make sure your password is spelled correctly and that you are using a supported login method. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Proverite da li je lozinka ispravno uneta i da li koristite podrÅ¾ani naÄ?in prijave. Ne zaboravite da je veliÄ?ina slova bitna u lozinkama; moÅ¾da su velika slova ukljuÄ?ena."
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+"Proverite da li je lozinka ispravno uneta i da li koristite podrÅ¾ani naÄ?in "
+"prijave. Ne zaboravite da je veliÄ?ina slova bitna u lozinkama; moÅ¾da su "
+"velika slova ukljuÄ?ena."
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Could not get schema information for LDAP server."
@@ -57,163 +74,172 @@ msgid "Could not remove address book."
 msgstr "Nije moguÄ?e ukloniti adresar."
 
 #: ../addressbook/addressbook.error.xml.h:11
-msgid "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 "Trenutno iz Evolucije moÅ¾ete pristupiti samo sistemskom adresaru GroupWise. Koristite neki drugi GroupWise klijent za elektronsku poÅ¡tu kako bi dobili GroupWise Ä?este kontakte i fascikle sa liÄ?nim kontaktima."
+msgid ""
+"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 ""
+"Trenutno iz Evolucije moÅ¾ete pristupiti samo sistemskom adresaru GroupWise. "
+"Koristite neki drugi GroupWise klijent za elektronsku poÅ¡tu kako bi dobili "
+"GroupWise Ä?este kontakte i fascikle sa liÄ?nim kontaktima."
 
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Delete address book '{0}'?"
 msgstr "Obrisati adresar â??{0}â???"
 
 #: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+#| msgid "Do not delete"
+msgid "Do _Not Delete"
+msgstr "Ne _briÅ¡i"
+
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Error saving {0} to {1}: {2}"
 msgstr "GreÅ¡ka pri Ä?uvanju {0} u {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "Failed to authenticate with LDAP server."
 msgstr "Neuspela autentifikacija na LDAP server."
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1277
 msgid "Failed to delete contact"
 msgstr "Neuspelo brisanje kontakta"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "GroupWise Address book creation:"
 msgstr "Pravljenje GroupWise adresara:"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server nije odgovorio ispravnom Å¡emom podataka."
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "Na tekuÄ?oj verziji servera neke opcije neÄ?e ispravno raditi"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolucijin adresar je neoÄ?ekivano prestao da radi."
 
-#: ../addressbook/addressbook.error.xml.h:20
-msgid "The image you have selected is large. Do you want to resize and store it?"
-msgstr "Slika koju ste izabrali je prevelika. Å½elite li da joj promenite veliÄ?inu i saÄ?uvate?"
-
 #: ../addressbook/addressbook.error.xml.h:21
-msgid "This LDAP server may use an older version of LDAP, which does not support this functionality or it may be misconfigured. Ask your administrator for supported search bases."
-msgstr "Ovaj LDAP server moÅ¾da koristi stariju verziju LDAP-a koja ne podrÅ¾ava ovu moguÄ?nost, ili je loÅ¡e podeÅ¡en. Pitajte administratora za podrÅ¾ane osnove za pretragu."
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
+msgstr ""
+"Slika koju ste izabrali je prevelika. Å½elite li da joj promenite veliÄ?inu i "
+"saÄ?uvate?"
 
-# malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:22
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"Ovaj LDAP server moÅ¾da koristi stariju verziju LDAP-a koja ne podrÅ¾ava ovu "
+"moguÄ?nost, ili je loÅ¡e podeÅ¡en. Pitajte administratora za podrÅ¾ane osnove za "
+"pretragu."
+
+# malo aorista ;-)
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "This address book could not be opened."
 msgstr "Ovaj adresar nije mogao biti otvoren."
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book server does not have any suggested search bases."
 msgstr "Server ovog adresara ne sadrÅ¾i predloÅ¾ene osnove za pretragu."
 
-#: ../addressbook/addressbook.error.xml.h:24
-msgid "This address book server might be unreachable or the server name may be misspelled or your network connection could be down."
-msgstr "Server ovog adresara je ili nedostupan ili je njegovo ime pogreÅ¡no uneto ili je mreÅ¾a nedostupna."
+#: ../addressbook/addressbook.error.xml.h:25
+msgid ""
+"This address book server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+"Server ovog adresara je ili nedostupan ili je njegovo ime pogreÅ¡no uneto ili "
+"je mreÅ¾a nedostupna."
 
 # malo aorista ;-)
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This address book will be removed permanently."
 msgstr "Ovaj adresar Ä?e biti trajno uklonjen."
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ovaj server ne podrÅ¾ava LDAPv3 Å¡emu podataka."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to open address book"
 msgstr "NemoguÄ?e otvaranje adresara"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to perform search."
 msgstr "Pretraga nije moguÄ?a."
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Nije moguÄ?e saÄ?uvati {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Would you like to save your changes?"
 msgstr "Å½elite li da saÄ?uvate promene?"
 
-#: ../addressbook/addressbook.error.xml.h:31
-msgid "You are attempting to move a contact from one address book to another but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr "PokuÅ¡avate da premestite kontakt iz jednog adresara u drugi ali se on ne moÅ¾e ukloniti iz izvora. Å½elite li da saÄ?uvate umnoÅ¾ak umesto toga?"
-
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results the server should be upgraded to a supported version"
-msgstr "Povezujete se na nepodrÅ¾an GroupWise server Å¡to moÅ¾e da dovede do problema u radu Evolucije. Najbolje je da server bude nadograÄ?en na podrÅ¾anu verziju"
+msgid ""
+"You are attempting to move a contact from one address book to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"PokuÅ¡avate da premestite kontakt iz jednog adresara u drugi ali se on ne "
+"moÅ¾e ukloniti iz izvora. Å½elite li da saÄ?uvate umnoÅ¾ak umesto toga?"
 
 #: ../addressbook/addressbook.error.xml.h:33
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"Povezujete se na nepodrÅ¾an GroupWise server Å¡to moÅ¾e da dovede do problema u "
+"radu Evolucije. Najbolje je da server bude nadograÄ?en na podrÅ¾anu verziju"
+
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemate dovoljna ovlaÅ¡Ä?enja da briÅ¡ete kontakte iz ovog adresara."
 
-#: ../addressbook/addressbook.error.xml.h:34
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+#: ../addressbook/addressbook.error.xml.h:35
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "Izmenili ste ovaj kontakt. Å½elite li da saÄ?uvate ove promene?"
 
-#: ../addressbook/addressbook.error.xml.h:35
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:36
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "Kontakti za {0} neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "_Ne Ä?uvaj"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "P_romeni veliÄ?inu"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "_Koristi tako kako je"
 
-# bug: we don't want this translated
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42
-#: ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-# bug: we don't want this translatable
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "Podrazumevana adresa za usklaÄ?ivanje:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "Nije moguÄ?e uÄ?itati adresar"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "Nije moguÄ?e Ä?itanje programskog bloka adresa pilota"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
 msgid "Anniversary"
 msgstr "_GodiÅ¡njica:"
 
@@ -224,264 +250,238 @@ msgstr "_GodiÅ¡njica:"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986
-#: ../capplet/anjal-settings-main.c:119
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:123
 msgid "Birthday"
 msgstr "_RoÄ?endan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#| msgid "Blog"
+msgid "Blog:"
+msgstr "Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
 msgid "Calendar:"
 msgstr "Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:590
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
 msgid "Contact Editor"
 msgstr "UreÄ?ivaÄ? za kontakte"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408
-#: ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-poÅ¡ta"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Free/Busy:"
 msgstr "Slobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
 msgid "Full _Name..."
 msgstr "Puno _ime..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "KuÄ?a"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
 msgstr "LiÄ?na strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
 msgstr "Slika"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Instant Messaging"
 msgstr "Brze poruke"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Job"
 msgstr "Posao"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Mailing Address"
 msgstr "Adresa stanovanja"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "Razno"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Nic_kname:"
 msgstr "Na_dimak:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 #: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
 msgid "Other"
 msgstr "Drugo"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "Personal Information"
 msgstr "LiÄ?ni podaci"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Video Chat:"
 msgstr "Video razgovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Web Addresses"
 msgstr "Veb adrese"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "Veb log:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#| msgid "Web Addresses"
+msgid "Web addresses"
+msgstr "Veb adrese"
 
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:187
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
 msgid "Work"
 msgstr "Posao"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Anniversary:"
 msgstr "_GodiÅ¡njica:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Assistant:"
 msgstr "_PomoÄ?nik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Birthday:"
 msgstr "_RoÄ?endan:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#| msgid "Blog"
+msgid "_Blog:"
+msgstr "_Blog:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_City:"
 msgstr "_Grad:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Company:"
 msgstr "Pr_eduzeÄ?e:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Country:"
 msgstr "_DrÅ¾ava:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Department:"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_File under:"
 msgstr "Smesti _pod:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Free/Busy:"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_Home Page:"
 msgstr "_LiÄ?na strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Manager:"
 msgstr "_Rukovodilac:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Office:"
 msgstr "_Kancelarija:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_PO Box:"
 msgstr "_PoÅ¡tanski broj:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Profession:"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Spouse:"
 msgstr "S_upruÅ¾nik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_State/Province:"
 msgstr "_Republika/pokrajina:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "_Zvanje:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Video Chat:"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
 msgstr "_Å½eli da prima HTML poÅ¡tu"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Veb log:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "_Gde:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
 msgid "_Zip/Postal Code:"
 msgstr "PoÅ¡_tanski broj:"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174
-#: ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:315
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "Ime"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659
-#: ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "Izmenljivo"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:168
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
@@ -523,7 +523,7 @@ msgid "Skype"
 msgstr "Skajp"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
 msgid "Error adding contact"
 msgstr "GreÅ¡ka pri dodavanju kontakta"
 
@@ -535,45 +535,21 @@ msgstr "GreÅ¡ka pri izmeni kontakta"
 msgid "Error removing contact"
 msgstr "GreÅ¡ka pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "Izvorna knjiga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "OdrediÅ¡na knjiga"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "Je novi kontakt"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "Polja za upis"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "Obavezna polja"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "Promenjeno"
-
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "UreÄ?ivaÄ? za kontakte - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -581,58 +557,46 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "â??%sâ?? ima nevaÅ¾eÄ?i format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sâ??%sâ?? ima nevaÅ¾eÄ?i format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ??%sâ?? je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
 msgid "E_mail"
 msgstr "E-_poÅ¡ta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218
-#: ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "Å koljka"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219
-#: ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "Jedinica EShell"
-
 #: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "Dr"
@@ -699,7 +663,7 @@ msgid "_Suffix:"
 msgstr "_Sufiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "UreÄ?ivaÄ? kontakt liste"
 
@@ -716,7 +680,7 @@ msgid "_List name:"
 msgstr "Ime _liste:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:173
 msgid "_Select..."
 msgstr "Izab_eri..."
 
@@ -724,39 +688,27 @@ msgstr "Izab_eri..."
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
 msgid "Contact List Members"
 msgstr "Ä?lanovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
 msgid "_Members"
 msgstr "_Ä?lanovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Error adding list"
 msgstr "GreÅ¡ka pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
 msgid "Error modifying list"
 msgstr "GreÅ¡ka pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
 msgid "Error removing list"
 msgstr "GreÅ¡ka pri uklanjanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "Knjiga"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "Je nova lista"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "Promenjen kontakt:"
@@ -771,8 +723,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "The name or email of this contact already exists in this folder.  Would you like to add it anyway?"
-msgstr "Ime ili elektronska adresa ovog kontakta veÄ? postoji u ovoj fascikli.  Å½elite li ipak da ga dodate?"
+msgid ""
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr ""
+"Ime ili elektronska adresa ovog kontakta veÄ? postoji u ovoj fascikli.  "
+"Å½elite li ipak da ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -791,139 +747,113 @@ msgstr ""
 "u ovoj fascikli.  Å½elite li ipak da dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
 msgid "_Merge"
 msgstr "_Pripoji"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
 msgid "Any field contains"
 msgstr "Polje koje sadrÅ¾i"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
 msgid "Email begins with"
 msgstr "E-poÅ¡ta poÄ?inje sa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
 msgid "Name contains"
 msgstr "Ime sadrÅ¾i"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d kontakt"
 msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
+msgstr[3] "%d kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:317
 msgid "Error getting book view"
 msgstr "GreÅ¡ka pri uÄ?itavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "Upit"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:716
 msgid "Search Interrupted"
 msgstr "Pretraga prekinuta"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053
-#: ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817
-#: ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "Model"
-
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
 msgid "Error modifying card"
 msgstr "GreÅ¡ka pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:626
 msgid "Cut selected contacts to the clipboard"
 msgstr "SeÄ?e oznaÄ?ene kontakte u spisak iseÄ?aka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:632
 msgid "Copy selected contacts to the clipboard"
 msgstr "UmnoÅ¾ava oznaÄ?ene kontakte u spisak iseÄ?aka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:638
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska iseÄ?aka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
 msgid "Delete selected contacts"
 msgstr "ObriÅ¡i izabrane kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:650
 msgid "Select all visible contacts"
 msgstr "OznaÄ?ava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070
-#: ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "Pregled Å¡koljke"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "Izvor"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ove kontakt liste?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovu kontakt listu?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovu kontakt listu (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovaj kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovaj kontakt (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1472
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -932,11 +862,11 @@ msgstr ""
 "Otvaranje %d kontakta Ä?e takoÄ?e otvoriti %d novih prozora.\n"
 "Da li zaista Å¾elite da prikaÅ¾ete sve ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "Display _All Contacts"
 msgstr "PrikaÅ¾i _sve kontakte"
 
@@ -970,7 +900,7 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../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
@@ -1071,7 +1001,7 @@ msgid "Radio"
 msgstr "Radio"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Uloga"
@@ -1096,7 +1026,6 @@ msgid "Telex"
 msgstr "Teleks"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:819
 msgid "Title"
 msgstr "Titula"
 
@@ -1108,65 +1037,7 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Veb strana"
 
-#: ../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/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891
-#: ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483
-#: ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "Å irina"
-
-#: ../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/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897
-#: ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "Visina"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "Ima fokus"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Polje"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Ime polja"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Model teksta"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "NajveÄ?a duÅ¾ina imena polja"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "Å irina kolone"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
 msgid ""
 "\n"
 "\n"
@@ -1176,7 +1047,7 @@ msgstr ""
 "\n"
 "TraÅ¾im kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
 msgid ""
 "\n"
 "\n"
@@ -1190,7 +1061,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde za pravljenje novog kontakta."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -1204,7 +1075,7 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1214,7 +1085,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
 msgid ""
 "\n"
 "\n"
@@ -1224,10 +1095,6 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "Adapter"
-
 #: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "Poslovna e-poÅ¡ta"
@@ -1237,18 +1104,10 @@ msgid "Home Email"
 msgstr "KuÄ?na e-poÅ¡ta"
 
 #: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
 msgid "Other Email"
 msgstr "Druga e-poÅ¡ta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "Izabrano"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "Ima kursor"
-
 # note(slobo): message thread, niz --> bolji prevod je rasprava
 # note(slobo): ponegde sam za summary koristio --> â??u kratkim crtamaâ??
 # note(slobo): za memo sam koristio --> beleÅ¡ke
@@ -1259,7 +1118,7 @@ msgstr "Ima kursor"
 # note(slobo): spam , Ä?ubre --> NeÅ¾eljena poÅ¡ta
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:95
 #: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
 msgid "evolution address book"
 msgstr "Adresar Evolucije"
 
@@ -1271,13 +1130,14 @@ msgstr "Novi kontakt"
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
 msgstr[1] "trenutna fascikla adresara %s ima %d karte"
 msgstr[2] "trenutna fascikla adresara %s ima %d karti"
+msgstr[3] "trenutna fascikla adresara %s ima %d kartu"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:31
 msgid "Open"
@@ -1300,17 +1160,17 @@ msgid "Copy _Email Address"
 msgstr "UmnoÅ¾i elektronsku _adresu"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
 msgid "Copy the email address to the clipboard"
 msgstr "UmnoÅ¾ava adrese u spisak iseÄ?aka"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
 msgid "_Send New Message To..."
 msgstr "_PoÅ¡alji poruku za..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
 msgid "Send a mail message to this address"
 msgstr "Å alje poruku na ovu adresu"
 
@@ -1346,22 +1206,22 @@ msgid "Video Chat"
 msgstr "_Video razgovor:"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
 #: ../modules/calendar/e-cal-shell-view-actions.c:218
 #: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
 msgid "Calendar"
 msgstr "Kalendar"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:563
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
@@ -1392,22 +1252,19 @@ msgstr "_Veb log:"
 # Create the default Person task list
 # orange
 #. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:461
-#: ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
-#: ../modules/calendar/e-memo-shell-backend.c:154
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:115
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-migrate.c:151
+#: ../modules/calendar/e-memo-shell-backend.c:112
 #: ../modules/calendar/e-memo-shell-migrate.c:112
-#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-backend.c:112
+#: ../modules/calendar/e-task-shell-migrate.c:121
 #: ../plugins/email-custom-header/email-custom-header.c:320
 msgid "Personal"
 msgstr "LiÄ?no"
@@ -1424,146 +1281,53 @@ msgstr "LiÄ?na stranica"
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da poÅ¡aljete %s"
 
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "Uspeh"
-
-# E_BOOK_ERROR_BUSY
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "Osnovni proces je zauzet"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "Arhiva van mreÅ¾e"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "LiÄ?ni kontakt nije definisan"
-
-# E_BOOK_ERROR_URI_ALREADY_LOADED
-# E_BOOK_ERROR_PERMISSION_DENIED
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "Kontakt nije pronaÄ?en"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "IB kontakta veÄ? postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "Protokol nije podrÅ¾an"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739
-#: ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230
-#: ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "Otkazano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "Nije moguÄ?e odustati"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "Neuspela autentifikacija"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "Autentifikacija obavezna"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS nije dostupan"
-
-# E_BOOK_ERROR_NO_SUCH_SOURCE
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "Nema takvog izvora"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
 #: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "Nije dostupno u reÅ¾imu van mreÅ¾e"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "Druga greÅ¡ka"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "Neispravna verzija servera"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "Metod autentifikacije nije podrÅ¾an"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
-msgid "This address book cannot be opened. This either means this book is not marked for offline usage or not yet downloaded for offline usage. Please load the address book once in online mode to download its contents."
-msgstr "Ne mogu da otvorim ovaj adresar. To znaÄ?i da on ili nije oznaÄ?en za koriÅ¡Ä?enje van mreÅ¾e ili da joÅ¡ nije preuzet za rad van mreÅ¾e. UÄ?itajte adresar kada se poveÅ¾ete radi preuzimanja njegovog sadrÅ¾aja."
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar. To znaÄ?i da on ili nije oznaÄ?en za "
+"koriÅ¡Ä?enje van mreÅ¾e ili da joÅ¡ nije preuzet za rad van mreÅ¾e. UÄ?itajte "
+"adresar kada se poveÅ¾ete radi preuzimanja njegovog sadrÅ¾aja."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
 #, c-format
-msgid "This address book cannot be opened.  Please check that the path %s exists and that permissions are set to access it."
-msgstr "Nije moguÄ?e otvaranje ovog adresara.  Proverite da putanja %s postoji i da imate prava pristupa."
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Nije moguÄ?e otvaranje ovog adresara.  Proverite da putanja %s postoji i da "
+"imate prava pristupa."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:128
-msgid "This version of Evolution does not have LDAP support compiled in to it.  To use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr "Ovo izdanje Evolucije nema u sebi podrÅ¡ku za LDAP.  Ukoliko Å¾elite da koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa podrÅ¡kom za LDAP."
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Ovo izdanje Evolucije nema u sebi podrÅ¡ku za LDAP.  Ukoliko Å¾elite da "
+"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
+"podrÅ¡kom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
-msgid "This address book cannot be opened.  This either means that an incorrect URI was entered, or the server is unreachable."
-msgstr "Nije moguÄ?e otvaranje ovog adresara.  To znaÄ?i da ste ili uneli pogreÅ¡nu adresu, ili je server nedostupan."
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Nije moguÄ?e otvaranje ovog adresara.  To znaÄ?i da ste ili uneli pogreÅ¡nu "
+"adresu, ili je server nedostupan."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
 msgid "Detailed error message:"
 msgstr "Detalji greÅ¡ke:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1575,7 +1339,7 @@ msgstr ""
 "Preciznije oblikujte upit ili poveÄ?ajte ograniÄ?enje\n"
 "broja rezultata u postavkama adresara za server direktorijuma."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -1587,44 +1351,53 @@ msgstr ""
 "upit ili poveÄ?ajte vremensko ograniÄ?enje u postavkama servera\n"
 "direktorijuma za ovaj adresar."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+#| msgid "The backend for this address book was unable to parse this query."
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+#| msgid "The backend for this address book refused to perform this query."
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspeÅ¡no zavrÅ¡en."
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, c-format
+#| msgid "This query did not complete successfully."
+msgid "This query did not complete successfully. %s"
+msgstr "Ovaj upit nije uspeÅ¡no zavrÅ¡en. %s"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
 msgid "Select Address Book"
 msgstr "Izaberi adresar"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
 msgid "Copy contact to"
 msgstr "UmnoÅ¾i kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
 msgid "Copy contacts to"
 msgstr "UmnoÅ¾i kontakte u"
 
@@ -1632,55 +1405,62 @@ msgstr "UmnoÅ¾i kontakte u"
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
 #: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685
-#: ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "UvoÅ¾enje..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozila CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolucija CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolucijin CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin uvoznik vKarti"
 
+#. Uncomment next if it is successful to get total number if pages in list view
+#. * g_object_get (operation, "n-pages", &n_pages, NULL)
+#: ../addressbook/printing/e-contact-print.c:746
+#, c-format
+#| msgid "Page %d of %d"
+msgid "Page %d"
+msgstr "%d. stranica"
+
 #: ../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
@@ -1720,16 +1500,23 @@ msgid "Export in asynchronous mode"
 msgstr "Izvezi u neusklaÄ?enom reÅ¾imu"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:59
-msgid "The number of cards in one output file in asynchronous mode, default size 100."
-msgstr "Broj karti u jednoj izlaznoj datoteci u neusklaÄ?enom reÅ¾imu, podrazumevana veliÄ?ina 100."
+msgid ""
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
+msgstr ""
+"Broj karti u jednoj izlaznoj datoteci u neusklaÄ?enom reÅ¾imu, podrazumevana "
+"veliÄ?ina 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "BROJ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:101
-msgid "Command line arguments error, please use --help option to see the usage."
-msgstr "GreÅ¡ka u argumentima komande, koristite opciju --help da vidite kako se koristi."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
+"GreÅ¡ka u argumentima komande, koristite opciju --help da vidite kako se "
+"koristi."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:115
 msgid "Only support csv or vcard format."
@@ -1751,21 +1538,21 @@ msgstr "Nepoznata greÅ¡ka"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupanje LDAP serveru"
 
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
 msgid "Failed to authenticate.\n"
 msgstr "Neuspela autentifikacija.\n"
 
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Unesite lozinku za %s (korisnik %s)"
 
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
 #: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -1773,21 +1560,45 @@ msgstr "Unesite lozinku"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar from the side bar in the Calendar view."
-msgstr "Kalendar â??{0}â?? je samo za Ä?itanje i nije podloÅ¾an izmenama. Izaberite drugi kalendar sa boÄ?ne trake u pregledu kalendara."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar from the side bar in the Calendar view."
+msgstr ""
+"Kalendar â??{0}â?? je samo za Ä?itanje i nije podloÅ¾an izmenama. Izaberite drugi "
+"kalendar sa boÄ?ne trake u pregledu kalendara."
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
-msgid "'{0}' is a read-only calendar and cannot be modified. Please select a different calendar that can accept appointments."
-msgstr "Kalendar â??{0}â?? je samo za Ä?itanje i nije ga moguÄ?e menjati. Izaberite drugi kalendar koji prihvata zakazivanje."
+msgid ""
+"'{0}' is a read-only calendar and cannot be modified. Please select a "
+"different calendar that can accept appointments."
+msgstr ""
+"Kalendar â??{0}â?? je samo za Ä?itanje i nije ga moguÄ?e menjati. Izaberite drugi "
+"kalendar koji prihvata zakazivanje."
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
-msgstr "Dodavanjem smislenog saÅ¾etka zakazivanju daÄ?ete primaocima do znanja u vezi Ä?ega zakazujete."
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your appointment will give your recipients "
+#| "an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
+msgstr ""
+"Dodavanjem smislenog saÅ¾etka zakazivanju daÄ?ete primaocima do znanja u vezi "
+"Ä?ega zakazujete."
 
 #: ../calendar/calendar.error.xml.h:6
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
-msgstr "Dodavanjem smislenog saÅ¾etka zadatku daÄ?ete primaocima do znanja u vezi Ä?ega je zadatak."
+#, fuzzy
+#| msgid ""
+#| "Adding a meaningful summary to your task will give your recipients an "
+#| "idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
+msgstr ""
+"Dodavanjem smislenog saÅ¾etka zadatku daÄ?ete primaocima do znanja u vezi Ä?ega "
+"je zadatak."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
@@ -1798,7 +1609,9 @@ msgid "All information in this memo will be deleted and can not be restored."
 msgstr "Svi podaci u ovoj beleÅ¡ci biÄ?e obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "Svi podaci o ovim zakazivanjima biÄ?e obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:10
@@ -1807,11 +1620,14 @@ msgstr "Svi podaci o ovim zadacima biÄ?e uklonjeni i neÄ?e se moÄ?i povratiti."
 
 # calendar:prompt-delete-appointment secondary
 #: ../calendar/calendar.error.xml.h:11
-msgid "All information on this appointment will be deleted and can not be restored."
-msgstr "Svi podaci o ovom zakazivanju Ä?e biti obrisani i neÄ?e se moÄ?i povratiti."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+"Svi podaci o ovom zakazivanju Ä?e biti obrisani i neÄ?e se moÄ?i povratiti."
 
 #: ../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 "Svi podaci o ovom sastanku Ä?e biti uklonjeni i neÄ?e se moÄ?i povratiti."
 
 #: ../calendar/calendar.error.xml.h:13
@@ -1877,38 +1693,38 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "Sigurno Å¾elite da saÄ?uvate beleÅ¡ku bez saÅ¾etka?"
+#, fuzzy
+#| msgid "Are you sure you want to send the appointment without a summary?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "Sigurno Å¾elite da poÅ¡aljete zakazivanje bez saÅ¾etka?"
 
 #: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "Sigurno Å¾elite da poÅ¡aljete zakazivanje bez saÅ¾etka?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "Sigurno Å¾elite da saÄ?uvate beleÅ¡ku bez saÅ¾etka?"
 
 #: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
+#, fuzzy
+#| msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete zadatak bez saÅ¾etka?"
 
 #: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "Arhiva kalendara je van mreÅ¾e."
-
-#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "Nije moguÄ?e napraviti novi dogaÄ?aj"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
 msgstr "Nije moguÄ?e saÄ?uvati dogaÄ?aj"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
 msgstr "Obrisati kalendar â??{0}â???"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
 msgstr "Obrisati spisak beleÅ¡ki â??{0}â???"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
 msgstr "Obrisati spisak zadataka â??{0}â???"
 
@@ -1929,13 +1745,20 @@ msgid "Editor could not be loaded."
 msgstr "UreÄ?ivaÄ? nije mogao biti uÄ?itan."
 
 #: ../calendar/calendar.error.xml.h:39
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
-msgstr "Pozivnice e-poÅ¡tom biÄ?e poslate svim uÄ?esnicima da bi mogli da prihvate ovaj zadatak."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+"Pozivnice e-poÅ¡tom biÄ?e poslate svim uÄ?esnicima da bi mogli da prihvate ovaj "
+"zadatak."
 
 # bug: what's RSVP?
 #: ../calendar/calendar.error.xml.h:40
-msgid "Email invitations will be sent to all participants and allow them to reply."
-msgstr "Pozivnice Ä?e biti poslate e-poÅ¡tom svim uÄ?esnicima i omoguÄ?iÄ?e im da odgovore."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
+msgstr ""
+"Pozivnice Ä?e biti poslate e-poÅ¡tom svim uÄ?esnicima i omoguÄ?iÄ?e im da "
+"odgovore."
 
 #: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
@@ -1949,235 +1772,207 @@ msgstr "GreÅ¡ka pri uÄ?itavanju spiska beleÅ¡ki"
 msgid "Error loading task list"
 msgstr "GreÅ¡ka pri uÄ?itavanju spiska zadataka"
 
-#. For Translators: {0} is specify the backend server
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e "
+"znati da je sastanak otkazan."
+
 #: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "GreÅ¡ka na â??{0}â??"
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr ""
+"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e "
+"znati da je beleÅ¡ka obrisana."
 
 #: ../calendar/calendar.error.xml.h:46
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
-msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e znati da je sastanak otkazan."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+"Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e "
+"znati da je zadatak obrisan."
 
 #: ../calendar/calendar.error.xml.h:47
-msgid "If you do not send a cancelation notice, the other participants may not know the memo has been deleted."
-msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e znati da je beleÅ¡ka obrisana."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+"Slanje osveÅ¾enih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov kalendar bude "
+"u toku."
 
 #: ../calendar/calendar.error.xml.h:48
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
-msgstr "Ukoliko ne poÅ¡aljete obaveÅ¡tenje o otkazivanju, ostali uÄ?esnici moÅ¾da neÄ?e znati da je zadatak obrisan."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+"Slanje osveÅ¾enih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov spisak "
+"zadataka bude u toku."
 
 #: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "Nema odgovora servera."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr ""
+"Preuzima se nekoliko priloga. Ukoliko sada saÄ?uvate zakazivanje ovi prilozi "
+"neÄ?e biti saÄ?uvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:50
-msgid "Sending updated information allows other participants to keep their calendars up to date."
-msgstr "Slanje osveÅ¾enih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov kalendar bude u toku."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Preuzimanje nekoliko priloga je u toku. Ukoliko sada saÄ?uvate zadatak ovi "
+"prilozi neÄ?e biti saÄ?uvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:51
-msgid "Sending updated information allows other participants to keep their task lists up to date."
-msgstr "Slanje osveÅ¾enih podataka omoguÄ?ava ostalim uÄ?esnicima da njihov spisak zadataka bude u toku."
-
-#: ../calendar/calendar.error.xml.h:52
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
-msgstr "Preuzima se nekoliko priloga. Ukoliko sada saÄ?uvate zakazivanje ovi prilozi neÄ?e biti saÄ?uvani sa njim."
-
-#: ../calendar/calendar.error.xml.h:53
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
-msgstr "Preuzimanje nekoliko priloga je u toku. Ukoliko sada saÄ?uvate zadatak ovi prilozi neÄ?e biti saÄ?uvani sa njim."
-
-#: ../calendar/calendar.error.xml.h:54
 msgid "Some features may not work properly with your current server."
 msgstr "Na tekuÄ?oj verziji servera neke moguÄ?nosti moÅ¾da neÄ?e ispravno raditi."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Kalendar Evolucije je neoÄ?ekivano zavrÅ¡io."
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Kalendari Evolucije su neoÄ?ekivano zavrÅ¡ili."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Kalendar Evolucije je neoÄ?ekivano zavrÅ¡io."
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Zadaci Evolucije su neoÄ?ekivano zavrÅ¡ili."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
 msgid "The calendar is not marked for offline usage."
 msgstr "Ovaj kalendar nije oznaÄ?en za koriÅ¡Ä?enje van mreÅ¾e."
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
 msgid "The memo list is not marked for offline usage."
 msgstr "Spisak beleÅ¡ki nije oznaÄ?en za koriÅ¡Ä?enje van mreÅ¾e."
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
 msgid "The task list is not marked for offline usage."
 msgstr "Spisak zadataka nije oznaÄ?en za koriÅ¡Ä?enje van mreÅ¾e."
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
 msgid "This calendar will be removed permanently."
 msgstr "Ovaj kalendar Ä?e biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
 msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleÅ¡ki Ä?e biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
 msgid "This task list will be removed permanently."
 msgstr "Ovaj spisak zadataka Ä?e biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "Ne mogu da otvorim kalendar"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to save your changes to this appointment?"
 msgstr "Å½elite li da saÄ?uvate promene u zakazivanju?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Å½elite li da saÄ?uvate izmene na ovom sastanku?"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
 msgid "Would you like to save your changes to this memo?"
 msgstr "Å½elite li da saÄ?uvate promene na ovoj beleÅ¡ci?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this task?"
 msgstr "Å½elite li da saÄ?uvate promene na ovom zadatku?"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "Å½elite li da poÅ¡aljete obaveÅ¡tenje o otkazivanju za ovu beleÅ¡ku?"
 
 # calendar:prompt-cancel-task primary
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "Å½elite li da poÅ¡aljete svim uÄ?esnicima obaveÅ¡tenje o otkazivanju?"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "Å½elite li da poÅ¡aljete pozive na sastanak uÄ?esnicima?"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send this task to participants?"
 msgstr "Å½elite li da poÅ¡aljete ovaj zadatak uÄ?esnicima?"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "Å½elite li da poÅ¡aljete osveÅ¾ene podatke o sastanku uÄ?esnicima?"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send updated task information to participants?"
 msgstr "Å½elite li da poÅ¡aljete osveÅ¾ene podatke o zadatku uÄ?esnicima?"
 
-#: ../calendar/calendar.error.xml.h:76
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "Povezujete se na nepodrÅ¾an GroupWise server Å¡to moÅ¾e da dovede do problema u radu Evolucije. Najbolje je da server bude nadograÄ?en na podrÅ¾anu verziju."
+#: ../calendar/calendar.error.xml.h:72
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Povezujete se na nepodrÅ¾an GroupWise server Å¡to moÅ¾e da dovede do problema u "
+"radu Evolucije. Najbolje je da server bude nadograÄ?en na podrÅ¾anu verziju."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "Promenili ste ovaj zakazivanje, ali promene joÅ¡ niste saÄ?uvali."
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Izmenili ste ovaj sastanak, ali izmene joÅ¡ nisu saÄ?uvane."
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
 msgid "You have changed this task, but not yet saved it."
 msgstr "Promenili ste ovaj zadatak, ali promene joÅ¡ niste saÄ?uvali."
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "Promenili ste ovu beleÅ¡ku, ali promene joÅ¡ niste saÄ?uvali."
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "Kalendari neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "BeleÅ¡ka neÄ?e biti dostupna dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "Zadaci neÄ?e biti dostupni dok se Evolucija ponovo ne pokrene."
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
 #: ../composer/mail-composer.error.xml.h:24
 msgid "_Discard Changes"
 msgstr "_Zanemari promene"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
 msgid "_Save"
 msgstr "_SaÄ?uvaj"
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
 msgid "_Save Changes"
 msgstr "SaÄ?uvaj pro_mene"
 
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28
-#: ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:141
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_PoÅ¡alji"
 
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
 msgid "_Send Notice"
 msgstr "PoÅ¡alji po_dsetnik"
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}."
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "Podeli viÅ¡ednevne dogaÄ?aje:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "Neuspelo pokretanje evolucija-servera-podataka"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "Neuspelo Ä?itanje programskog bloka pilotovog Kalendara"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "Neuspelo Ä?itanje pilotovog bloka beleÅ¡ki"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "Neuspeo upis pilotovog bloka beleÅ¡ki"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "Podrazumevana vaÅ¾nost:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "Neuspelo Ä?itanje pilotovog ToDo programskog bloka"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "Neuspeo upis u pilotov blok â??uraditiâ??"
-
 # bug: plural-forms
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
@@ -2185,6 +1980,7 @@ msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuta"
 msgstr[2] "minuta"
+msgstr[3] "minut"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
 msgid "hour"
@@ -2192,8 +1988,9 @@ msgid_plural "hours"
 msgstr[0] "sat"
 msgstr[1] "sata"
 msgstr[2] "sati"
+msgstr[3] "sat"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
 msgid "Start time"
 msgstr "Vreme poÄ?etka"
 
@@ -2208,10 +2005,10 @@ msgstr "Zanemari _sve"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
 msgid "Location:"
 msgstr "Lokacija:"
 
@@ -2224,12 +2021,11 @@ msgid "_Dismiss"
 msgstr "_Zanemari"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1016
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-#: ../filter/filter.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:152
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1608
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_UreÄ?ivanje"
@@ -2239,11 +2035,10 @@ msgid "_Snooze"
 msgstr "Dre_manje"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
 #: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
 msgid "hours"
 msgstr "sati"
 
@@ -2252,43 +2047,42 @@ msgid "location of appointment"
 msgstr "zakazana lokacija"
 
 # bug: plural-forms
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-#: ../e-util/e-plugin-util.c:422
-#: ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
+#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/google-account-setup/google-contacts-source.c:334
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
 msgid "No summary available."
 msgstr "Nema dostupnog saÅ¾etka."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
 #, c-format
 msgid "You have %d alarms"
 msgstr "Broj postavljenih alarma: %d"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
 #: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2300,22 +2094,24 @@ msgstr ""
 "podsetnik podeÅ¡en da poÅ¡alje poruku. Evolucija Ä?e\n"
 "umesto toga prikazati normalno prozorÄ?e."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsetnik Evolucija kalendara Ä?e biti pokrenut. Ovaj podsetnik je podeÅ¡en da pokrene sledeÄ?i program:\n"
+"Podsetnik Evolucija kalendara Ä?e biti pokrenut. Ovaj podsetnik je podeÅ¡en da "
+"pokrene sledeÄ?i program:\n"
 "\n"
 "        %s\n"
 "\n"
 "Sigurno Å¾elite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -2324,8 +2120,7 @@ msgid "invalid time"
 msgstr "neispravno vreme"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:69
-#: ../calendar/gui/e-alarm-list.c:406
+#: ../calendar/gui/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:406
 #: ../calendar/gui/misc.c:116
 #, c-format
 msgid "%d hour"
@@ -2333,10 +2128,10 @@ msgid_plural "%d hours"
 msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
+msgstr[3] "%d sat"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/gui/alarm-notify/util.c:75
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:412
 #: ../calendar/gui/misc.c:122
 #, c-format
 msgid "%d minute"
@@ -2344,12 +2139,12 @@ msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
+msgstr[3] "%d minut"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/e-alarm-list.c:418
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:418
 #: ../calendar/gui/misc.c:126
 #, c-format
 msgid "%d second"
@@ -2357,13 +2152,14 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekunda"
 msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
+msgstr[3] "%d sekunda"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "Programi za alarm"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Vreme u sekundama za koje se prikazuje greÅ¡ka u statusnoj traci."
 
@@ -2384,488 +2180,553 @@ msgid "Calendars to run alarms for"
 msgstr "Kalendari za koje se pokreÄ?e alarm"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
-msgid "Check this to use system timezone in Evolution."
-msgstr "OznaÄ?ite ovo da bi Evolucija koristila vremensku zonu sistema."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgstr ""
+"Boja za iscrtavanje Markus Bejns linije u traci vremena (podrazumevano je "
+"prazno)."
 
 #: ../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 "Boja za iscrtavanje Markus Bejns linije u traci vremena (podrazumevano je prazno)."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Compress weekends in month view"
 msgstr "SaÅ¾mi vikende u meseÄ?ni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Confirm expunge"
 msgstr "Potvrdi praÅ¾njenje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Count of default recurrence for a new event. -1 means forever."
 msgstr "Broj podrazumevanih ponavljanja novog dogaÄ?aja. -1 znaÄ?i zauvek."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "Potrebno je oznaÄ?iti dane kojima poÄ?inju i zavrÅ¡avaju se radni Ä?asovi."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default recurrence count"
 msgstr "Podrazumevan broj ponavljanja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Directory for saving alarm audio files"
 msgstr "Direktorijum za Ä?uvanje zvuÄ?nih datoteka alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Event Gradient"
 msgstr "Stepen dogaÄ?aja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Transparency"
 msgstr "Providnost dogaÄ?aja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Free/busy server URLs"
 msgstr "Adrese servera za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Gradient of the events in calendar views."
 msgstr "Stepen dogaÄ?aja u pregledu kalendara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Hide completed tasks"
 msgstr "Sakrij zavrÅ¡ene zadatke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task value"
 msgstr "Sakrij vrednost zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Horizontal pane position"
 msgstr "Pozicija poloÅ¾ene povrÅ¡i"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
-msgstr "Sat kojim se zavrÅ¡ava radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
+msgstr ""
+"Sat kojim se zavrÅ¡ava radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 "
+"do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
-msgstr "Sat kojim poÄ?inje radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
+msgstr ""
+"Sat kojim poÄ?inje radna nedelja, u dvadesetÄ?etvoroÄ?asovnom obliku, od 0 do 23."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "Ukoliko je â??taÄ?noâ??, u glavnom prozoru prikazuje pregled beleÅ¡ki."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Ukoliko je â??taÄ?noâ??, u glavnom prozoru prikazuje pregled zadataka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Last alarm time"
 msgstr "Poslednje vreme za alarm"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "List of recently used second time zones in a Day View."
 msgstr "Spisak nedavno koriÅ¡Ä?enih drugih vremenskih zona u Dnevnom pregledu."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of server URLs for free/busy publishing."
 msgstr "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Boja Markus Bejns linije - Dnevni pregled"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Boja Markus Bejns linije - traka vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
-msgid "Maximum number of recently used timezones to remember in a 'day_second_zones' list."
-msgstr "NajveÄ?i broj nedavno koriÅ¡Ä?enih vremenskih zona za pamÄ?enje u spisku â??day_second_zonesâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+msgid ""
+"Maximum number of recently used timezones to remember in a "
+"'day_second_zones' list."
+msgstr ""
+"NajveÄ?i broj nedavno koriÅ¡Ä?enih vremenskih zona za pamÄ?enje u spisku "
+"â??day_second_zonesâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NajveÄ?i broj nedavno koriÅ¡Ä?enih vremenskih zona za pamÄ?enje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Memo layout style"
 msgstr "Stil razmeÅ¡taja beleÅ¡ke"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid "Memo preview pane position (horizontal)"
 msgstr "Pozicija pregleda beleÅ¡ki (vertikalno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid "Memo preview pane position (vertical)"
 msgstr "Pozicija pregleda beleÅ¡ke (vertikalno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se zavrÅ¡ava radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim poÄ?inje radni dan, od 0 do 59."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Month view horizontal pane position"
 msgstr "Pozicija poloÅ¾ene povrÅ¡i MeseÄ?nog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view vertical pane position"
 msgstr "Pozicija uspravne povrÅ¡i MeseÄ?nog pregleda"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Number of units for determining a default reminder."
 msgstr "Broj jedinica za odreÄ?ivanje podrazumevanog podsetnika."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining when to hide tasks."
 msgstr "Broj jedinica za odreÄ?ivanje kada sakriti zadatke."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Overdue tasks color"
 msgstr "Boja prekoraÄ?enih zadataka"
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+msgid ""
+"Position of the horizontal pane, between the date navigator calendar and the "
+"task list when not in the month view, in pixels."
+msgstr ""
+"Pozicija poloÅ¾ene povrÅ¡i, izmeÄ?u dela kalendara za datum i spiska zadataka "
+"kada nije postavljen meseÄ?ni pregled, u pikselima."
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-msgstr "Pozicija poloÅ¾ene povrÅ¡i, izmeÄ?u dela kalendara za datum i spiska zadataka kada nije postavljen meseÄ?ni pregled, u pikselima."
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Pozicija poloÅ¾ene povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska "
+"zadataka u meseÄ?nom pregledu, u pikselima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Pozicija poloÅ¾ene povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka u meseÄ?nom pregledu, u pikselima."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Pozicija pregleda beÄ?eÅ¡ki kada je postavljeno vertikalno."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno."
 
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid ""
+"Position of the vertical pane, between the calendar lists and the date "
+"navigator calendar."
+msgstr ""
+"PoloÅ¾aj uspravne povrÅ¡i, izmeÄ?u liste kalendara i navigacije kalendara po "
+"datumu."
+
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
-msgid "Position of the vertical pane, between the calendar lists and the date navigator calendar."
-msgstr "PoloÅ¾aj uspravne povrÅ¡i, izmeÄ?u liste kalendara i navigacije kalendara po datumu."
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska "
+"zadataka u meseÄ?nom pregledu, u pikselima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka u meseÄ?nom pregledu, u pikselima."
+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."
+msgstr ""
+"Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska "
+"zadataka kada nije postavljen meseÄ?ni pregled, u pikselima."
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-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."
-msgstr "Pozicija uspravne povrÅ¡i, izmeÄ?u pregleda i dela kalendara za datum i spiska zadataka kada nije postavljen meseÄ?ni pregled, u pikselima."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
 msgid "Primary memo list"
 msgstr "Primarni spisak beleÅ¡ki"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid "Programs that are allowed to be run by alarms."
 msgstr "Programi koji mogu biti pokrenuti alarmima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Recently used second time zones in a Day View"
 msgstr "Nedavno koriÅ¡Ä?ene druge vremenske zone u Dnevnom pregledu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Save directory for alarm audio"
 msgstr "Direktorijum za Ä?uvanje zvuÄ?nih alarma"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Scroll Month View by a week"
 msgstr "MeseÄ?ni pregled po nedeljama"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "PrikaÅ¾i RSVP polje u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "PrikaÅ¾i polje uloge u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show appointment end times in week and month views"
 msgstr "Prikazuje vremena zakazanog zavrÅ¡etka u nedeljnim i meseÄ?nim pregledima"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "PrikaÅ¾i polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka/zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show display alarms in notification tray"
 msgstr "Prikazuje alarme u obaveÅ¡tajnoj zoni"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show status field in the event/task/meeting editor"
 msgstr "PrikaÅ¾i polje stanja u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleÅ¡ki"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Show timezone field in the event/meeting editor"
 msgstr "PrikaÅ¾i polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show type field in the event/task/meeting editor"
 msgstr "PrikaÅ¾i polje tipa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week number in Day and Work Week View"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#, fuzzy
+#| msgid "Show week number in Day and Work Week View"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "Prikazuje broj nedelje u dnevnom i pregledu za radnu nedelju"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
-msgid "Show week numbers in date navigator"
-msgstr "Prikazuje brojeve nedelja u delu za datum"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
-msgid "Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key."
-msgstr "Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podeÅ¡ena. Vrednost je sliÄ?na onoj koja je koriÅ¡Ä?ena u kljuÄ?u â??timezoneâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+msgid ""
+"Shows the second time zone in a Day View, if set. Value is similar to one "
+"used in a 'timezone' key."
+msgstr ""
+"Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podeÅ¡ena. "
+"Vrednost je sliÄ?na onoj koja je koriÅ¡Ä?ena u kljuÄ?u â??timezoneâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Task layout style"
 msgstr "Stil razmeÅ¡taja"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Task preview pane position (horizontal)"
 msgstr "Pozicija pregleda zadataka (horizontalno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Task preview pane position (vertical)"
 msgstr "Pozicija pregleda zadataka (vertikalno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "Model adrese za koriÅ¡Ä?enje u povraÄ?aju vremena slobodno/zauzeto, %u se zamenjuje korisniÄ?kim delom elektronske adrese, a %d domenom."
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"Model adrese za koriÅ¡Ä?enje u povraÄ?aju vremena slobodno/zauzeto, %u se "
+"zamenjuje korisniÄ?kim delom elektronske adrese, a %d domenom."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
-msgid "The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like \"America/New York\"."
-msgstr "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao neprevedeno mesto baze vremenske zone Olsen, kao â??Amerika/Njujorkâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
+"neprevedeno mesto baze vremenske zone Olsen, kao â??Amerika/Njujorkâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
-msgid "The layout style determines where to place the preview pane in relation to the memo list. \"0\" (Classic View) places the preview pane below the memo list. \"1\" (Vertical View) places the preview pane next to the memo list."
-msgstr "Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak beleÅ¡ki. â??0â?? (klasiÄ?an pregled) postavlja pregled ispod spiska beleÅ¡ki. â??1â?? (vertikalan pregled) postavlja pregled pored spiska beleÅ¡ki."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+"Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak beleÅ¡ki. "
+"â??0â?? (klasiÄ?an pregled) postavlja pregled ispod spiska beleÅ¡ki. "
+"â??1â?? (vertikalan pregled) postavlja pregled pored spiska beleÅ¡ki."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
-msgid "The layout style determines where to place the preview pane in relation to the task list. \"0\" (Classic View) places the preview pane below the task list. \"1\" (Vertical View) places the preview pane next to the task list."
-msgstr "Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak zadataka. â??0â?? (klasiÄ?an pregled) postavlja pregled ispod spiska zadataka. â??1â?? (vertikalan pregled) postavlja pregled pored spiska zadataka."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+"Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak zadataka. "
+"â??0â?? (klasiÄ?an pregled) postavlja pregled ispod spiska zadataka. "
+"â??1â?? (vertikalan pregled) postavlja pregled pored spiska zadataka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "The second timezone for a Day View"
 msgstr "Druga vremenska zona u Dnevnom pregledu"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
-msgid "This can have three possible values. 0 for errors. 1 for warnings. 2 for debug messages."
-msgstr "MoÅ¾e imati tri vrednosti. 0 za greÅ¡ke. 1 za upozorenja. 2 za poruke o dijagnozi kvara."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+"MoÅ¾e imati tri vrednosti. 0 za greÅ¡ke. 1 za upozorenja. 2 za poruke o "
+"dijagnozi kvara."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Time divisions"
 msgstr "Podela vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Time the last alarm ran, in time_t."
 msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
-msgid "Transparency of the events in calendar views, a value between 0 (transparent) and 1 (opaque)."
-msgstr "Providnost dokaÄ?aja u pregledu kalendara, vrednost izmeÄ?u 0 (providno) i 1 (neprovidno)"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+msgid ""
+"Transparency of the events in calendar views, a value between 0 "
+"(transparent) and 1 (opaque)."
+msgstr ""
+"Providnost dokaÄ?aja u pregledu kalendara, vrednost izmeÄ?u 0 (providno) i 1 "
+"(neprovidno)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Twenty four hour time format"
 msgstr "24-Ä?asovni oblik vremena"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "URI of the highlighted (\"primary\") calendar"
 msgstr "Adresa oznaÄ?enog â??primarnogâ?? kalendara"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "URI of the highlighted (\"primary\") memo list"
 msgstr "Adresa oznaÄ?enog â??primarnogâ?? spiska beleÅ¡ki"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
 msgid "URI of the highlighted (\"primary\") task list"
 msgstr "Adresa oznaÄ?enog â??primarnogâ?? spiska zadataka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "Jedinice za podrazumevani podsetnik, â??minutiâ??, â??satiâ?? ili â??daniâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
-msgstr "Jedinice za odreÄ?ivanje kada sakriti zaduÅ¾enja, â??minutiâ??, â??satiâ?? ili â??daniâ??."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgstr ""
+"Jedinice za odreÄ?ivanje kada sakriti zaduÅ¾enja, â??minutiâ??, â??satiâ?? ili â??daniâ??."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Use system timezone"
 msgstr "Koristi vremensku zonu sistema"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid "Use the system timezone instead of the timezone selected in Evolution."
-msgstr "Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji."
+msgstr ""
+"Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
 msgid "Vertical pane position"
 msgstr "PoloÅ¾aj uspravne povrÅ¡i"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
 msgid "Week start"
 msgstr "PoÄ?etak nedelje"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dan kojim poÄ?inje nedelja, od nedelje (0) do subote (6)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "Da li da koristi obaveÅ¡tajnu zonu za prikazivanje alarma."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "Da li da traÅ¾i potvrdu za brisanje zakazivanja ili zadatka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "Da li da traÅ¾i potvrdu pri izbacivanjuzakazivanja ili zadatka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
-msgstr "Da li da saÅ¾me vikende u meseÄ?nom pregledu, koji subotu i nedelju stavlja u prostor radne nedelje."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
+msgstr ""
+"Da li da saÅ¾me vikende u meseÄ?nom pregledu, koji subotu i nedelju stavlja u "
+"prostor radne nedelje."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to display the end time of events in the week and month views."
-msgstr "Da li da prikaÅ¾e vremena zavrÅ¡etka dogaÄ?aja u nedeljnim i meseÄ?nim pregledima."
+msgstr ""
+"Da li da prikaÅ¾e vremena zavrÅ¡etka dogaÄ?aja u nedeljnim i meseÄ?nim pregledima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+msgid ""
+"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "Da li da sakrije zavrÅ¡ene zadatke u pregledu zadataka."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid "Whether to scroll a Month View by a week, not by a month."
 msgstr "Da li da prikaÅ¾e MeseÄ?ni pregled po nedeljama, umesto mesecima."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to set a default reminder for appointments."
 msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "Da li da prikaÅ¾e polje RSVP u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaÅ¾e polje kategorije u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show role field in the event/task/meeting editor"
-msgstr "Da li da prikaÅ¾e polje sa ulogom u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
+msgstr ""
+"Da li da prikaÅ¾e polje sa ulogom u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Da li da prikaÅ¾e polje statusa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+msgid ""
+"Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "Da li da prikaÅ¾e vreme u dvadesetoÄ?asovnom formatu, umesto am/pm."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Da li da prikaÅ¾e polje vremenske zone u ureÄ?ivaÄ?u dogaÄ?aja/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaÅ¾e polje tipa u ureÄ?ivaÄ?u dogaÄ?aja/zadataka/sastanaka"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "Da li da prikaÅ¾e broj nedelje u pregledima za dan i radnu nedelju."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
-msgid "Whether to show week numbers in the date navigator."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#, fuzzy
+#| msgid "Whether to show week numbers in the date navigator."
+msgid "Whether to show week numbers in various places in the Calendar."
 msgstr "Da li da prikaÅ¾e brojeve nedelja u delu za datum."
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Work days"
 msgstr "Radni dani"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Workday end hour"
 msgstr "Ä?as kojim se zavrÅ¡ava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Workday end minute"
 msgstr "Minut kojim se zavrÅ¡ava radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Workday start hour"
 msgstr "Ä?as kojim poÄ?inje radni dan"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday start minute"
 msgstr "Minut kojim poÄ?inje radni dan"
 
@@ -2889,16 +2750,13 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "MeseÄ?ni pregled"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:3
 msgid "Any Field"
 msgstr "Bilo koje polje"
 
-#: ../calendar/gui/caltypes.xml.h:3
-#: ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:5
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:5 ../mail/em-filter-i18n.h:5
 msgid "Attachments"
 msgstr "Prilozi"
 
@@ -2908,135 +2766,109 @@ msgstr "Prilozi"
 msgid "Attendee"
 msgstr "_UÄ?esnik"
 
-#: ../calendar/gui/caltypes.xml.h:5
-#: ../calendar/gui/memotypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../calendar/gui/caltypes.xml.h:6
-#: ../calendar/gui/memotypes.xml.h:5
+#: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
 msgid "Classification"
 msgstr "Razvrstavanje"
 
-#: ../calendar/gui/caltypes.xml.h:7
-#: ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:560
-#: ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
 #: ../calendar/gui/memotypes.xml.h:6
 #: ../plugins/email-custom-header/email-custom-header.c:323
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../calendar/gui/caltypes.xml.h:8
-#: ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
 #: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
 #: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/gui/caltypes.xml.h:9
-#: ../calendar/gui/memotypes.xml.h:8
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/memotypes.xml.h:8
 #: ../calendar/gui/tasktypes.xml.h:11
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../calendar/gui/caltypes.xml.h:10
-#: ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:12
-#: ../mail/em-filter-i18n.h:22
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/memotypes.xml.h:9
+#: ../calendar/gui/tasktypes.xml.h:12 ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
-#: ../calendar/gui/caltypes.xml.h:11
-#: ../calendar/gui/memotypes.xml.h:10
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../mail/em-filter-i18n.h:25
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/tasktypes.xml.h:13 ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "Postoji"
 
 #: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 #: ../plugins/save-calendar/csv-format.c:377
 msgid "Location"
 msgstr "Mesto"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
 #: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:558
-#: ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "LiÄ?no"
 
-#: ../calendar/gui/caltypes.xml.h:15
-#: ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:549
-#: ../calendar/gui/e-cal-model.c:556
-#: ../calendar/gui/e-task-table.c:486
-#: ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "UÄ?estalost"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
 #: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../calendar/gui/memotypes.xml.h:14
+#: ../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:363
 msgid "Summary"
 msgstr "SaÅ¾etak"
 
-#: ../calendar/gui/caltypes.xml.h:18
-#: ../calendar/gui/memotypes.xml.h:15
+#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:15
 #: ../calendar/gui/tasktypes.xml.h:23
 msgid "Summary Contains"
 msgstr "SaÅ¾etak sadrÅ¾i"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:25
-#: ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/memotypes.xml.h:16
+#: ../calendar/gui/tasktypes.xml.h:25 ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "sadrÅ¾i"
 
-#: ../calendar/gui/caltypes.xml.h:20
-#: ../calendar/gui/memotypes.xml.h:17
-#: ../calendar/gui/tasktypes.xml.h:26
-#: ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/caltypes.xml.h:20 ../calendar/gui/memotypes.xml.h:17
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "ne sadrÅ¾i"
 
-#: ../calendar/gui/caltypes.xml.h:21
-#: ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27
-#: ../mail/em-filter-i18n.h:31
+#: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "je"
 
-#: ../calendar/gui/caltypes.xml.h:22
-#: ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "nije"
 
@@ -3069,6 +2901,7 @@ msgid "Add Alarm"
 msgstr "Dodaj alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
 msgid "Alarm"
 msgstr "Alarm"
 
@@ -3084,8 +2917,7 @@ msgstr "PrilagoÄ?en zvuk alarma"
 msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
-#: ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:81
 msgid "Options"
 msgstr "Opcije"
 
@@ -3125,20 +2957,20 @@ msgstr "posle"
 msgid "before"
 msgstr "pre"
 
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "day(s)"
 msgstr "dan(i)"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-#: ../e-util/e-plugin-util.c:424
-#: ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
+#: ../plugins/google-account-setup/google-contacts-source.c:336
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
 msgid "days"
 msgstr "dana"
 
@@ -3146,20 +2978,21 @@ msgstr "dana"
 msgid "end of appointment"
 msgstr "kraj sastanka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "prikaÅ¾i joÅ¡ na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "hour(s)"
 msgstr "sat(i)"
 
 # bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "minute(s)"
 msgstr "minut(i)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
 msgid "start of appointment"
 msgstr "zakazani poÄ?etak"
 
@@ -3173,7 +3006,7 @@ msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 msgid "Alarms"
 msgstr "Alarmi"
 
@@ -3183,30 +3016,32 @@ msgstr "Alarmi"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
 #: ../calendar/gui/e-day-view-time-item.c:797
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
 #: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za koje zvoni sat"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "Vreme i datum:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+#| msgid "Time and date:"
+msgid "Ti_me and date:"
+msgstr "_Vreme i datum:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "Samo datum:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+#| msgid "Date only:"
+msgid "_Date only:"
+msgstr "Samo _datum:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
 #, no-c-format
@@ -3242,14 +3077,13 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10
-#: ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
 msgid "Alerts"
 msgstr "Upozorenja"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
-#: ../modules/addressbook/autocompletion-config.c:153
+#: ../mail/mail-config.ui.h:30
+#: ../modules/addressbook/autocompletion-config.c:156
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
 
@@ -3274,21 +3108,20 @@ msgid "Display alarms in _notification area only"
 msgstr "Prikazuje alarme samo u _obaveÅ¡tajnoj zoni"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 #: ../calendar/gui/e-itip-control.c:738
 msgid "Friday"
 msgstr "Petak"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../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.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "OpÅ¡te"
 
@@ -3302,7 +3135,7 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Monday"
 msgstr "Ponedeljak"
@@ -3316,189 +3149,197 @@ msgstr "Ponedeljak"
 #. * part of "Include threads: None"
 #. Translators: Used in send options dialog
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
-#: ../filter/e-filter-rule.c:759
-#: ../widgets/misc/e-send-options.ui.h:12
+#: ../filter/e-filter-rule.c:759 ../widgets/misc/e-send-options.ui.h:12
 msgid "None"
 msgstr "NiÅ¡ta"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "Pick a color"
 msgstr "Bira boju"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
 msgid "S_un"
 msgstr "N_ed"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 #: ../calendar/gui/e-itip-control.c:739
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Pri_kazuje MeseÄ?ni pregled po nedeljama"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Dru_ga zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Select the calendars for alarm notification"
 msgstr "Izaberi kalendare za zvuÄ?no obaveÅ¡tenje"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Pri_kaÅ¾i podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
 msgid "Show a _reminder"
 msgstr "PrikaÅ¾i _podsetnik"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "PrikaÅ¾i _brojeve nedelja u delu za datum"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "Prikazuje _broj nedelje u pregledu za dan i radnu nedelju"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#| msgid "Show week _numbers in date navigator"
+msgid "Show week _numbers"
+msgstr "PrikaÅ¾i _brojeve nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
 msgid "T_hu"
 msgstr "U_to"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "Spisak zadataka"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
 msgid "Template:"
 msgstr "Model:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
 #: ../calendar/gui/e-itip-control.c:737
 msgid "Thursday"
 msgstr "Ä?etvrtak"
 
 # note(slobo): moÅ¾da treba rok
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
 #: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Vreme"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
 #: ../calendar/gui/e-itip-control.c:735
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
 msgid "Use s_ystem time zone"
 msgstr "Koristi vremensku zonu _sistema"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
 #: ../calendar/gui/e-itip-control.c:736
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "Wee_k starts on:"
 msgstr "PoÄ?etak n_edelje:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - Ä?asovni (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_24 hour"
 msgstr "_24 - Ä?asovni"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Ask for confirmation when deleting items"
 msgstr "_TraÅ¾i potvrdu za brisanje stavki"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Compress weekends in month view"
 msgstr "_SaÅ¾mi nedelje u meseÄ?ni pregled"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Day begins:"
 msgstr "PoÄ?etak _dana:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij zavrÅ¡ene zadatke posle"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "_Overdue tasks:"
 msgstr "_Neispunjeni zadaci:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
 msgid "_Show appointment end times in week and month view"
 msgstr "_PrikaÅ¾i zakazana vremena zavrÅ¡etka u nedeljnim i meseÄ?nim pregledima"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
 msgid "_Time divisions:"
 msgstr "Podele _vremena:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
 msgid "_Tue"
 msgstr "_Uto"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
 msgid "_Wed"
 msgstr "_Sre"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "pre svake godiÅ¡njice/roÄ?endana"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
 msgid "before every appointment"
 msgstr "pre svakog zakazivanja"
 
@@ -3507,13 +3348,12 @@ msgid "Type:"
 msgstr "Tip:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:226
-#: ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:165
+#: ../modules/addressbook/ldap-config.ui.h:26
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3532,35 +3372,35 @@ msgstr "_UmnoÅ¾ava sadrÅ¾aj spiska zadataka lokalno za rad van mreÅ¾e"
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_UmnoÅ¾ava sadrÅ¾aj spiska beleÅ¡ki lokalno za rad van mreÅ¾e"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "Colo_r:"
 msgstr "Boj_a:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "Spisak beleÅ¡ki"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
 msgid "New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
 msgid "New Memo List"
 msgstr "Novi spisak zadataka"
 
@@ -3613,281 +3453,241 @@ msgstr "%s  Niste naÄ?inili promene, osveÅ¾iti ureÄ?ivaÄ??"
 msgid "Validation error: %s"
 msgstr "GreÅ¡ka provere: %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191
-#: ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " za "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195
-#: ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (ZavrÅ¡eno "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197
-#: ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "ZavrÅ¡eno "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202
-#: ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (Do "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204
-#: ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "Do "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
 msgid "Could not save attachments"
 msgstr "Nije moguÄ?e saÄ?uvati priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:510
+#: ../calendar/gui/dialogs/comp-editor.c:522
 msgid "Could not update object"
 msgstr "Nije moguÄ?e osveÅ¾iti objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:605
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:644
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:646
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:652
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljen zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:622
+#: ../calendar/gui/dialogs/comp-editor.c:654
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:627
+#: ../calendar/gui/dialogs/comp-editor.c:659
 #, c-format
 msgid "Memo - %s"
 msgstr "BeleÅ¡ka - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:643
+#: ../calendar/gui/dialogs/comp-editor.c:675
 msgid "No Summary"
 msgstr "Bez saÅ¾etka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:786
 msgid "Keep original item?"
 msgstr "ZadrÅ¾ati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:983
 msgid "Click here to close the current window"
 msgstr "Pritisnite ovde da zatvorite tekuÄ?i prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:946
-#: ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:115
-#: ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387
-#: ../widgets/misc/e-web-view.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:117
+#: ../shell/e-shell-window-actions.c:1454
+#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
 msgid "Copy the selection"
 msgstr "UmnoÅ¾i izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
-#: ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
-#: ../widgets/misc/e-focus-tracker.c:108
-#: ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:124
+#: ../shell/e-shell-window-actions.c:1461
+#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
+#: ../widgets/misc/e-web-view.c:1055
 msgid "Cut the selection"
 msgstr "Iseci izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
-#: ../shell/e-shell-window-actions.c:1474
-#: ../widgets/misc/e-focus-tracker.c:129
-#: ../widgets/misc/e-focus-tracker.c:560
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1468
+#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
 msgid "Delete the selection"
 msgstr "ObriÅ¡i izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1011
 msgid "Click here to view help available"
 msgstr "Pritisnite ovde za dostupnu pomoÄ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:974
-#: ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
-#: ../widgets/misc/e-focus-tracker.c:122
-#: ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:131
+#: ../shell/e-shell-window-actions.c:1503
+#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
+#: ../widgets/misc/e-web-view.c:1067
 msgid "Paste the clipboard"
 msgstr "Ubaci iz spiska iseÄ?aka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:995
+#: ../calendar/gui/dialogs/comp-editor.c:1039
 msgid "Click here to save the current window"
 msgstr "Pritisnite ovde da saÄ?uvate tekuÄ?i prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1002
-#: ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
-#: ../widgets/misc/e-focus-tracker.c:136
-#: ../widgets/misc/e-focus-tracker.c:565
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:1573
+#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
 msgid "Select all text"
 msgstr "Izaberi sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1009
+#: ../calendar/gui/dialogs/comp-editor.c:1053
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1023
-#: ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:145
+#: ../shell/e-shell-window-actions.c:1615
 #: ../widgets/misc/e-signature-editor.c:217
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1030
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1622
 msgid "_Help"
 msgstr "_PomoÄ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1037
+#: ../calendar/gui/dialogs/comp-editor.c:1081
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1044
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
 msgid "_Options"
 msgstr "_Opcije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1051
-#: ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:159
+#: ../shell/e-shell-window-actions.c:1657 ../smime/gui/smime-ui.ui.h:45
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1061
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1063
+#: ../calendar/gui/dialogs/comp-editor.c:1107
 msgid "Click here to attach a file"
 msgstr "Pritisnite ovde da priloÅ¾ite dokument"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1115
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1073
+#: ../calendar/gui/dialogs/comp-editor.c:1117
 msgid "Toggles whether to display categories"
 msgstr "Bira da li da prikaÅ¾e kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1123
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1125
 msgid "Toggles whether the time zone is displayed"
 msgstr "Bira da li da prikaÅ¾e vremensku zonu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1134
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1092
+#: ../calendar/gui/dialogs/comp-editor.c:1136
 msgid "Classify as public"
 msgstr "OznaÄ?i kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "_Private"
 msgstr "L_iÄ?no"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1143
 msgid "Classify as private"
 msgstr "OznaÄ?i kao liÄ?no"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1104
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1150
 msgid "Classify as confidential"
 msgstr "OznaÄ?i kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1114
+#: ../calendar/gui/dialogs/comp-editor.c:1158
 msgid "R_ole Field"
 msgstr "_Uloga polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1116
+#: ../calendar/gui/dialogs/comp-editor.c:1160
 msgid "Toggles whether the Role field is displayed"
 msgstr "Bira da li je polje Uloga prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1122
+#: ../calendar/gui/dialogs/comp-editor.c:1166
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1168
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Bira da li je polje RSVP prikazano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/dialogs/comp-editor.c:1174
 msgid "_Status Field"
 msgstr "_Stanje polje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 msgid "Toggles whether the Status field is displayed"
 msgstr "Bira da li da prikaÅ¾e polje statusa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../calendar/gui/dialogs/comp-editor.c:1182
 msgid "_Type Field"
 msgstr "_Tip polja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1184
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Bira da li je prikazan tip prisutnih"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164
+#: ../calendar/gui/dialogs/comp-editor.c:1208
 #: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "SkoraÅ¡nji _dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1684
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
 msgid "Attach"
 msgstr "PriloÅ¾i"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1739
-msgid "Save"
-msgstr "SaÄ?uvaj"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2016
-#: ../calendar/gui/dialogs/comp-editor.c:2065
-#: ../calendar/gui/dialogs/comp-editor.c:2956
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
 msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "Promene naÄ?injene na ovoj stavki mogu biti zanemarene ako bude aÅ¾urirano"
+msgstr ""
+"Promene naÄ?injene na ovoj stavki mogu biti zanemarene ako bude aÅ¾urirano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2924
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2986
+#: ../calendar/gui/dialogs/comp-editor.c:3118
 msgid "Unable to use current version!"
 msgstr "Nije moguÄ?e koriÅ¡Ä?enje tekuÄ?e verzije!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
 msgid "Could not open source"
 msgstr "Nije moguÄ?e otvaranje izvora"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
 msgid "Could not open destination"
 msgstr "Nije moguÄ?e otvaranje odrediÅ¡ta"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
 msgid "Destination is read only"
 msgstr "OdrediÅ¡te je samo za Ä?itanje"
 
@@ -3895,52 +3695,81 @@ msgstr "OdrediÅ¡te je samo za Ä?itanje"
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "_IbriÅ¡i ovu stavku iz svih ostalih poÅ¡tanskih sanduÄ?iÄ?a primaoca?"
 
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "DogaÄ?aj nije mogao biti obrisan zbog corba greÅ¡ke"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+#| msgid "P_ercent complete:"
+msgid "_Retract comment"
+msgstr ""
 
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "Zadatak nije mogao biti izbrisan zbog corba greÅ¡ke"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, fuzzy, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "DogaÄ?aj nije mogao biti obrisan usled greÅ¡ke"
 
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "BeleÅ¡ka nije moglo biti obrisana zbog corba greÅ¡ke"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, fuzzy, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to a dbus error: %s"
+msgstr "Zadatak nije mogao biti obrisan usled greÅ¡ke"
 
+#. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "Stavka nije mogla biti obrisana zbog corba greÅ¡ke"
+#, fuzzy, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "BeleÅ¡ka nije mogla biti obrisana usled greÅ¡ke"
 
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, fuzzy, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "Stavka nije mogla biti obrisana usled greÅ¡ke"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
 msgstr "DogaÄ?aj nije mogao biti obrisan jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zadatak nije mogao biti obrisan jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
 msgstr "BeleÅ¡ka nije mogla biti obrisana jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
 msgstr "Stavka nije mogla biti obrisana jer pristup nije dozvoljen"
 
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, fuzzy, c-format
+#| msgid "The event could not be deleted due to an error"
+msgid "The event could not be deleted due to an error: %s"
 msgstr "DogaÄ?aj nije mogao biti obrisan usled greÅ¡ke"
 
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, fuzzy, c-format
+#| msgid "The task could not be deleted due to an error"
+msgid "The task could not be deleted due to an error: %s"
 msgstr "Zadatak nije mogao biti obrisan usled greÅ¡ke"
 
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, fuzzy, c-format
+#| msgid "The memo could not be deleted due to an error"
+msgid "The memo could not be deleted due to an error: %s"
 msgstr "BeleÅ¡ka nije mogla biti obrisana usled greÅ¡ke"
 
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, fuzzy, c-format
+#| msgid "The item could not be deleted due to an error"
+msgid "The item could not be deleted due to an error: %s"
 msgstr "Stavka nije mogla biti obrisana usled greÅ¡ke"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
@@ -3955,133 +3784,150 @@ msgstr "Delegiraj na:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
 msgid "_Alarms"
 msgstr "Ala_rmi"
 
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
 msgid "Click here to set or unset alarms for this event"
 msgstr "Pritisnite ovde da postavite ili iskljuÄ?ite alarm za ovaj dogaÄ?aj"
 
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "PrikaÅ¾i vreme kao _zauzeto"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "Bira da li da prikaÅ¾e vreme kao zauzeto"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
 msgid "_Recurrence"
 msgstr "_Ponavljanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
 msgid "Make this a recurring event"
 msgstr "Neka se ovaj dogaÄ?aj ponavlja"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
 #: ../widgets/misc/e-send-options.ui.h:19
 msgid "Send Options"
 msgstr "Opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
 msgid "Insert advanced send options"
 msgstr "Umetni napredne opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "All _Day Event"
 msgstr "Celodnevni dogaÄ?a_j"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoljava celodnevne dogaÄ?aje"
 
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "PrikaÅ¾i vreme kao _zauzeto"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "Bira da li da prikaÅ¾e vreme kao zauzeto"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
 msgid "_Free/Busy"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
 msgid "Query free / busy information for the attendees"
 msgstr "ZatraÅ¾i podatak za slobodno/zauzeto vreme za ove uÄ?esnike"
 
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "Zakaza_no"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "Zakazivanje"
+
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "UÄ?esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:578
+#, fuzzy
+#| msgid "Print this message"
+msgid "Print this event"
+msgstr "Å tampaj ovu poruku"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "PoÄ?etak dogaÄ?aja je u proÅ¡losti"
+
+#: ../calendar/gui/dialogs/event-page.c:807
 msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "DogaÄ?aj nije moguÄ?e ureÄ?ivati, poÅ¡to je izabrani kalendar samo za Ä?itanje"
+msgstr ""
+"DogaÄ?aj nije moguÄ?e ureÄ?ivati, poÅ¡to je izabrani kalendar samo za Ä?itanje"
 
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "DogaÄ?aj nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
 
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
 msgid "This event has alarms"
 msgstr "Ovaj dogaÄ?aj ima alarme"
 
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
 msgid "Atte_ndees"
 msgstr "UÄ?_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
 msgid "Event with no start date"
 msgstr "DogaÄ?aj bez datuma poÄ?etka"
 
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
 msgid "Event with no end date"
 msgstr "DogaÄ?aj bez datuma zavrÅ¡etka"
 
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "Start date is wrong"
 msgstr "Datum poÄ?etka je pogreÅ¡an"
 
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
 msgid "End date is wrong"
 msgstr "Datum zavrÅ¡etka je pogreÅ¡an"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
 msgid "Start time is wrong"
 msgstr "Vreme poÄ?etka je pogreÅ¡no"
 
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
 msgid "End time is wrong"
 msgstr "Vreme zavrÅ¡etka je pogreÅ¡no"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
 msgid "The organizer selected no longer has an account."
 msgstr "Izabrani organizator viÅ¡e nema nalog."
 
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan uÄ?esnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??."
@@ -4092,38 +3938,41 @@ msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??."
 #. 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:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Delujete u ime %s"
 
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dan pre zakazanog"
 msgstr[1] "%d dana pre zakazanog"
 msgstr[2] "%d dana pre zakazanog"
+msgstr[3] "%d dan pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d sat pre zakazanog"
 msgstr[1] "%d sata pre zakazanog"
 msgstr[2] "%d sati pre zakazanog"
+msgstr[3] "%d sat pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d minut pre zakazanog"
 msgstr[1] "%d minuta pre zakazanog"
 msgstr[2] "%d minuta pre zakazanog"
+msgstr[3] "%d minut pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -4133,103 +3982,111 @@ msgstr "Prilagodi"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
 msgctxt "cal-alarms"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 day before appointment"
 msgstr "1 dan pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "1 hour before appointment"
 msgstr "1 sat pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "15 minutes before appointment"
 msgstr "15 minuta pre zakazanog sastanka"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
 msgstr "UÄ?_esnici..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "UÄ?esnici"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 msgid "Custom Alarm:"
 msgstr "PrilagoÄ?en alarm:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Event Description"
 msgstr "Opis dogaÄ?aja"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "SaÅ¾e_tak:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
 msgid "_Alarm"
 msgstr "_Alarm"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
 msgid "_Location:"
 msgstr "_Lokacija:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+#| msgid "Summary:"
+msgid "_Summary:"
+msgstr "_SaÅ¾etak:"
+
 # note(slobo): moÅ¾da treba rok
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:21
 msgid "_Time:"
 msgstr "_Vreme:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "for"
 msgstr "za"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
 msgid "until"
 msgstr "do"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109
-#: ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
 msgid "Memo"
 msgstr "BeleÅ¡ka"
 
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+#, fuzzy
+#| msgid "Print the list of memos"
+msgid "Print this memo"
+msgstr "Å tampaj spisak beleÅ¡ki"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "PoÄ?etak beleÅ¡ke je u proÅ¡losti"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "BeleÅ¡ku nije moguÄ?e ureÄ?ivati, poÅ¡to je izabran spisak samo za Ä?itanje"
 
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "BeleÅ¡ku nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
 
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "Nije moguÄ?e otvaranje beleÅ¡ki u â??%sâ??."
 
-#: ../calendar/gui/dialogs/memo-page.c:1042
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960
-#: ../mail/em-format-html.c:2241
-#: ../mail/em-format-html.c:2301
-#: ../mail/em-format-html.c:2343
-#: ../mail/message-list.etspec.h:20
-#: ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:269
+#: ../em-format/em-format.c:1026 ../mail/em-format-html.c:2289
+#: ../mail/em-format-html.c:2348 ../mail/em-format-html.c:2372
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
 msgid "To"
 msgstr "Prima"
 
@@ -4238,67 +4095,72 @@ msgstr "Prima"
 msgid "Sta_rt date:"
 msgstr "Datum p_oÄ?etka:"
 
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "SaÅ¾e_tak:"
+
 #: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "_Prima:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Menjate povratni dogaÄ?aj. Å ta Å¾elite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegirate povratni dogaÄ?aj. Å ta Å¾elite da delegirate?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Menjate povratni zadatak. Å ta Å¾elite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Menjate povratnu beleÅ¡ku. Å ta Å¾elite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
 msgid "This and Future Instances"
 msgstr "Ovaj i buduÄ?e unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovo zakazivanje sadrÅ¾i ponavljanja koja Evolucija ne moÅ¾e da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:889
+#: ../calendar/gui/dialogs/recurrence-page.c:892
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:933
+#: ../calendar/gui/dialogs/recurrence-page.c:932
 msgid "End time of the recurrence was before event's start"
 msgstr "Vreme zavrÅ¡etka ponavljanja je ispred poÄ?etka dogaÄ?aja"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:962
+#: ../calendar/gui/dialogs/recurrence-page.c:961
 msgid "on"
 msgstr "na"
 
@@ -4306,7 +4168,7 @@ msgstr "na"
 #. * (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:1019
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "first"
 msgstr "prvoj"
 
@@ -4315,7 +4177,7 @@ msgstr "prvoj"
 #. * (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:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "second"
 msgstr "drugoj"
 
@@ -4323,7 +4185,7 @@ msgstr "drugoj"
 #. * (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:1030
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
 msgid "third"
 msgstr "treÄ?oj"
 
@@ -4331,7 +4193,7 @@ msgstr "treÄ?oj"
 #. * (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:1035
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
 msgid "fourth"
 msgstr "Ä?etvrtoj"
 
@@ -4339,7 +4201,7 @@ msgstr "Ä?etvrtoj"
 #. * (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:1040
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
 msgid "fifth"
 msgstr "peti"
 
@@ -4347,13 +4209,13 @@ msgstr "peti"
 #. * (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:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
 msgid "last"
 msgstr "poslednjoj"
 
 #. 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:1069
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -4361,7 +4223,7 @@ msgstr "Drugi datum"
 #. * 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:1075
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -4369,7 +4231,7 @@ msgstr "od prvog do desetog"
 #. * 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:1081
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -4377,45 +4239,45 @@ msgstr "od jedanaestog do dvadesetog"
 #. * 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:1087
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
 #. 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:1112
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
 msgid "day"
 msgstr "dan"
 
 #. 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 "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1416
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2121
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2162
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
 msgid "Could not get a selection to modify."
 msgstr "Ne moÅ¾e da naÄ?e izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2168
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
 msgid "Modify exception"
 msgstr "Izmeni izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2212
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to delete."
 msgstr "Ne moÅ¾e da naÄ?e izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2351
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -4427,8 +4289,7 @@ msgstr "Svakih"
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3
-#: ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:89
 msgid "Preview"
 msgstr "Pregled"
 
@@ -4436,53 +4297,65 @@ msgstr "Pregled"
 msgid "This appointment rec_urs"
 msgstr "Ovo zakazivanje se po_navlja"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "forever"
 msgstr "uvek"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgid "month(s)"
 msgstr "mesec(i)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
 msgid "week(s)"
 msgstr "nedelja(e)"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example:     'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
 msgid "Send my alarms with this event"
 msgstr "PoÅ¡alji moje alarme sa ovim dogaÄ?ajem"
 
-#: ../calendar/gui/dialogs/send-comp.c:162
+#: ../calendar/gui/dialogs/send-comp.c:164
 msgid "Notify new attendees _only"
 msgstr "Obavesti _samo nove uÄ?esnike"
 
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
 msgid "Completed date is wrong"
 msgstr "Datum zavrÅ¡etka je pogreÅ¡an"
 
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
 msgid "Web Page"
 msgstr "Veb stranica"
 
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "Otkazano"
+
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931
-#: ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228
-#: ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648
-#: ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
 #: ../plugins/save-calendar/csv-format.c:367
 msgid "Completed"
 msgstr "ZavrÅ¡eno"
@@ -4490,43 +4363,35 @@ msgstr "ZavrÅ¡eno"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508
-#: ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1135
-#: ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1183 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Visoka"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812
-#: ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
 msgid "In Progress"
 msgstr "U toku"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510
-#: ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1133
-#: ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1181 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Mala"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1304
-#: ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17
-#: ../mail/message-list.c:1134
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1182
 #: ../widgets/misc/e-send-options.ui.h:13
 msgid "Normal"
 msgstr "ObiÄ?na"
@@ -4534,13 +4399,10 @@ msgstr "ObiÄ?na"
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224
-#: ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642
-#: ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Nije zapoÄ?eto"
 
@@ -4556,19 +4418,17 @@ msgstr "_Stanje:"
 #. Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/em-filter-i18n.h:72
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
 #: ../mail/message-list.etspec.h:17
 msgid "Status"
 msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511
-#: ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:24
 msgid "Undefined"
 msgstr "NeodreÄ?ena"
@@ -4578,7 +4438,7 @@ msgid "_Date completed:"
 msgstr "_Datum zavrÅ¡etka:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Priority:"
 msgstr "_VaÅ¾nost:"
 
@@ -4586,53 +4446,64 @@ msgstr "_VaÅ¾nost:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
 msgid "_Status Details"
 msgstr "Det_alji statusa"
 
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
 msgid "Click to change or view the status details of the task"
 msgstr "Klikni za promenu ili detaljan pregled statusa zadatka"
 
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
 #: ../plugins/groupwise-features/mail-send-options.c:200
 msgid "_Send Options"
 msgstr "Mog_uÄ?nosti kod slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "_Zadatak"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "Zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
 msgid "Task Details"
 msgstr "Detalji zadatka"
 
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+#, fuzzy
+#| msgid "Print the list of tasks"
+msgid "Print this task"
+msgstr "Å tampaj spisak zadataka"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr "PoÄ?etak zadatka je u proÅ¡losti"
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr "Rok za zavrÅ¡etak zadatka je u proÅ¡losti"
+
+#: ../calendar/gui/dialogs/task-page.c:379
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Zadatak nije moguÄ?e ureÄ?ivati, poÅ¡to je izabrani spisak samo za Ä?itanje"
 
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Zadatak nije moguÄ?e potpuno urediti, poÅ¡to niste organizator"
 
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
 msgid "Due date is wrong"
 msgstr "Datum za zavrÅ¡etak je pogreÅ¡an"
 
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguÄ?e otvaranje zadatka u â??%sâ??."
 
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "UÄ?_esnici..."
-
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "Ka_tegorije..."
@@ -4653,6 +4524,7 @@ msgid_plural "%d days"
 msgstr[0] "%d dan"
 msgstr[1] "%d dana"
 msgstr[2] "%d dana"
+msgstr[3] "%d dan"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:400
@@ -4662,6 +4534,7 @@ msgid_plural "%d weeks"
 msgstr[0] "%d nedelja"
 msgstr[1] "%d nedelje"
 msgstr[2] "%d nedelja"
+msgstr[3] "%d nedelja"
 
 #: ../calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
@@ -4723,8 +4596,7 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretaÄ?a"
 
-#: ../calendar/gui/e-cal-component-preview.c:192
-#: ../filter/e-filter-rule.c:664
+#: ../calendar/gui/e-cal-component-preview.c:192 ../filter/e-filter-rule.c:664
 msgid "Untitled"
 msgstr "Neimenovano"
 
@@ -4733,8 +4605,7 @@ msgid "Categories:"
 msgstr "Kategorije:"
 
 #: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151
-#: ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "SaÅ¾etak:"
 
@@ -4749,8 +4620,8 @@ msgstr "Datum za zavrÅ¡etak:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
 msgid "Status:"
 msgstr "Status:"
 
@@ -4759,9 +4630,8 @@ msgid "Priority:"
 msgstr "VaÅ¾nost:"
 
 #: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214
-#: ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Opis:"
 
@@ -4776,33 +4646,32 @@ msgstr "Veb stranica:"
 msgid "Created"
 msgstr "Napravljeno"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
 msgid "End Date"
 msgstr "Datum zavrÅ¡etka"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
 msgstr "Poslednje menjano"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "Datum poÄ?etka"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543
-#: ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4818,73 +4687,47 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1087
-#: ../calendar/gui/e-cal-model.c:1310
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
 #: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:377
-msgid "Default Client"
-msgstr "Podrazumevani klijent"
-
-#: ../calendar/gui/e-cal-model.c:387
-#: ../calendar/gui/gnome-cal.c:518
-#: ../shell/e-shell.c:867
-msgid "Shell Settings"
-msgstr "Postavke Å¡koljke"
-
-#: ../calendar/gui/e-cal-model.c:388
-#: ../calendar/gui/gnome-cal.c:519
-#: ../shell/e-shell.c:868
-msgid "Application-wide settings"
-msgstr "Postavke aplikacije"
-
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:562
-#: ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120
-#: ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989
-#: ../e-util/e-charset.c:52
-#: ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1306
+#: ../calendar/gui/e-cal-model.c:1271
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:1308
+#: ../calendar/gui/e-cal-model.c:1273
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:2210
+#: ../calendar/gui/e-cal-model.c:2175
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaranje %s"
@@ -4921,106 +4764,97 @@ msgid "Start date"
 msgstr "Datum poÄ?etka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
 #: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
 msgid "Type"
 msgstr "Tip"
 
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
 msgid "Cut selected events to the clipboard"
 msgstr "SeÄ?e izabrane dogaÄ?aje u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
 msgid "Copy selected events to the clipboard"
 msgstr "UmnoÅ¾ava izabrane dogaÄ?aje u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje dogaÄ?aje iz spiska iseÄ?aka"
 
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
 msgid "Delete selected events"
 msgstr "BriÅ¡e izabrane dogaÄ?aje"
 
-#: ../calendar/gui/e-calendar-view.c:429
-#: ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
 msgid "Deleting selected objects"
 msgstr "Brisanje izabranih objekata"
 
-#: ../calendar/gui/e-calendar-view.c:617
-#: ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
 msgid "Updating objects"
 msgstr "AÅ¾uriranje objekata"
 
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
 #: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182
-#: ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
 msgid "Accepted"
 msgstr "PrihvaÄ?eno"
 
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
 #: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184
-#: ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
 #: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186
-#: ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
 #: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188
-#: ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1835
-#: ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839
-#: ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855
-#: ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -5076,10 +4910,8 @@ msgstr "PrikaÅ¾i drugu vremensku zonu"
 #. 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:864
-#: ../calendar/gui/e-day-view.c:1884
-#: ../calendar/gui/e-week-view-main-item.c:222
-#: ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -5094,11 +4926,10 @@ msgstr "%A %d %B"
 #. %d = day of month, %b = abbreviated month name.
 #. You can change the order but don't change the
 #. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868
-#: ../calendar/gui/e-day-view.c:1901
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:901
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -5111,34 +4942,36 @@ msgstr "%a %d %b"
 #. strftime format %d = day of month, %b = abbreviated
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:872
-#: ../calendar/gui/e-day-view.c:1917
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:937
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
 msgid "%d %b"
 msgstr "%d. %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1115
-#: ../calendar/gui/e-week-view.c:749
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
 #: ../calendar/gui/print.c:819
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1118
-#: ../calendar/gui/e-week-view.c:752
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
 #: ../calendar/gui/print.c:821
 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:2614
+#: ../calendar/gui/e-day-view.c:2645
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
 
+#: ../calendar/gui/e-itip-control.c:761
+#| msgid "Recurring"
+msgid "Recurring:"
+msgstr "Ponovno:"
+
 #: ../calendar/gui/e-itip-control.c:765
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (SloÅ¾eno ponavljanje)"
@@ -5150,6 +4983,7 @@ msgid_plural "Every %d days"
 msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
+msgstr[3] "Svaki dan"
 
 #: ../calendar/gui/e-itip-control.c:795
 #, c-format
@@ -5158,6 +4992,7 @@ msgid_plural "Every %d weeks"
 msgstr[0] "Svake %d nedelje"
 msgstr[1] "Svake %d nedelje"
 msgstr[2] "Svakih %d nedelja"
+msgstr[3] "Svake nedelje"
 
 #: ../calendar/gui/e-itip-control.c:802
 #, c-format
@@ -5166,6 +5001,7 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "Svake %d nedelje u "
 msgstr[1] "Svake %d nedelje u "
 msgstr[2] "Svakih %d nedelja u "
+msgstr[3] "Svake nedelje u "
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
 #: ../calendar/gui/e-itip-control.c:813
@@ -5190,6 +5026,7 @@ msgid_plural "every %d months"
 msgstr[0] "svakog %d meseca"
 msgstr[1] "svaka %d meseca"
 msgstr[2] "svakih %d meseci"
+msgstr[3] "svakog meseca"
 
 # sliÄ?no kao za mesece i nedelje
 #: ../calendar/gui/e-itip-control.c:861
@@ -5199,6 +5036,7 @@ msgid_plural "Every %d years"
 msgstr[0] "Svake %d godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "Svakih %d godina"
+msgstr[3] "Svake godine"
 
 #: ../calendar/gui/e-itip-control.c:874
 #, c-format
@@ -5207,6 +5045,7 @@ msgid_plural "a total of %d times"
 msgstr[0] "ukupno %d put"
 msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
+msgstr[3] "ukupno %d put"
 
 #. 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:885
@@ -5228,8 +5067,7 @@ msgstr "ZavrÅ¡ava se"
 msgid "Due"
 msgstr "Rok"
 
-#: ../calendar/gui/e-itip-control.c:986
-#: ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
 msgid "iCalendar Information"
 msgstr "iKalendar podaci"
 
@@ -5238,21 +5076,26 @@ msgstr "iKalendar podaci"
 msgid "iCalendar Error"
 msgstr "iKalendar greÅ¡ka"
 
-#: ../calendar/gui/e-itip-control.c:1080
-#: ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107
-#: ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#: ../calendar/gui/e-itip-control.c:1132
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Proverite sledeÄ?i podatak i potom izaberite radnju iz donjeg menija."
+#: ../calendar/gui/e-itip-control.c:1145
+#, fuzzy
+#| msgid ""
+#| "<br> Please review the following information, and then select an action "
+#| "from the menu below."
+msgid ""
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr ""
+"<br> Proverite sledeÄ?i podatak i potom izaberite radnju iz donjeg menija."
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -5260,286 +5103,305 @@ msgstr "<br> Proverite sledeÄ?i podatak i potom izaberite radnju iz donjeg menij
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄ?eno s rezervom"
 
-#: ../calendar/gui/e-itip-control.c:1277
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+#: ../calendar/gui/e-itip-control.c:1290
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "Sastanak je otkazan, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im kalendarima"
 
-#: ../calendar/gui/e-itip-control.c:1279
-msgid "The task has been canceled, however it could not be found in your task lists"
-msgstr "Zadatak je otkazan, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im spiskovima zadataka"
+#: ../calendar/gui/e-itip-control.c:1292
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
+msgstr ""
+"Zadatak je otkazan, meÄ?utim nije ga moguÄ?e naÄ?i u VaÅ¡im spiskovima zadataka"
 
-#: ../calendar/gui/e-itip-control.c:1356
-#, c-format
-msgid "<b>%s</b> has published meeting information."
+#: ../calendar/gui/e-itip-control.c:1369
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published meeting information."
+msgid "%s has published meeting information."
 msgstr "<b>%s</b> objavljuje podatak o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
 msgid "Meeting Information"
 msgstr "Podatak o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1363
-#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
+#: ../calendar/gui/e-itip-control.c:1376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the presence of %s at a meeting."
+msgid "%s requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zahteva prisustvo %s na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1365
-#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
+#: ../calendar/gui/e-itip-control.c:1378
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at a meeting."
+msgid "%s requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva VaÅ¡e prisustvo na sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
+#: ../calendar/gui/e-itip-control.c:1385
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing meeting."
+msgid "%s wishes to be added to an existing meeting."
 msgstr "<b>%s</b> Å¾eli da bude deo postojeÄ?eg sastanka."
 
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Update"
 msgstr "AÅ¾uriranje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1377
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
+#: ../calendar/gui/e-itip-control.c:1390
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest meeting information."
+msgid "%s wishes to receive the latest meeting information."
 msgstr "<b>%s</b> Å¾eli da dobije najnovija obaveÅ¡tenja o sastanku."
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
 msgid "Meeting Update Request"
 msgstr "Zahtev za aÅ¾uriranjem sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1385
-#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
+#: ../calendar/gui/e-itip-control.c:1398
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a meeting request."
+msgid "%s has replied to a meeting request."
 msgstr "<b>%s</b> odgovara na zahtev za sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: ../calendar/gui/e-itip-control.c:1393
-#, c-format
-msgid "<b>%s</b> has canceled a meeting."
+#: ../calendar/gui/e-itip-control.c:1406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a meeting."
+msgid "%s has canceled a meeting."
 msgstr "<b>%s</b> otkazuje sastanak."
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
 msgid "Meeting Cancelation"
 msgstr "Otkazivanje sastanka"
 
-#: ../calendar/gui/e-itip-control.c:1404
-#: ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
-#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent an unintelligible message."
+msgid "%s has sent an unintelligible message."
 msgstr "<b>%s</b> Å¡alje nerazumljivu poruku."
 
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
 msgid "Bad Meeting Message"
 msgstr "LoÅ¡a poruka o sastanku"
 
-#: ../calendar/gui/e-itip-control.c:1432
-#, c-format
-msgid "<b>%s</b> has published task information."
+#: ../calendar/gui/e-itip-control.c:1445
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published task information."
+msgid "%s has published task information."
 msgstr "<b>%s</b> objavljuje podatak o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
 msgid "Task Information"
 msgstr "Podatak o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1440
-#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
+#: ../calendar/gui/e-itip-control.c:1453
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests %s to perform a task."
+msgid "%s requests %s to perform a task."
 msgstr "<b>%s</b> traÅ¾i %s za izvrÅ¡avanje zadatka."
 
-#: ../calendar/gui/e-itip-control.c:1442
-#, c-format
-msgid "<b>%s</b> requests you perform a task."
+#: ../calendar/gui/e-itip-control.c:1455
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests you perform a task."
+msgid "%s requests you perform a task."
 msgstr "<b>%s</b> traÅ¾i da Vi izvrÅ¡ite zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Proposal"
 msgstr "Predlog za zadatak"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
-#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
+#: ../calendar/gui/e-itip-control.c:1462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to be added to an existing task."
+msgid "%s wishes to be added to an existing task."
 msgstr "<b>%s</b Å¾eli da bude deo postojeÄ?eg zadatka."
 
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Update"
 msgstr "AÅ¾uriranje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1454
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
+#: ../calendar/gui/e-itip-control.c:1467
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to receive the latest task information."
+msgid "%s wishes to receive the latest task information."
 msgstr "<b>%s</b> Å¾eli da prima najnovija obaveÅ¡tenja o zadatku."
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
 msgid "Task Update Request"
 msgstr "Zahtev za aÅ¾uriranjem zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1462
-#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
+#: ../calendar/gui/e-itip-control.c:1475
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a task assignment."
+msgid "%s has replied to a task assignment."
 msgstr "<b>%s</b> odgovara na dodeljen zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: ../calendar/gui/e-itip-control.c:1470
-#, c-format
-msgid "<b>%s</b> has canceled a task."
+#: ../calendar/gui/e-itip-control.c:1483
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled a task."
+msgid "%s has canceled a task."
 msgstr "<b>%s</b> otkazuje zadatak."
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
 msgid "Task Cancelation"
 msgstr "Otkazivanje zadatka"
 
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
 msgid "Bad Task Message"
 msgstr "LoÅ¡a poruka o zadatku"
 
-#: ../calendar/gui/e-itip-control.c:1506
-#, c-format
-msgid "<b>%s</b> has published free/busy information."
+#: ../calendar/gui/e-itip-control.c:1519
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published free/busy information."
+msgid "%s has published free/busy information."
 msgstr "<b>%s</b> objavljuje slobodno/zauzeto vreme."
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
 msgid "Free/Busy Information"
 msgstr "Slobodno/zauzeto vreme"
 
-#: ../calendar/gui/e-itip-control.c:1511
-#, c-format
-msgid "<b>%s</b> requests your free/busy information."
+#: ../calendar/gui/e-itip-control.c:1524
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your free/busy information."
+msgid "%s requests your free/busy information."
 msgstr "<b>%s</b> pita kada ste slobodni/zauzeti."
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
 msgid "Free/Busy Request"
 msgstr "Slobodno/zauzeto zahtev"
 
-#: ../calendar/gui/e-itip-control.c:1516
-#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
+#: ../calendar/gui/e-itip-control.c:1529
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has replied to a free/busy request."
+msgid "%s has replied to a free/busy request."
 msgstr "<b>%s</b> odgovara na slobodno/zauzeto zahtev."
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
 msgid "Free/Busy Reply"
 msgstr "Slobodno/zauzeto odgovor"
 
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
 msgid "Bad Free/Busy Message"
 msgstr "LoÅ¡a slobodno/zauzeto poruka"
 
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
 msgid "The message does not appear to be properly formed"
 msgstr "Izgleda da poruka nije ispravno saÄ?injena"
 
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrÅ¾i samo nepodrÅ¾ane zahteve."
 
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrÅ¾i ispravnu poruku za kalendar"
 
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema stavke kalendara koji se mogu pregledati"
 
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
 msgid "Update complete\n"
 msgstr "AÅ¾uriranje zavrÅ¡eno\n"
 
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat nije ispravan i ne moÅ¾e biti aÅ¾uriran\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan uÄ?esnik.  Dodati ga u prisutne?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status uÄ?esnika nije aÅ¾uriran jer nema ispravan status!\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
 msgid "Attendee status updated\n"
 msgstr "AÅ¾uriran status uÄ?esnika\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
 #: ../plugins/itip-formatter/itip-formatter.c:1421
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status uÄ?esnika nije osveÅ¾en jer stavka viÅ¡e ne postoji"
 
-#: ../calendar/gui/e-itip-control.c:2102
-#: ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
 msgid "Item sent!\n"
 msgstr "Stavka poslata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2108
-#: ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
 msgid "The item could not be sent!\n"
 msgstr "Stavka nije mogla biti poslata!\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
 msgid "Choose an action:"
 msgstr "Izaberite radnju:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
 msgid "Update"
 msgstr "AÅ¾uriraj"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Prihvati"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
 msgid "Send Free/Busy Information"
 msgstr "PoÅ¡alji slobodno/zauzeto podatak"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
 msgid "Update respondent status"
 msgstr "OsveÅ¾i status sagovornika"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
 msgid "Send Latest Information"
 msgstr "PoÅ¡alji najnoviji podatak"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1032
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
 
@@ -5588,78 +5450,65 @@ msgid "Resources"
 msgstr "Izvori"
 
 #: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95
-#: ../calendar/gui/e-meeting-store.c:112
-#: ../calendar/gui/e-meeting-store.c:850
-#: ../calendar/gui/print.c:968
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
 msgid "Individual"
 msgstr "Pojedinac"
 
 #: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97
-#: ../calendar/gui/e-meeting-store.c:114
-#: ../calendar/gui/print.c:969
-#: ../widgets/table/e-table-config.ui.h:7
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "Grupa"
 
 #: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99
-#: ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 #: ../calendar/gui/print.c:970
 msgid "Resource"
 msgstr "Izvor"
 
 #: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101
-#: ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
 #: ../calendar/gui/print.c:971
 msgid "Room"
 msgstr "Soba"
 
 #: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/print.c:985
 msgid "Chair"
 msgstr "Stolica"
 
 #: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/e-meeting-store.c:149
-#: ../calendar/gui/e-meeting-store.c:853
-#: ../calendar/gui/print.c:986
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
 msgid "Required Participant"
 msgstr "Obavezan uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134
-#: ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 #: ../calendar/gui/print.c:987
 msgid "Optional Participant"
 msgstr "MoguÄ?i uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136
-#: ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/print.c:988
 msgid "Non-Participant"
 msgstr "Ne-uÄ?esnik"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180
-#: ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
 #. 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:537
 msgid "Attendee                          "
 msgstr "UÄ?esnik"
 
-#: ../calendar/gui/e-meeting-store.c:192
-#: ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "U toku"
 
@@ -5667,7 +5516,7 @@ msgstr "U toku"
 #. 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:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B , %Y."
 
@@ -5681,7 +5530,7 @@ msgstr "%A, %d %B , %Y."
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
 msgid "%a %m/%d/%Y"
 msgstr "%a %d. %m. %Y."
 
@@ -5696,67 +5545,63 @@ msgstr "%a %d. %m. %Y."
 msgid "%m/%d/%Y"
 msgstr "%d. %m. %Y."
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "UÄ?_esnici..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "O_ptions"
 msgstr "O_pcije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "Show _only working hours"
 msgstr "PrikaÅ¾i _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
 msgid "Show _zoomed out"
 msgstr "PrikaÅ¾i _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
 msgid "_Update free/busy"
 msgstr "_AÅ¾uriraj slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
 msgid "_Start time:"
 msgstr "_Vreme poÄ?etka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
 msgid "_End time:"
 msgstr "Vreme _zavrÅ¡etka:"
 
@@ -5784,48 +5629,47 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Ä?lan"
 
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:397
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:473
 #: ../modules/calendar/e-memo-shell-view-actions.c:218
 #: ../modules/calendar/e-memo-shell-view-actions.c:233
 #: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
 msgid "Memos"
 msgstr "BeleÅ¡ke"
 
-#: ../calendar/gui/e-memo-table.c:489
-#: ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
 msgid "* No Summary *"
 msgstr "* Bez saÅ¾etka *"
 
-#: ../calendar/gui/e-memo-table.c:573
-#: ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
 msgid "Start: "
 msgstr "PoÄ?etak:"
 
-#: ../calendar/gui/e-memo-table.c:591
-#: ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
 msgid "Due: "
 msgstr "Do: "
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
 msgid "Cut selected memos to the clipboard"
 msgstr "SeÄ?e izabranue beleÅ¡ke u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
 msgid "Copy selected memos to the clipboard"
 msgstr "UmnoÅ¾ava izabranue beleÅ¡ke u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleÅ¡ke iz spiska iseÄ?aka"
 
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Delete selected memos"
 msgstr "ObriÅ¡i izabrane beleÅ¡ke"
 
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleÅ¡ke"
 
@@ -5833,87 +5677,56 @@ msgstr "Bira sve vidljive beleÅ¡ke"
 msgid "Click to add a memo"
 msgstr "Pritisnite da dodate beleÅ¡ku"
 
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+# Don't use any other specifiers.
+# strftime format %d = day of month, %b = abbreviated
+# month name. You can change the order but don't
+# change the specifiers or add anything.
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
 #: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
-
-#: ../calendar/gui/e-task-table.c:624
-#: ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:357
+#, fuzzy, c-format
+#| msgid "%d %b"
+msgid "%d%%"
+msgstr "%d. %b"
+
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:434
 #: ../modules/calendar/e-task-shell-view-actions.c:241
 #: ../modules/calendar/e-task-shell-view-actions.c:256
 #: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
 msgid "Cut selected tasks to the clipboard"
 msgstr "SeÄ?e izabrane zadatke u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
 msgid "Copy selected tasks to the clipboard"
 msgstr "UmnoÅ¾ava izabrane zadatke u spisak iseÄ?aka"
 
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
 msgid "Paste tasks from the clipboard"
 msgstr "Ubaci zadatke iz spiska iseÄ?aka"
 
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
 msgid "Delete selected tasks"
 msgstr "ObriÅ¡i izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
 msgstr "Izaberite vremensku zonu"
 
@@ -5922,57 +5735,56 @@ msgstr "Izaberite vremensku zonu"
 #. 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:239
-#: ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
 msgid "It has alarms."
 msgstr "Ima alarme."
 
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
 msgid "It has recurrences."
 msgstr "Ima ponavljanja."
 
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
 msgid "It is a meeting."
 msgstr "To je sastanak."
 
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendarski dogaÄ?aj: saÅ¾etak je %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendarski dogaÄ?aj: nema saÅ¾etka."
 
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
 msgid "calendar view event"
 msgstr "dogaÄ?aj pregleda kalendara"
 
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
 msgid "Grab Focus"
 msgstr "Uhvati fokus"
 
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
 msgid "New Appointment"
 msgstr "Novo zakazivanje"
 
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
 msgid "New All Day Event"
 msgstr "Novi celodnevni dogaÄ?aj"
 
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
 msgid "Go to Today"
 msgstr "Idi na danaÅ¡nji dan"
 
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
 msgid "Go to Date"
 msgstr "Idi na datum"
 
@@ -5981,26 +5793,25 @@ msgstr "Idi na datum"
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekuÄ?eg vremenskog raspona"
 
-#: ../calendar/gui/ea-day-view.c:152
-#: ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "Ima %d dogaÄ?aj."
 msgstr[1] "Ima %d dogaÄ?aja."
 msgstr[2] "Ima %d dogaÄ?aja."
+msgstr[3] "Ima %d dogaÄ?aj."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:157
-#: ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
 msgid "It has no events."
 msgstr "Nema dogaÄ?aja."
 
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pregled radne nedelje: %s. %s"
@@ -6008,47 +5819,47 @@ msgstr "Pregled radne nedelje: %s. %s"
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dnevni pregled: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
 msgid "calendar view for a work week"
 msgstr "pregled kalendara za radnu nedelju"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
 msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili viÅ¡e dana"
 
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:897
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:904
-#: ../modules/calendar/e-cal-shell-view-private.c:910
-#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:930
-#: ../modules/calendar/e-cal-shell-view-private.c:941
-#: ../modules/calendar/e-cal-shell-view-private.c:948
-#: ../modules/calendar/e-cal-shell-view-private.c:951
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -6070,15 +5881,15 @@ msgstr "MeseÄ?ni pregled: %s. %s"
 msgid "Week View: %s. %s"
 msgstr "Nedeljni pregled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
 msgid "calendar view for a month"
 msgstr "pregled kalendara za mesec"
 
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili viÅ¡e nedelja"
 
-#: ../calendar/gui/gnome-cal.c:2167
+#: ../calendar/gui/gnome-cal.c:2287
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -6131,44 +5942,40 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "Septembar"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "Izaberi _danaÅ¡nji dan"
 
 #: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "_Izaberi danaÅ¡nji dan"
+msgid "September"
+msgstr "Septembar"
 
-#: ../calendar/gui/itip-utils.c:409
-#: ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
 msgid "An organizer must be set."
 msgstr "Organizator mora biti odreÄ?en."
 
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan uÄ?esnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:633
-#: ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
 msgid "Event information"
 msgstr "Podatak o dogaÄ?aju"
 
-#: ../calendar/gui/itip-utils.c:636
-#: ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
 msgid "Task information"
 msgstr "Podatak o zadatku"
 
-#: ../calendar/gui/itip-utils.c:639
-#: ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
 msgid "Memo information"
 msgstr "Podaci o beleÅ¡ci"
 
-#: ../calendar/gui/itip-utils.c:642
-#: ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
 msgid "Free/Busy information"
 msgstr "Slobodno/zauzeto podatak"
 
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
 msgid "Calendar information"
 msgstr "Podatak o kalendaru"
 
@@ -6176,7 +5983,7 @@ msgstr "Podatak o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "PrihvaÄ?eno"
@@ -6185,7 +5992,7 @@ msgstr "PrihvaÄ?eno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄ?eno s rezervom"
@@ -6197,8 +6004,7 @@ msgstr "PrihvaÄ?eno s rezervom"
 #. 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:693
-#: ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -6207,7 +6013,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -6215,7 +6021,7 @@ msgstr "Delegirano"
 #. 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:713
+#: ../calendar/gui/itip-utils.c:712
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "OsveÅ¾eno"
@@ -6223,7 +6029,7 @@ msgstr "OsveÅ¾eno"
 #. 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:720
+#: ../calendar/gui/itip-utils.c:719
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "OtkaÅ¾i"
@@ -6231,7 +6037,7 @@ msgstr "OtkaÅ¾i"
 #. 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:727
+#: ../calendar/gui/itip-utils.c:726
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "OsveÅ¾i"
@@ -6239,29 +6045,29 @@ msgstr "OsveÅ¾i"
 #. 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:734
+#: ../calendar/gui/itip-utils.c:733
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Slobodno/zauzeto vreme (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
 msgid "iCalendar information"
 msgstr "iKalendar podatak"
 
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Nije moguÄ?e saÄ?uvati unos, novi dogaÄ?aj se kosi sa nekim drugim."
 
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
 msgid "Unable to book a resource, error: "
 msgstr "Nije moguÄ?e saÄ?uvati unos, greÅ¡ka:"
 
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
 msgid "You must be an attendee of the event."
 msgstr "Morate biti uÄ?esnik dogaÄ?aja."
 
@@ -6417,49 +6223,73 @@ msgstr "Pe"
 msgid "Sa"
 msgstr "Su"
 
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "Zakazivanje"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " za "
 
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "Zadatak"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (ZavrÅ¡eno "
+
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "ZavrÅ¡eno "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+msgid " (Due "
+msgstr " (Do "
 
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Due DUE",
+#. * where DUE is a date/time due the event
+#. * should be finished.
+#: ../calendar/gui/print.c:2454
+msgid "Due "
+msgstr "Do "
+
+#: ../calendar/gui/print.c:2615
 #, c-format
 msgid "Summary: %s"
 msgstr "SaÅ¾etak: %s"
 
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
 msgid "Attendees: "
 msgstr "Prisutni:"
 
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
 #, c-format
 msgid "Priority: %s"
 msgstr "VaÅ¾nost: %s"
 
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak zavrÅ¡enog: %i"
 
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -6468,62 +6298,232 @@ msgstr "Kontakti: "
 msgid "% Completed"
 msgstr "% zavrÅ¡eno"
 
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "Otkazano"
-
 #: ../calendar/gui/tasktypes.xml.h:15
 msgid "In progress"
 msgstr "U toku"
 
-#: ../calendar/gui/tasktypes.xml.h:28
-#: ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "je veÄ?e od"
 
-#: ../calendar/gui/tasktypes.xml.h:29
-#: ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
 #: ../plugins/itip-formatter/itip-formatter.c:1833
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
 msgid "iCalendar files (.ics)"
 msgstr "iKalendar datoteke (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
 msgid "Evolution iCalendar importer"
 msgstr "Evolucija iKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+#, fuzzy
+#| msgid "vCalendar files (.vcf)"
+msgid "vCalendar files (.vcs)"
 msgstr "vKalendar datoteke (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
 msgid "Evolution vCalendar importer"
 msgstr "Evolucija vKalendar uvoznik"
 
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
 msgid "Calendar Events"
 msgstr "Kalendarski dogaÄ?aji"
 
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolucija kalendar inteligentni uvoznik"
 
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgctxt "New"
+#| msgid "M_eeting"
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "Sastanak"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+#| msgid "Events"
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "DogaÄ?aj"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+#| msgid "Task"
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "Zadatak"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+#| msgid "Memo"
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "BeleÅ¡ka"
+
+#: ../calendar/importers/icalendar-importer.c:941
+#| msgid "It has recurrences."
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "ima ponavljanja"
+
+#: ../calendar/importers/icalendar-importer.c:946
+#, fuzzy
+#| msgid "This and Prior Instances"
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "Ovaj i prethodne unose"
+
+#: ../calendar/importers/icalendar-importer.c:951
+#| msgid "It has alarms."
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "ima alarme"
+
+#: ../calendar/importers/icalendar-importer.c:956
+#, fuzzy
+#| msgid "%s attachment"
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "%s prilog"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+#| msgid "Public"
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "Javno"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+#| msgid "Private"
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "LiÄ?no"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+#| msgid "Confidential"
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "Poverljivo"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+#| msgid "Classification"
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "Razvrstavanje"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+#| msgid "Summary"
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "SaÅ¾etak"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+#| msgid "Location"
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "Mesto"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+#| msgid "Start"
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "PoÄ?etak"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+#, fuzzy
+#| msgid "Due"
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "Rok"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+#| msgid "End"
+msgctxt "iCalImp"
+msgid "End"
+msgstr "Kraj"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+#| msgid "Categories"
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "Kategorije"
+
+# timezone.
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+#| msgid "Completed"
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "ZavrÅ¡eno"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+#| msgid "URL"
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "Adresa"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+#| msgid "Organizer"
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "Organizator"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+#| msgid "Attendees"
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "UÄ?esnici"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+#| msgid "Description"
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "Opis"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+#| msgid "Type"
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "Tip"
+
 # * We only place them here so gettext picks them up for translation.
 # * Don't include in any C files.
 #.
@@ -8075,302 +8075,288 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
 msgid "Save as..."
 msgstr "SaÄ?uvaj kao..."
 
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:374
 msgid "Attach a file"
 msgstr "PrilaÅ¾e datoteku"
 
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
 #: ../widgets/misc/e-signature-editor.c:203
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
 msgid "Close the current file"
 msgstr "Zatvara trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
 msgid "_Print..."
 msgstr "Å tam_paj..."
 
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
 msgid "Print Pre_view"
 msgstr "Pre_gled pred Å¡tampu"
 
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
 msgid "Save the current file"
 msgstr "Ä?uva trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
 msgid "Save _As..."
 msgstr "SaÄ?uvaj _kao..."
 
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
 msgid "Save the current file with a different name"
 msgstr "Ä?uva trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
 msgid "Save as _Draft"
 msgstr "SaÄ?uvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
 msgid "Save as draft"
 msgstr "Ä?uva kao nacrt"
 
-#: ../composer/e-composer-actions.c:328
-#: ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
 msgid "S_end"
 msgstr "PoÅ¡_alji"
 
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
 msgid "Send this message"
 msgstr "Å alje ovu poruku"
 
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
 msgid "PGP _Encrypt"
 msgstr "PGP _Å¡ifruj"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
 msgid "Encrypt this message with PGP"
 msgstr "Å ifruje ovu poruku pomoÄ?u PGP-a"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
 msgid "PGP _Sign"
 msgstr "PGP _potpiÅ¡i"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
 msgid "Sign this message with your PGP key"
 msgstr "Potpisuje ovu poruku pomoÄ?u PGP kljuÄ?a"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
 msgid "_Prioritize Message"
 msgstr "V_aÅ¾nost poruke"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
 msgid "Set the message priority to high"
 msgstr "Postavlja vaÅ¾nost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
 msgid "Re_quest Read Receipt"
 msgstr "T_raÅ¾i povratnicu"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
 msgid "Get delivery notification when your message is read"
 msgstr "Prima izveÅ¡taj o dostavi kada je poruka proÄ?itana"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _Å¡ifruj"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Å ifruje ovu poruku pomoÄ?u S/MIME sertifikata za Å¡ifrovanje"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiÅ¡i"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME sertifikatom"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje BCC prikazano"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "Å _alje polje"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Bira da li je polje Å alje prikazano"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
 msgid "_Reply-To Field"
 msgstr "Odgo_vor-za polje"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
 msgid "Save Draft"
 msgstr "SaÄ?uvaj nacrt"
 
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "PrikaÅ¾i "
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "Sakrij"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje Ä?e primiti kopiju (cc) poruke"
 
-#: ../composer/e-composer-header-table.c:47
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message"
-msgstr "Unesite adrese koje Ä?e primiti kopiju poruke bez pojavljivanja u listi primalaca poruke"
+#: ../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"
+msgstr ""
+"Unesite adrese koje Ä?e primiti kopiju poruke bez pojavljivanja u listi "
+"primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
 msgid "Fr_om:"
 msgstr "Å _alje:"
 
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323
-#: ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "Å alje"
-
 # *
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
 msgid "_Cc:"
 msgstr "_Kopija (Cc):"
 
-#: ../composer/e-composer-header-table.c:979
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
 msgid "_Bcc:"
 msgstr "_Nevidljiva kopija (Bcc):"
 
-#: ../composer/e-composer-header-table.c:985
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
 msgid "_Post To:"
 msgstr "S_lanje na:"
 
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
 msgid "Undo the last action"
 msgstr "Opoziva poslednju radnju"
 
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
 msgid "Redo the last undone action"
 msgstr "Ponovo vrÅ¡i opozvanu radnju"
 
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
 msgid "Search for text"
 msgstr "PretraÅ¾uje tekst"
 
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
 msgid "Search for and replace text"
 msgstr "PretraÅ¾uje i zamenjuje tekst"
 
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
 msgid "Save draft"
 msgstr "SaÄ?uvaj nacrt"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:187
-#: ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../composer/e-msg-composer.c:983
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Nije moguÄ?e potpisivanje odlazeÄ?e poruke: nije postavljen sertifikat za potpisivanje za ovaj nalog"
+#: ../composer/e-msg-composer.c:1029
+#, c-format
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nije moguÄ?e potpisivanje odlazeÄ?e poruke: nije postavljen sertifikat za "
+"potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:990
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
-msgstr "Nije moguÄ?e Å¡ifrovanje odlazeÄ?e poruke: nije postavljen sertifikat za Å¡ifrovanje za ovaj nalog"
+#: ../composer/e-msg-composer.c:1041
+#, c-format
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nije moguÄ?e Å¡ifrovanje odlazeÄ?e poruke: nije postavljen sertifikat za "
+"Å¡ifrovanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1379
+#: ../composer/e-msg-composer.c:1465
 msgid "Unable to reconstruct message from autosave file"
 msgstr "Nije moguÄ?e povratiti poruku iz automatskog Ä?uvanja"
 
-#: ../composer/e-msg-composer.c:1445
-#: ../composer/e-msg-composer.c:1641
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:3310
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)</b>"
-msgstr "<b>(SastavljaÄ? u telu poruke ne sadrÅ¾i tekst, Å¡to ne moÅ¾e biti izmenjeno.)<b>"
+#: ../composer/e-msg-composer.c:3538
+#, fuzzy
+#| msgid ""
+#| "<b>(The composer contains a non-text message body, which cannot be "
+#| "edited.)</b>"
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr ""
+"<b>(SastavljaÄ? u telu poruke ne sadrÅ¾i tekst, Å¡to ne moÅ¾e biti izmenjeno.)<b>"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
 
 #: ../composer/mail-composer.error.xml.h:1
-msgid " There are few attachments getting downloaded. Sending the mail will cause the mail to be sent without those pending attachments "
-msgstr " Preuzima se nekoliko priloga. Ukoliko sada poÅ¡aljete poruku ovi prilozi neÄ?e biti poslati sa njom "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
+msgstr ""
+" Preuzima se nekoliko priloga. Ukoliko sada poÅ¡aljete poruku ovi prilozi neÄ?e "
+"biti poslati sa njom "
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
 #: ../composer/mail-composer.error.xml.h:3
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "Sigurno Å¾elite da odbacite poruku, naslovljenu â??{0}â??, koju sastavljate?"
 
 #: ../composer/mail-composer.error.xml.h:4
@@ -8387,8 +8373,14 @@ msgid "Because &quot;{1}&quot;."
 msgstr "Zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:6
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
-msgstr "Zatvaranjem ovog prozora za sastavljanje Ä?ete trajno odbaciti poruku, osim ako odluÄ?ite da saÄ?uvate poruku u fascikli Nacrti. Ovo Ä?e omoguÄ?iti da nastavite poruku kasnije."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
+msgstr ""
+"Zatvaranjem ovog prozora za sastavljanje Ä?ete trajno odbaciti poruku, osim ako "
+"odluÄ?ite da saÄ?uvate poruku u fascikli Nacrti. Ovo Ä?e omoguÄ?iti da nastavite "
+"poruku kasnije."
 
 # mail-composer:no-editor-control primary
 #: ../composer/mail-composer.error.xml.h:7
@@ -8424,18 +8416,26 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "GreÅ¡ka u Ä?uvanju samoÄ?uvajuÄ?e datoteke zbog &quot;{1}&quot;."
 
 #: ../composer/mail-composer.error.xml.h:15
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
-msgstr "Evolucija je neoÄ?ekivano zavrÅ¡ila tokom pisanja nove poruke. SpaÅ¡avanje poruke Ä?e omoguÄ?iti da nastavite gde ste stali."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
+msgstr ""
+"Evolucija je neoÄ?ekivano zavrÅ¡ila tokom pisanja nove poruke. SpaÅ¡avanje poruke "
+"Ä?e omoguÄ?iti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+#| msgid ""
+#| "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
 msgstr "Datoteka â??{0}â?? nije regularna i ne moÅ¾e biti poslata u poruci."
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "Nije moguÄ?e pokretanje kontrole HTML ureÄ?ivaÄ?a.\n"
 "\n"
@@ -8446,7 +8446,9 @@ msgid "Unable to activate the address selector control."
 msgstr "Nije moguÄ?e pokretanje kontrole biranja adresa."
 
 #: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
+#, fuzzy
+#| msgid "You cannot attach the file `{0}' to this message."
+msgid "You cannot attach the file n{0}' to this message."
 msgstr "Ne moÅ¾ete priloÅ¾iti datoteku â??{0}â?? ovoj poruci."
 
 #: ../composer/mail-composer.error.xml.h:22
@@ -8469,287 +8471,327 @@ msgstr "Spa_si"
 msgid "_Save Draft"
 msgstr "_SaÄ?uvaj nacrt"
 
-#: ../capplet/anjal-settings-main.c:202
+#: ../capplet/anjal-settings-main.c:199
 msgid "Run Anjal in a window"
 msgstr "Pokreni Anjal u prozoru"
 
-#: ../capplet/anjal-settings-main.c:203
-#| msgid "Mark as _default memo list"
+#: ../capplet/anjal-settings-main.c:200
 msgid "Make Anjal the default email client"
 msgstr "OznaÄ?ava Anjal za podrazumevanog klijenta poÅ¡te"
 
 #. TRANSLATORS: don't translate the terms in brackets
-#: ../capplet/anjal-settings-main.c:210
+#: ../capplet/anjal-settings-main.c:207
 msgid "ID of the socket to embed in"
 msgstr "IB soketa za umetanje"
 
-#: ../capplet/anjal-settings-main.c:211
-#| msgid "sort"
+#: ../capplet/anjal-settings-main.c:208
 msgid "socket"
 msgstr "soket"
 
-#: ../capplet/anjal-settings-main.c:225
-#| msgid "Default Mail Client"
+#: ../capplet/anjal-settings-main.c:221
 msgid "Anjal email client"
 msgstr "Klijent poÅ¡te Anjal"
 
-#: ../capplet/settings/mail-view.c:244
-#| msgid "New _Task"
-msgid "New Tab"
-msgstr "Novi jeziÄ?ak"
-
-#: ../capplet/settings/mail-account-view.c:56
-#| msgid "Please enter user name first."
+#: ../capplet/settings/mail-account-view.c:74
 msgid "Please enter your full name."
 msgstr "Unesite VaÅ¡e puno ime."
 
-#: ../capplet/settings/mail-account-view.c:57
-#| msgid "Please enter user name first."
+#: ../capplet/settings/mail-account-view.c:75
 msgid "Please enter your email address."
 msgstr "Unesite adresu e-poÅ¡te."
 
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
 msgid "The email address you have entered is invalid."
 msgstr "Uneta adresa e-poÅ¡te nije ispravna."
 
-#: ../capplet/settings/mail-account-view.c:224
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">LiÄ?ni podaci:</span>"
+#: ../capplet/settings/mail-account-view.c:77
+#| msgid "Please enter your email address."
+msgid "Please enter your password."
+msgstr "Unesite vaÅ¡u lozinku."
+
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../capplet/settings/mail-account-view.c:464
+#| msgid "Personal"
+msgid "Personal details:"
+msgstr "LiÄ?ni podaci:"
 
-#: ../capplet/settings/mail-account-view.c:229
+#: ../capplet/settings/mail-account-view.c:471
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../capplet/settings/mail-account-view.c:238
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Email address:"
 msgstr "Adresa e-poÅ¡te:"
 
-#: ../capplet/settings/mail-account-view.c:248
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalji za primanje:</span>"
+#: ../capplet/settings/mail-account-view.c:490
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Detalji:</span>"
 
-#: ../capplet/settings/mail-account-view.c:253
-#: ../capplet/settings/mail-account-view.c:303
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:496
+#| msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Primanje:</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
 msgid "Server type:"
 msgstr "Tip servera: "
 
-#: ../capplet/settings/mail-account-view.c:262
-#: ../capplet/settings/mail-account-view.c:312
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:510
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: ../capplet/settings/mail-account-view.c:272
-#: ../capplet/settings/mail-account-view.c:322
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:519
 msgid "Username:"
 msgstr "KorisniÄ?koime:"
 
-#: ../capplet/settings/mail-account-view.c:281
-#: ../capplet/settings/mail-account-view.c:331
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:528
 msgid "Use encryption:"
 msgstr "Koristi Å¡ifrovanje:"
 
-#: ../capplet/settings/mail-account-view.c:286
-#: ../capplet/settings/mail-account-view.c:336
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
 msgid "never"
 msgstr "nikada"
 
-#: ../capplet/settings/mail-account-view.c:298
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Detalji za slanje:</span>"
+#: ../capplet/settings/mail-account-view.c:545
+#| msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Slanje:</span>"
 
-#: ../capplet/settings/mail-account-view.c:355
-msgid "To use the email application you'll need to setup an account. Put your email address and password in below and we'll try and work out all the settings. If we can't do it automatically you'll need your server details as well."
-msgstr "Da bi koristili aplikaciju poÅ¡te potrebno je da podesite nalog. Unesite dole adresu e-poÅ¡te i lozinku kako bi pokuÅ¡ali da prepoznamo postavke. Ukoliko to nije moguÄ?e automatski, moraÄ?ete da dodate i podatke o serveru."
+#: ../capplet/settings/mail-account-view.c:585
+msgid ""
+"To use the email application you'll need to setup an account. Put your email "
+"address and password in below and we'll try and work out all the settings. "
+"If we can't do it automatically you'll need your server details as well."
+msgstr ""
+"Da bi koristili aplikaciju poÅ¡te potrebno je da podesite nalog. Unesite dole "
+"adresu e-poÅ¡te i lozinku kako bi pokuÅ¡ali da prepoznamo postavke. Ukoliko to "
+"nije moguÄ?e automatski, moraÄ?ete da dodate i podatke o serveru."
 
-#: ../capplet/settings/mail-account-view.c:357
-msgid "Sorry, we can't work out the settings to get your mail automatically. Please enter them below. We've tried to make a start with the details you just entered but you may need to change them."
-msgstr "Å½ao nam je, ne moÅ¾emo automatski da prepoznamo postavke. Unesite ih dole. PokuÅ¡ali smo da sa podacima koje ste uneli zapoÄ?nemo podeÅ¡avanje, ali Ä?e moÅ¾da biti potrebno da ih izmenite."
+#: ../capplet/settings/mail-account-view.c:587
+msgid ""
+"Sorry, we can't work out the settings to get your mail automatically. Please "
+"enter them below. We've tried to make a start with the details you just "
+"entered but you may need to change them."
+msgstr ""
+"Å½ao nam je, ne moÅ¾emo automatski da prepoznamo postavke. Unesite ih dole. "
+"PokuÅ¡ali smo da sa podacima koje ste uneli zapoÄ?nemo podeÅ¡avanje, ali Ä?e "
+"moÅ¾da biti potrebno da ih izmenite."
 
-#: ../capplet/settings/mail-account-view.c:359
-#| msgid "You may only configure a single Exchange account."
+#: ../capplet/settings/mail-account-view.c:589
 msgid "You can specify more options to configure the account."
 msgstr "MoÅ¾ete da navedete joÅ¡ opcija za podeÅ¡avanje naloga."
 
-#: ../capplet/settings/mail-account-view.c:361
-msgid "Now we need your settings for sending mail. We've tried to make some guesses but you should check them over to make sure."
-msgstr "Sada su nam potrebne postavke slanja poÅ¡te. PokuÅ¡ali smo sa pogodimo postavke, pa je potrebno da ih proverite."
+#: ../capplet/settings/mail-account-view.c:591
+msgid ""
+"Now we need your settings for sending mail. We've tried to make some guesses "
+"but you should check them over to make sure."
+msgstr ""
+"Sada su nam potrebne postavke slanja poÅ¡te. PokuÅ¡ali smo sa pogodimo "
+"postavke, pa je potrebno da ih proverite."
 
-#: ../capplet/settings/mail-account-view.c:362
+#: ../capplet/settings/mail-account-view.c:592
 msgid "You can specify your default settings for your account."
 msgstr "MoÅ¾ete odrediti podrazumevane postavke naloga."
 
-#: ../capplet/settings/mail-account-view.c:363
-msgid "Time to check things over before we try and connect to the server and fetch your mail."
-msgstr "Vreme je za proveru postavki pre nego Å¡to pokuÅ¡amo sa povezivanjem na server radi dobavljanja poÅ¡te."
+#: ../capplet/settings/mail-account-view.c:593
+msgid ""
+"Time to check things over before we try and connect to the server and fetch "
+"your mail."
+msgstr ""
+"Vreme je za proveru postavki pre nego Å¡to pokuÅ¡amo sa povezivanjem na server "
+"radi dobavljanja poÅ¡te."
 
-#: ../capplet/settings/mail-account-view.c:378
-#: ../mail/em-account-editor.c:2064
-#: ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:62
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:378
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:608
 msgid "Next - Receiving mail"
 msgstr "Napred - Primanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Receiving mail"
 msgstr "Primanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:379
-#: ../capplet/settings/mail-account-view.c:380
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Next - Sending mail"
 msgstr "Napred - Slanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Back - Identity"
 msgstr "Nazad - Identitet"
 
-#: ../capplet/settings/mail-account-view.c:379
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:609
 msgid "Next - Receiving options"
 msgstr "Napred - Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:380
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:610
 msgid "Receiving options"
 msgstr "Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:380
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving mail"
 msgstr "Nazad - Primanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Sending mail"
 msgstr "Slanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:382
-#: ../capplet/settings/mail-account-view.c:383
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Next - Review account"
 msgstr "Napred - Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Next - Defaults"
 msgstr "Napred - Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:382
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:612
 msgid "Back - Receiving options"
 msgstr "Nazad - Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:383
-#: ../mail/em-account-editor.c:2774
-#: ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2985 ../mail/mail-config.ui.h:34
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:383
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:613
 msgid "Back - Sending mail"
 msgstr "Nazad - Slanje poÅ¡te"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Review account"
 msgstr "Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Finish"
 msgstr "ZavrÅ¡etak"
 
-#: ../capplet/settings/mail-account-view.c:385
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:615
 msgid "Back - Sending"
 msgstr "Nazad - Slanje"
 
 #: ../capplet/settings/mail-account-view.c:719
-#: ../capplet/settings/mail-settings-view.c:266
-#| msgid "Close"
+#, fuzzy
+#| msgid "Add WebDAV contacts to Evolution."
+msgid "Setup Google contacts with Evolution"
+msgstr "Dodaje WebDAV kontakte u Evoluciju."
+
+#: ../capplet/settings/mail-account-view.c:720
+#, fuzzy
+#| msgid "Add Google Calendars to Evolution."
+msgid "Setup Google calendar with Evolution"
+msgstr "Dodaje Google kalendare u Evoluciju."
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "MoÅ¾da je potrebno omoguÄ?iti IMAP pristup."
+
+#: ../capplet/settings/mail-account-view.c:733
+#, fuzzy
+#| msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">LiÄ?ni podaci:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+#, fuzzy
+#| msgid "Add weather calendars to Evolution."
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "Dodaje kalendare za vreme u Evoluciju."
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+"Yahoo kalendarima se dodeljuju imena oblika ime_prezime. PokuÅ¡ali smo da "
+"formiramo ime kalendara. Potvrdite ili unesite drugo ukoliko predloÅ¾eno nije "
+"ispravno."
+
+#: ../capplet/settings/mail-account-view.c:768
+#, fuzzy
+#| msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Upravljanje naloga</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+#, fuzzy
+#| msgid "Choose calendar file"
+msgid "Yahoo Calendar name:"
+msgstr "Izaberite datoteku kalendara"
+
+#: ../capplet/settings/mail-account-view.c:1023
+#| msgid "Pass_word:"
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
 msgid "Close Tab"
 msgstr "Zatvori jeziÄ?ak"
 
-#: ../capplet/settings/mail-account-view.c:729
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1101
 msgid "Account Wizard"
 msgstr "Ä?arobnjak naloga"
 
-#: ../capplet/settings/mail-capplet-shell.c:284
-#| msgid "Evolution Account Assistant"
+#: ../capplet/settings/mail-capplet-shell.c:208
 msgid "Evolution account assistant"
 msgstr "PomoÄ?nik naloga Evolucije"
 
-#: ../capplet/settings/mail-capplet-shell.c:320
-#: ../data/evolution-settings.desktop.in.in.h:2
-#| msgid "Junk Mail Settings"
-msgid "Email Settings"
-msgstr "Postavke poÅ¡te"
-
-#: ../capplet/settings/mail-capplet-shell.c:334
-#| msgid "_Quit"
-msgid "Quit"
-msgstr "IzaÄ?i"
-
 # On This Computer is always first and VFolders is always last
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:453
-#: ../mail/e-mail-migrate.c:2949
-#: ../mail/e-mail-store.c:229
-#: ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153
-#: ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158
-#: ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167
-#: ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1617
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1666
+#: ../modules/addressbook/e-book-shell-backend.c:95
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:102
+#: ../modules/calendar/e-cal-shell-migrate.c:141
+#: ../modules/calendar/e-memo-shell-backend.c:92
 #: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-backend.c:92
+#: ../modules/calendar/e-task-shell-migrate.c:111
 msgid "On This Computer"
 msgstr "Na ovom raÄ?unaru"
 
-#: ../capplet/settings/mail-settings-view.c:148
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../capplet/settings/mail-settings-view.c:146
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Modify"
 msgstr "Izmeni"
 
-#: ../capplet/settings/mail-settings-view.c:150
-#| msgid "Add IM Account"
+#: ../capplet/settings/mail-settings-view.c:148
 msgid "Add a new account"
 msgstr "Dodaj novi nalog"
 
-#: ../capplet/settings/mail-settings-view.c:185
-#| msgid "<span weight=\"bold\">Account Information</span>"
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span size=\"large\" weight=\"bold\">Upravljanje naloga</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+#| msgid "Account Management"
+msgid "Account management"
+msgstr "Upravljanje nalozima"
 
-#: ../capplet/settings/mail-settings-view.c:276
-#| msgid "Junk Settings"
+#: ../capplet/settings/mail-settings-view.c:277
 msgid "Settings"
 msgstr "Postavke"
 
@@ -8761,9 +8803,8 @@ msgstr "ObaveÅ¡tenja o kalendarskim dogaÄ?ajima"
 msgid "Evolution Alarm Notify"
 msgstr "ObaveÅ¡tenje alarma Evolucije"
 
-#: ../data/evolution.desktop.in.in.h:1
-#: ../mail/e-mail-browser.c:800
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:845
+#: ../shell/e-shell-window-private.c:253
 msgid "Evolution"
 msgstr "Evolucija"
 
@@ -8774,8 +8815,7 @@ msgstr "PoÅ¡ta i kalendar Evolucije"
 # bug(slobo): tooltip bi mogao da bude i â??PoÅ¡aljite e-poruku prijateljima i pored
 # ovako uÅ¡togljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:3
-#: ../shell/e-shell-window-actions.c:654
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
 msgstr "Paket Groupware"
 
@@ -8784,17 +8824,12 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Upravlja poÅ¡tom, kontaktima i obavezama"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
-#| msgid "Configure your email accounts here"
 msgid "Configure email accounts"
 msgstr "Podesite naloge e-poÅ¡te"
 
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "karta adresara"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "podatak kalendara"
+#: ../data/evolution-settings.desktop.in.in.h:2
+msgid "Email Settings"
+msgstr "Postavke poÅ¡te"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:224
@@ -8820,18 +8855,16 @@ msgstr "%s..."
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% zavrÅ¡eno)"
 
-#: ../e-util/e-alert.c:72
-#: ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
 msgid "Evolution Error"
 msgstr "GreÅ¡ka Evolucije"
 
-#: ../e-util/e-alert.c:74
-#: ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
 msgid "Evolution Warning"
 msgstr "Upozorenje Evolucije"
 
 # bug(slobo): mogli su dati i bolji original, dobili su isto tako smislen prevod
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "UnutraÅ¡nja greÅ¡ka, zahtevana je nepoznata greÅ¡ka â??%sâ??"
@@ -8892,62 +8925,72 @@ msgstr "Zapadnoevropska"
 msgid "Western European, New"
 msgstr "Zapadnoevropska, nova"
 
-#: ../e-util/e-charset.c:85
-#: ../e-util/e-charset.c:86
-#: ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
 msgid "Traditional"
 msgstr "Tradicionalna"
 
-#: ../e-util/e-charset.c:88
-#: ../e-util/e-charset.c:89
-#: ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
 msgid "Simplified"
 msgstr "Pojednostavljena"
 
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
 msgid "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
 msgid "Visual"
 msgstr "Vizuelna"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../e-util/e-datetime-format.c:196
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:311
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202
-#: ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow"
 msgstr "Sutra"
 
-#: ../e-util/e-datetime-format.c:204
+#: ../e-util/e-datetime-format.c:207
 msgid "Yesterday"
 msgstr "JuÄ?e"
 
-#: ../e-util/e-datetime-format.c:207
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
 #, c-format
-msgid "%d days from now"
-msgstr "%d dana od sada"
+#| msgid "%d days from now"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "Za %d dan"
+msgstr[1] "Za %d dana"
+msgstr[2] "Za %d dana"
+msgstr[3] "Za %d dan"
 
-#: ../e-util/e-datetime-format.c:209
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
 #, c-format
-msgid "%d days ago"
-msgstr "pre %d dana"
+#| msgid "%d days ago"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "Pre %d dan"
+msgstr[1] "Pre %d dana"
+msgstr[2] "Pre %d dana"
+msgstr[3] "Pre %d dan"
 
-#: ../e-util/e-datetime-format.c:283
-#: ../e-util/e-datetime-format.c:293
-#: ../e-util/e-datetime-format.c:302
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
 msgid "Use locale default"
 msgstr "Koristi podrazumevan lokalitet"
 
-#: ../e-util/e-datetime-format.c:496
+#: ../e-util/e-datetime-format.c:502
 msgid "Format:"
 msgstr "Format:"
 
@@ -8968,18 +9011,6 @@ msgstr "Upisivanje â??%sâ??"
 msgid "Writing \"%s\" to %s"
 msgstr "Upisivanje â??%sâ?? u %s"
 
-#: ../e-util/e-logger.c:175
-msgid "Name of the logger"
-msgstr "Naziv beleÅ¾nika"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#: ../e-util/e-module.c:189
-msgid "The filename of the module"
-msgstr "Ime datoteke modula"
-
 #: ../e-util/e-non-intrusive-error-dialog.c:194
 msgid "Debug Logs"
 msgstr "Dnevnici dijagnoze kvara"
@@ -9003,15 +9034,15 @@ msgstr "Unosi dnevnika:"
 msgid "Log Level"
 msgstr "Nivo zapisivanja u dnevnik"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:297
-#: ../mail/message-list.c:2696
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2757
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:306
-#: ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
+#: ../shell/e-shell-window-actions.c:1426
+#: ../shell/e-shell-window-actions.c:1433
+#: ../shell/e-shell-window-actions.c:1440
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
@@ -9035,39 +9066,26 @@ msgstr "Dijagnoza kvara"
 msgid "Error, Warnings and Debug messages"
 msgstr "Poruke o greÅ¡ci, upozorenju i dijagnozi kvara"
 
-# has "activatable" set.
-#: ../e-util/e-plugin.c:295
-#: ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "OmoguÄ?eno"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "Da li je prikljuÄ?ak ukljuÄ?en"
-
-#: ../e-util/e-plugin-util.c:425
-#: ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "nedelje"
 
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
 msgstr "DoÅ¡lo je do greÅ¡ke u Å¡tampi"
 
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
 msgstr "Sistem za Å¡tampanje je izvestio sledeÄ?e detalje o greÅ¡ki:"
 
-#: ../e-util/e-print.c:173
-msgid "The printing system did not report any additional details about the error."
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
 msgstr "Sistem za Å¡tampanje nije ponudio nikakve dodatne detalje o greÅ¡ki."
 
-#: ../e-util/e-signature.c:701
+#: ../e-util/e-signature.c:731
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
@@ -9077,7 +9095,6 @@ msgstr "Automatski sastavljeno"
 # system:no-save-file secondary
 # system:no-load-file secondary
 #: ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "Zbog â??{1}â??."
 
@@ -9097,16 +9114,15 @@ msgstr "Å½elite li da je prepiÅ¡ete?"
 msgid "File exists \"{0}\"."
 msgstr "Datoteka postoji â??{0}â??."
 
-#: ../e-util/e-system.error.xml.h:6
-#: ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:140
 msgid "_Overwrite"
 msgstr "_PrepiÅ¡i"
 
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
 msgid "Could not open the link."
 msgstr "Nije moguÄ?e otvoriti vezu."
 
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
 msgid "Could not display help for Evolution."
 msgstr "Nije moguÄ?e prikazati pomoÄ? za Evoluciju."
 
@@ -9119,249 +9135,252 @@ msgstr "GConf greÅ¡ka: %s"
 msgid "All further errors shown only on terminal."
 msgstr "Sve greÅ¡ke se ubuduÄ?e prikazuju samo u terminalu."
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1024
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "Å alje"
+
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1025
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2242
-#: ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2350
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1027
+#: ../mail/em-format-html.c:2290 ../mail/em-format-html.c:2352
+#: ../mail/em-format-html.c:2375 ../modules/mail/em-mailer-prefs.c:81
 msgid "Cc"
 msgstr "Kopija (Cc)"
 
-#: ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2243
-#: ../mail/em-format-html.c:2324
-#: ../mail/em-format-html.c:2357
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:269 ../em-format/em-format.c:1028
+#: ../mail/em-format-html.c:2291 ../mail/em-format-html.c:2356
+#: ../mail/em-format-html.c:2378 ../modules/mail/em-mailer-prefs.c:82
 msgid "Bcc"
 msgstr "Nevidljiva kopija (Bcc)"
 
-#: ../em-format/em-format-quote.c:355
-#: ../em-format/em-format.c:963
-#: ../mail/e-mail-tag-editor.c:328
-#: ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18
-#: ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7
-#: ../smime/lib/e-cert.c:1125
+#: ../em-format/em-format-quote.c:406 ../em-format/em-format.c:1029
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
 msgid "Subject"
 msgstr "Naslov"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:366
-#: ../mail/em-format-html.c:2455
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:417 ../mail/em-format-html.c:2472
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "PoÅ¡iljalac"
 
-#: ../em-format/em-format-quote.c:431
-#: ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:492 ../mail/em-composer-utils.c:1190
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ProsleÄ?ena poruka --------"
 
-#: ../em-format/em-format.c:964
-#: ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83
-#: ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:1030 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:965
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:1031 ../modules/mail/em-mailer-prefs.c:85
 msgid "Newsgroups"
 msgstr "Grupe za vesti"
 
-#: ../em-format/em-format.c:966
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:1032 ../modules/mail/em-mailer-prefs.c:86
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1411
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1472
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nije moguÄ?a obrada S/MIME poruke: nepoznata greÅ¡ka"
 
-#: ../em-format/em-format.c:1512
-#: ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1627 ../em-format/em-format.c:1803
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nije moguÄ?a obrada MIME poruke. Prikazivanje izvora."
 
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1635
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "NepodrÅ¾ani tip Å¡ifre za multipart/encrypted"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1648
 msgid "Could not parse PGP/MIME message"
 msgstr "Nije moguÄ?a obrada PGP/MIME poruke"
 
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1649
 msgid "Could not parse PGP/MIME message: Unknown error"
 msgstr "Nije moguÄ?a obrada PGP/MIME poruke: nepoznata greÅ¡ka"
 
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1827
 msgid "Unsupported signature format"
 msgstr "NepodrÅ¾an oblik potpisa"
 
-#: ../em-format/em-format.c:1706
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1837 ../em-format/em-format.c:1997
 msgid "Error verifying signature"
 msgstr "GreÅ¡ka pri proveri potpisa"
 
-#: ../em-format/em-format.c:1706
-#: ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1838 ../em-format/em-format.c:1985
+#: ../em-format/em-format.c:1998
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greÅ¡ka pri proveri potpisa"
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2082
+#, fuzzy
+#| msgid "Could not parse PGP message"
+msgid "Could not parse PGP message: "
 msgstr "Nije moguÄ?a obrada PGP poruke."
 
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "Nije moguÄ?a obrada PGP/MIME poruke: nepoznata greÅ¡ka"
+#: ../em-format/em-format.c:2088 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "Nepoznata greÅ¡ka"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "pre %d sekunde"
 msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
+msgstr[3] "pre %d sekunde"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d sekunda u buduÄ?nosti"
 msgstr[1] "%d sekunde u buduÄ?nosti"
 msgstr[2] "%d sekundi u buduÄ?nosti"
+msgstr[3] "%d sekunda u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "pre %d minut"
 msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
+msgstr[3] "pre %d minut"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d minut u buduÄ?nosti"
 msgstr[1] "%d minuta u buduÄ?nosti"
 msgstr[2] "%d minuta u buduÄ?nosti"
+msgstr[3] "%d minut u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "pre %d sat"
 msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
+msgstr[3] "pre %d sat"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d sat u buduÄ?nosti"
 msgstr[1] "%d sata u buduÄ?nosti"
 msgstr[2] "%d sati u buduÄ?nosti"
+msgstr[3] "%d sat u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "pre %d dan"
 msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
+msgstr[3] "pre %d dan"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d dan u buduÄ?nosti"
 msgstr[1] "%d dana u buduÄ?nosti"
 msgstr[2] "%d dana u buduÄ?nosti"
+msgstr[3] "%d dan u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "pre %d nedelju"
 msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
+msgstr[3] "pre %d nedelju"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d nedelja u buduÄ?nosti"
 msgstr[1] "%d nedelje u buduÄ?nosti"
 msgstr[2] "%d nedelja u buduÄ?nosti"
+msgstr[3] "%d nedelja u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "pre %d mesec"
 msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
+msgstr[3] "pre %d mesec"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d mesec u buduÄ?nosti"
 msgstr[1] "%d months in the future"
 msgstr[2] "%d months in the future"
+msgstr[3] "%d mesec u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "pre %d godinu"
 msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
+msgstr[3] "pre %d godinu"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d godina u buduÄ?nosti"
 msgstr[1] "%d godine u buduÄ?nosti"
 msgstr[2] "%d godina u buduÄ?nosti"
+msgstr[3] "%d godina u buduÄ?nosti"
 
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/e-filter-datespec.c:119
-#: ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poreÄ?enje"
 
@@ -9397,8 +9416,7 @@ msgstr "_PronaÄ?i stavke:"
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/e-filter-rule.c:761
-#: ../widgets/misc/e-send-options.ui.h:16
+#: ../filter/e-filter-rule.c:761 ../widgets/misc/e-send-options.ui.h:16
 msgid "Replies"
 msgstr "Odgovori"
 
@@ -9414,14 +9432,12 @@ msgstr "Nema odgovora ili roditelja"
 msgid "I_nclude threads"
 msgstr "U_kljuÄ?i niti"
 
-#: ../filter/e-filter-rule.c:1141
-#: ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:304
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../filter/e-filter-rule.c:1141
-#: ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
 msgid "Outgoing"
 msgstr "Odlazno"
 
@@ -9454,8 +9470,7 @@ msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -9512,8 +9527,7 @@ msgstr ""
 "Datum poruke Ä?e biti uporeÄ?en sa\n"
 "trenutnim vremenom kada se filtriranje desilo."
 
-#: ../filter/filter.ui.h:11
-#: ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
 
@@ -9535,8 +9549,7 @@ msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: ../filter/filter.ui.h:19
-#: ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:190
 msgid "seconds"
 msgstr "sekunde"
 
@@ -9552,50 +9565,31 @@ msgstr "vreme koje odredite"
 msgid "years"
 msgstr "godine"
 
-#: ../mail/e-mail-attachment-bar.c:120
-#: ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029
-#: ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1
-#: ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1024 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Prilog"
 msgstr[1] "Prilozi"
-msgstr[2] "Priloga"
+msgstr[2] "Prilozi"
+msgstr[3] "Prilog"
 
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
 msgid "Icon View"
 msgstr "Pregled sa ikonama"
 
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
 msgid "List View"
 msgstr "Pregled sa spiskom"
 
-#: ../mail/e-mail-browser.c:732
-#: ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr "Pratilac fokusa"
-
-#: ../mail/e-mail-browser.c:742
-msgid "Shell Module"
-msgstr "Modul Å¡koljke"
-
-#: ../mail/e-mail-browser.c:743
-#: ../mail/message-list.c:2589
-msgid "The mail shell backend"
-msgstr "Pozadinski proces poÅ¡te"
-
-#: ../mail/e-mail-browser.c:753
-msgid "Show Deleted"
-msgstr "PrikaÅ¾i obrisano"
-
-#: ../mail/e-mail-browser.c:754
-msgid "Show deleted messages"
-msgstr "PrikaÅ¾i obrisane poruke"
+#: ../mail/e-mail-browser.c:265
+#| msgid "Subject"
+msgid "(No Subject)"
+msgstr ""
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -9645,7 +9639,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:515
+#: ../modules/mail/e-mail-shell-view-actions.c:478
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
@@ -9665,124 +9659,60 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-local.c:37
-#: ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680
-#: ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "Ime"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 msgid "Inbox"
 msgstr "SanduÄ?e"
 
-#: ../mail/e-mail-local.c:38
-#: ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
 msgid "Drafts"
 msgstr "Nacrti"
 
-#: ../mail/e-mail-local.c:39
-#: ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: ../mail/e-mail-local.c:40
-#: ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../mail/e-mail-local.c:41
-#: ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
 msgid "Templates"
 msgstr "Å abloni"
 
-#: ../mail/e-mail-migrate.c:960
-#: ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "VaÅ¾no"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "Za uraditi"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "Kasnije"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
 msgid "Migrating..."
 msgstr "PrenoÅ¡enje..."
 
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
 msgid "Migration"
 msgstr "Prelazak"
 
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
 #, c-format
 msgid "Migrating '%s':"
 msgstr "PrenoÅ¡enje â??%sâ??:"
 
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "Nije moguÄ?e pravljenje nove fascikle â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "Nije moguÄ?e umnoÅ¾iti fasciklu â??%sâ?? u â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "Nije moguÄ?a pretraga za postojeÄ?im poÅ¡tanskim sanduÄ?iÄ?ima u â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:1823
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:649
 msgid "Migrating Folders"
 msgstr "PrenoÅ¡enje fascikli"
 
-#: ../mail/e-mail-migrate.c:1824
+#: ../mail/e-mail-migrate.c:650
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Mesto i hijerarhija fascikli poÅ¡te u Evoluciji je izmenjena od Evolucije 1.h.\n"
-"\n"
-"Molim budite strpljivi dok Evolucija prenosi fascikle..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "Nije moguÄ?e otvaranje starog POP Ä?uvaj-na-serveru podatka â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Nije moguÄ?e pravljenje POP3 Ä?uvaj-na-serveru direktorijuma podataka â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "Nije moguÄ?e umnoÅ¾avanje POP3 Ä?uvaj-na-serveru podatka â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2546
-#: ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "Nije uspelo pravljenje lokalne ostave poÅ¡te â??%sâ??: %s"
-
-#: ../mail/e-mail-migrate.c:2934
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite since Evolution 2.24.\n"
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9790,50 +9720,59 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/e-mail-migrate.c:3031
+#: ../mail/e-mail-migrate.c:739
 #, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "Nije moguÄ?e pravljenje lokalnih fascikli poÅ¡te u â??%sâ??: %s"
+#| msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
+msgstr "Ne mogu da napravim lokalne fascikle za poÅ¡tu u â??%sâ??: %s"
 
-#: ../mail/e-mail-migrate.c:3049
-#, c-format
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "Nije moguÄ?e Ä?itanje postavke prethodne instalacije Evolucije, â??evolution/config.xmldbâ?? ne postoji ili je oÅ¡teÄ?en."
+#: ../mail/e-mail-notebook-view.c:563
+#| msgid "Please select a server."
+msgid "Please select a folder"
+msgstr "Izaberite fasciklu."
 
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../mail/e-mail-reader.c:264
-#: ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:274 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "UmnoÅ¾i u fasciklu"
 
-#: ../mail/e-mail-reader.c:264
-#: ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:274 ../mail/em-folder-utils.c:402
 msgid "C_opy"
 msgstr "_UmnoÅ¾i"
 
-#: ../mail/e-mail-reader.c:638
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:648 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:638
-#: ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:648 ../mail/em-folder-utils.c:402
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../mail/e-mail-reader.c:864
+#. Check buttons
+#: ../mail/e-mail-reader.c:908 ../mail/e-mail-reader.c:1019
+#: ../mail/e-mail-reader.c:1060
+#| msgid "Do not ask me again"
+msgid "_Do not ask me again."
+msgstr "_Ne pitaj me ponovo."
+
+#: ../mail/e-mail-reader.c:1065
+msgid "_Always ignore Reply-To: for mailing lists."
+msgstr "_Uvek zanemari Odgovor-za: za dopisne liste."
+
+#: ../mail/e-mail-reader.c:1155
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "SaÄ?uvaj poruku"
 msgstr[1] "SaÄ?uvaj poruke"
 msgstr[2] "SaÄ?uvaj poruka"
+msgstr[3] "SaÄ?uvaj poruku"
 
 #. Translators: This is a part of a suggested file name
 #. * used when saving a message or multiple messages to an
@@ -9841,586 +9780,647 @@ msgstr[2] "SaÄ?uvaj poruka"
 #. * Subject. The extension ".mbox" is appended to this
 #. * string, thus it will be something like "Message.mbox"
 #. * at the end.
-#: ../mail/e-mail-reader.c:885
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
+#: ../mail/e-mail-reader.c:1176
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
 msgstr[1] "Poruke"
-msgstr[2] "Poruka"
-
-#: ../mail/e-mail-reader.c:1143
+msgstr[2] "Poruke"
+msgstr[3] "Poruka"
+#: ../mail/e-mail-reader.c:1441
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj poÅ¡iljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1443
 msgid "Add sender to address book"
 msgstr "Dodaj poÅ¡iljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1448
 msgid "Check for _Junk"
 msgstr "Proveri ima li _Ä?ubreta"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1450
 msgid "Filter the selected messages for junk status"
 msgstr "Filtriraj da li meÄ?u izabranim porukama ima Ä?ubreta"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1455
 msgid "_Copy to Folder..."
 msgstr "_UmnoÅ¾i u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1457
 msgid "Copy selected messages to another folder"
 msgstr "UmnoÅ¾i izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1462
 msgid "_Delete Message"
 msgstr "_ObriÅ¡i poruku"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1464
 msgid "Mark the selected messages for deletion"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1171
+#: ../mail/e-mail-reader.c:1469
 msgid "Filter on Mailing _List..."
 msgstr "Filter na dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1471
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Napravi pravilo za filtriranje poruka na ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:1178
+#: ../mail/e-mail-reader.c:1476
 msgid "Filter on _Recipients..."
 msgstr "Filter na _primaoce..."
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1478
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravi pravilo za filtriranje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1185
+#: ../mail/e-mail-reader.c:1483
 msgid "Filter on Se_nder..."
 msgstr "Filter na poÅ¡_iljaoca..."
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1485
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravi pravilo za filtriranje poruka od ovog poÅ¡iljaoca"
 
-#: ../mail/e-mail-reader.c:1192
+#: ../mail/e-mail-reader.c:1490
 msgid "Filter on _Subject..."
 msgstr "Filter na _naslov..."
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1492
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravi pravilo za filtriranje poruka sa ovim naslovom"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1497
 msgid "A_pply Filters"
 msgstr "Pri_meni filtere"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1499
 msgid "Apply filter rules to the selected messages"
 msgstr "Primeni pravila filtriranja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1206
+#: ../mail/e-mail-reader.c:1504
 msgid "_Find in Message..."
 msgstr "P_ronaÄ?i u poruci..."
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1506
 msgid "Search for text in the body of the displayed message"
 msgstr "PretraÅ¾i tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:1213
+#: ../mail/e-mail-reader.c:1511
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1513
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Ukloni oznaku za praÄ?enje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:1220
+#: ../mail/e-mail-reader.c:1518
 msgid "_Flag Completed"
 msgstr "OznaÄ?_i kao zavrÅ¡eno"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1520
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Postavi oznaku za praÄ?enje kao zavrÅ¡enu na izabranim porukama"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1525
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1229
+#: ../mail/e-mail-reader.c:1527
 msgid "Flag the selected messages for follow-up"
 msgstr "OznaÄ?i izabrane poruke za praÄ?enje"
 
-#: ../mail/e-mail-reader.c:1234
+#: ../mail/e-mail-reader.c:1532
 msgid "_Attached"
 msgstr "Pri_loÅ¾eno"
 
-#: ../mail/e-mail-reader.c:1236
-#: ../mail/e-mail-reader.c:1243
+#: ../mail/e-mail-reader.c:1534 ../mail/e-mail-reader.c:1541
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ProsleÄ?uje izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1539
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1248
+#: ../mail/e-mail-reader.c:1546
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1250
-#: ../mail/e-mail-reader.c:1257
+#: ../mail/e-mail-reader.c:1548 ../mail/e-mail-reader.c:1555
 msgid "Forward the selected message in the body of a new message"
 msgstr "ProsleÄ?uje izabranu poruku u telu nove poruke"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1553
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1560
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1264
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1562 ../mail/e-mail-reader.c:1569
 msgid "Forward the selected message quoted like a reply"
 msgstr "ProsleÄ?uje izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1567
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1276
+#: ../mail/e-mail-reader.c:1574
 msgid "_Load Images"
 msgstr "_UÄ?itaj slike"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1576
 msgid "Force images in HTML mail to be loaded"
 msgstr "Silom uÄ?itava slike u HTML porukama"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1581
 msgid "_Important"
 msgstr "_VaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1583
 msgid "Mark the selected messages as important"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) kao vaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1588
 msgid "_Junk"
 msgstr "_Ä?ubre"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1590
 msgid "Mark the selected messages as junk"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) kao neÅ¾eljenu poÅ¡tu"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1595
 msgid "_Not Junk"
 msgstr "Ni_je Ä?ubre"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1597
 msgid "Mark the selected messages as not being junk"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) da nije neÅ¾eljena poÅ¡ta"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1602
 msgid "_Read"
 msgstr "Pro_Ä?itaj"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1604
 msgid "Mark the selected messages as having been read"
 msgstr "OznaÄ?i izabranu(e) poruku(e) kao proÄ?itano"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1609
 msgid "Uni_mportant"
 msgstr "Ne_vaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1611
 msgid "Mark the selected messages as unimportant"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) kao nevaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1616
 msgid "_Unread"
 msgstr "_NeproÄ?itano"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1618
 msgid "Mark the selected messages as not having been read"
 msgstr "OznaÄ?ava izabranu(e) poruku(e) kao neproÄ?itano"
 
-#: ../mail/e-mail-reader.c:1325
+#: ../mail/e-mail-reader.c:1623
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1625
 msgid "Open the selected messages in the composer for editing"
 msgstr "Otvara izabranu poruku u sastavljaÄ?u radi ureÄ?ivanja"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1630
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1632
 msgid "Open a window for composing a mail message"
 msgstr "Otvori prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1637
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1639
 msgid "Open the selected messages in a new window"
 msgstr "Otvori izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1644
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1646
 msgid "Move selected messages to another folder"
 msgstr "Premesti izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1651
+#| msgid "Switch to %s"
+msgid "_Switch to Folder"
+msgstr "PreÄ?i u _fasciklu"
+
+#: ../mail/e-mail-reader.c:1653
+#, fuzzy
+#| msgid "Install the shared folder"
+msgid "Display the parent folder"
+msgstr "Instaliraj deljenu fasciklu"
+
+#: ../mail/e-mail-reader.c:1658
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _next tab"
+msgstr "PreÄ?i na %s"
+
+#: ../mail/e-mail-reader.c:1660
+msgid "Switch to the next tab"
+msgstr "Prebaci na sledeÄ?i jeziÄ?ak"
+
+#: ../mail/e-mail-reader.c:1665
+#, fuzzy
+#| msgid "Switch to %s"
+msgid "Switch to _previous tab"
+msgstr "PreÄ?i na %s"
+
+#: ../mail/e-mail-reader.c:1667
+msgid "Switch to the previous tab"
+msgstr "Prebaci na prethodni jeziÄ?ak"
+
+#: ../mail/e-mail-reader.c:1672
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Cl_ose current tab"
+msgstr "Zatvara trenutnu datoteku"
+
+#: ../mail/e-mail-reader.c:1674
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Close current tab"
+msgstr "Zatvara trenutnu datoteku"
+
+#: ../mail/e-mail-reader.c:1679
 msgid "_Next Message"
 msgstr "_SledeÄ?a poruka"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1681
 msgid "Display the next message"
 msgstr "PrikaÅ¾i sledeÄ?u poruku"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1686
 msgid "Next _Important Message"
 msgstr "SledeÄ?a _vaÅ¾na poruka"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1688
 msgid "Display the next important message"
 msgstr "PrikaÅ¾i sledeÄ?u vaÅ¾nu poruku"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1693
 msgid "Next _Thread"
 msgstr "_SledeÄ?a rasprava"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1695
 msgid "Display the next thread"
 msgstr "PrikaÅ¾i sledeÄ?u raspravu"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1700
 msgid "Next _Unread Message"
 msgstr "SledeÄ?a _neproÄ?itana poruka"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1702
 msgid "Display the next unread message"
 msgstr "PrikaÅ¾i sledeÄ?u neproÄ?itanu poruku"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1707
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1709
 msgid "Display the previous message"
 msgstr "PrikaÅ¾i prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1714
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna vaÅ¾na poruka"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1716
 msgid "Display the previous important message"
 msgstr "PrikaÅ¾i prethodnu vaÅ¾nu poruku"
 
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1721
 msgid "P_revious Unread Message"
 msgstr "P_rethodna neproÄ?itana poruka"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1723
 msgid "Display the previous unread message"
 msgstr "PrikaÅ¾i prethodnu neproÄ?itanu poruku"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1730
 msgid "Print this message"
 msgstr "Å tampaj ovu poruku"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1737
 msgid "Preview the message to be printed"
 msgstr "Pregledaj poruku pred Å¡tampu"
 
-#: ../mail/e-mail-reader.c:1416
+#: ../mail/e-mail-reader.c:1742
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1744
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preu_smerava (bez Ä?itanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../mail/e-mail-reader.c:1749 ../mail/mail.error.xml.h:91
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1751
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavi odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1756 ../mail/mail.error.xml.h:92
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1758
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavi odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../mail/e-mail-reader.c:1763
+#: ../modules/mail/e-mail-attachment-handler.c:146
 msgid "_Reply to Sender"
 msgstr "_Odgovori poÅ¡iljaocu"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1765
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavi odgovor poÅ¡iljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1770
 msgid "_Save as mbox..."
 msgstr "_SaÄ?uvaj kao mbox..."
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1772
 msgid "Save selected messages as an mbox file"
 msgstr "SaÄ?uvaj izabrane poruke kao mbox datoteku"
 
-#: ../mail/e-mail-reader.c:1451
+#: ../mail/e-mail-reader.c:1777
 msgid "Search Folder from Mailing _List..."
 msgstr "Fascikla pretrage na dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1779
 msgid "Create a search folder for this mailing list"
 msgstr "Napravi fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1784
 msgid "Search Folder from Recipien_ts..."
 msgstr "Fascikla pretrage od prima_laca..."
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1786
 msgid "Create a search folder for these recipients"
 msgstr "Napravi fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1791
 msgid "Search Folder from Sen_der..."
 msgstr "Fascikla pretrage na _poÅ¡iljaoca..."
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1793
 msgid "Create a search folder for this sender"
 msgstr "Napravi fasciklu pretrage za ovog poÅ¡iljaoca"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1798
 msgid "Search Folder from S_ubject..."
 msgstr "Fascikla pretrage na n_aslov..."
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1800
 msgid "Create a search folder for this subject"
 msgstr "Napravi fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1805
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1807
 msgid "Show the raw email source of the message"
 msgstr "PrikaÅ¾i izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1819
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1821
 msgid "Undelete the selected messages"
 msgstr "Povrati izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1826
 msgid "_Normal Size"
 msgstr "_Normalna veliÄ?ina"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1828
 msgid "Reset the text to its original size"
 msgstr "Vrati tekst na originalnu veliÄ?inu"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1833
 msgid "_Zoom In"
 msgstr "Uv_eÄ?aj"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1835
 msgid "Increase the text size"
 msgstr "UveÄ?aj veliÄ?inu teksta"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1840
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1842
 msgid "Decrease the text size"
 msgstr "Umanji veliÄ?inu teksta"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1849
 msgid "Create R_ule"
 msgstr "Napravi pra_vilo"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1856
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1863
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1870
+#, fuzzy
+#| msgid "_Reply"
+msgid "_Group Reply"
+msgstr "O_dgovori"
+
+#: ../mail/e-mail-reader.c:1877
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1884
 msgid "Mar_k As"
 msgstr "O_znaÄ?i kao"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1891
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1898
 msgid "_Zoom"
 msgstr "Uv_eÄ?aj"
 
-#: ../mail/e-mail-reader.c:1590
+#: ../mail/e-mail-reader.c:1923
 msgid "Mark for Follo_w Up..."
 msgstr "ObeleÅ¾i za _praÄ?enje..."
 
-#: ../mail/e-mail-reader.c:1598
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark as _Important"
 msgstr "OnaÄ?i kao _vaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1935
 msgid "Mark as _Junk"
 msgstr "OznaÄ?i kao _Ä?ubre"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1939
 msgid "Mark as _Not Junk"
 msgstr "OznaÄ?i da _nije Ä?ubre"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1943
 msgid "Mar_k as Read"
 msgstr "O_znaÄ?i kao proÄ?itano"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1947
 msgid "Mark as Uni_mportant"
 msgstr "OznaÄ?i kao _nevaÅ¾no"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1951
 msgid "Mark as _Unread"
 msgstr "OznaÄ?i kao _neproÄ?itano"
 
-#: ../mail/e-mail-reader.c:1654
+#: ../mail/e-mail-reader.c:1987
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:1656
+#: ../mail/e-mail-reader.c:1989
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "PrikaÅ¾i trepÄ?uÄ?i kursor u telu prikazanih poruka"
 
-#: ../mail/e-mail-reader.c:1662
+#: ../mail/e-mail-reader.c:1995
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:1664
+#: ../mail/e-mail-reader.c:1997
 msgid "Show messages with all email headers"
 msgstr "PrikaÅ¾i poruku sa svim zaglavljima e-poÅ¡te"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2218
 msgid "Unable to retrieve message"
 msgstr "Nije moguÄ?e dobiti poruku"
 
-#: ../mail/e-mail-reader.c:1900
-#: ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
+#: ../mail/e-mail-reader.c:2278 ../mail/mail-ops.c:1891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "DovlaÄ?enje poruke â??%sâ??"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2467
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2838 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
 #: ../widgets/misc/e-account-tree-view.c:234
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/e-mail-reader.c:2588
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:3007
+#: ../modules/mail/e-mail-attachment-handler.c:132
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:2589
+#: ../mail/e-mail-reader.c:3008
 msgid "Forward the selected message to someone"
 msgstr "ProsleÄ?uje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2633
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#. Likewise the "mail-reply-group" action
+#. For Translators: "Group Reply" will reply either to a mailing list
+#. (if possible and if that configuration option is enabled), or else
+#. it will reply to all. The word "Group" was chosen because it covers
+#. either of those, without too strongly implying one or the other.
+#: ../mail/e-mail-reader.c:3026
+#, fuzzy
+#| msgid "Group Items By"
+msgid "Group Reply"
+msgstr "GrupiÅ¡i stavke po"
+
+#: ../mail/e-mail-reader.c:3027
+#, fuzzy
+#| msgid "Compose a reply to the mailing list of the selected message"
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "Sastavi odgovor dopisnoj listi izabrane poruke"
+
+#: ../mail/e-mail-reader.c:3072 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
-#: ../mail/e-mail-reader.c:2637
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:3104
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "SledeÄ?e"
 
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:3108
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:2645
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:3118 ../mail/mail-dialogs.ui.h:19
 msgid "Reply"
 msgstr "Odgovori"
 
+#: ../mail/e-mail-reader.c:3730
+#, fuzzy, c-format
+#| msgid "Folder"
+msgid "Folder '%s'"
+msgstr "Fascikla"
+
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "OznaÄ?i za praÄ?enje"
 
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499
-#: ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:77
+#: ../modules/addressbook/ldap-config.ui.h:9
 msgid "No encryption"
 msgstr "Ne koristi se Å¡ifrovanje"
 
 #. 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:503
-#: ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:136
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "TLS encryption"
 msgstr "TLS Å¡ifrovanje"
 
 #. 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:507
-#: ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "SSL encryption"
 msgstr "SSL Å¡ifrovanje"
 
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s ugovor o licenci"
 
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
 #, c-format
 msgid ""
 "\n"
@@ -10439,21 +10439,20 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881
-#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
 msgctxt "mail-signature"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
@@ -10463,17 +10462,16 @@ msgstr "Pitaj za svaku poruku"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704
-#: ../widgets/misc/e-account-tree-view.c:124
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
 msgctxt "mail-receiving"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
 msgid "Mail Configuration"
 msgstr "PodeÅ¡avanje poÅ¡te"
 
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -10483,34 +10481,41 @@ msgstr ""
 "\n"
 "Kliknite â??Napredâ?? za poÄ?etak. "
 
-#: ../mail/em-account-editor.c:2065
-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 information in email you send."
-msgstr "Unesite dole ime i elektronsku adresu. â??Neobaveznaâ?? polja dole ne moraju biti popunjena, osim ako ne Å¾elite da ove podatke ukljuÄ?ite u poruke koje Å¡aljete."
+#: ../mail/em-account-editor.c:2099
+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 "
+"information in email you send."
+msgstr ""
+"Unesite dole ime i elektronsku adresu. â??Neobaveznaâ?? polja dole ne moraju biti "
+"popunjena, osim ako ne Å¾elite da ove podatke ukljuÄ?ite u poruke koje Å¡aljete."
 
-#: ../mail/em-account-editor.c:2067
-#: ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:98
 msgid "Receiving Email"
 msgstr "Primanje poÅ¡te"
 
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
 msgid "Please configure the following account settings."
 msgstr "Podesite sledeÄ?e postavke naloga."
 
-#: ../mail/em-account-editor.c:2070
-#: ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2740
 msgid "Sending Email"
 msgstr "Slanje poÅ¡te"
 
-#: ../mail/em-account-editor.c:2071
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
-msgstr "Unesite podatke o naÄ?inu na koji Ä?ete slati poÅ¡tu. Ako niste sigurni, pitajte administratora sistema ili prodavca Internet usluga."
+#: ../mail/em-account-editor.c:2105
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"Unesite podatke o naÄ?inu na koji Ä?ete slati poÅ¡tu. Ako niste sigurni, "
+"pitajte administratora sistema ili prodavca Internet usluga."
 
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -10518,11 +10523,11 @@ msgstr ""
 "Unesite dole opisno ime za ovaj nalog.\n"
 "Ovo ime Ä?e biti koriÅ¡Ä?eno samo za prikaz."
 
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
 msgid "Done"
 msgstr "Gotovo"
 
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -10536,54 +10541,48 @@ msgstr ""
 "\n"
 "Kliknite â??Primeniâ?? da saÄ?uvate postavke."
 
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poÅ¡tu svakih"
 
 # bug: plural-forms
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
 msgid "minu_tes"
 msgstr "minu_ta"
 
-#: ../mail/em-account-editor.c:2836
-#: ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2838
+#, fuzzy
+#| msgid "Please select an image for this contact"
+msgid "Please select a folder from the current account."
+msgstr "Izaberite sliku za ovaj kontakt"
+
+#: ../mail/em-account-editor.c:3108 ../mail/mail-config.ui.h:112
 msgid "Security"
 msgstr "Sigurnost"
 
 #. 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:2881
-#: ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3153 ../mail/em-account-editor.c:3221
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/em-account-editor.c:2882
-#: ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3154 ../mail/em-account-editor.c:3222
 msgid "Checking for New Messages"
 msgstr "Proveranje za nove poruke"
 
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "UreÄ?ivaÄ? naloga"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "PomoÄ?nik naloga Evolucije"
-
 #. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1539
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "VaÅ¡a poruka za %s na temu â??%sâ?? na %s je proÄ?itana."
 
 #. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
+#: ../mail/em-composer-utils.c:1587
 #, c-format
-#| msgid "Mail Notification Properties"
 msgid "Delivery Notification for: \"%s\""
 msgstr "ObaveÅ¡tenje o prijemu za: â??%sâ??"
 
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1991
 msgid "an unknown sender"
 msgstr "nepoznati poÅ¡iljalac"
 
@@ -10592,23 +10591,27 @@ msgstr "nepoznati poÅ¡iljalac"
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} ${TimeZone}, ${Sender} piÅ¡e:"
+#: ../mail/em-composer-utils.c:2038
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} piÅ¡e:"
 
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2182
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2372
 msgid "Posting destination"
 msgstr "OdrediÅ¡na poÅ¡ta"
 
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2373
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
 msgid "Select Folder"
 msgstr "Izaberite fasciklu"
 
@@ -10625,10 +10628,18 @@ msgstr "Dodeli boju"
 msgid "Assign Score"
 msgstr "Dodeli rezultat"
 
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Zvono"
 
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "ZavrÅ¡eno za"
@@ -10689,6 +10700,10 @@ msgstr "Sledi"
 msgid "Forward to"
 msgstr "Prosledi za"
 
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "VaÅ¾no"
+
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "je posle"
@@ -10713,8 +10728,7 @@ msgstr "nije podeÅ¡eno"
 msgid "is set"
 msgstr "podeÅ¡eno"
 
-#: ../mail/em-filter-i18n.h:41
-#: ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:66
 msgid "Junk"
 msgstr "Ä?ubre"
 
@@ -10763,13 +10777,11 @@ msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
 msgid "Read"
 msgstr "Ä?itaj"
 
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "Primaoci"
 
@@ -10797,13 +10809,11 @@ msgstr "povratno manje od"
 msgid "Run Program"
 msgstr "Pokreni program"
 
-#: ../mail/em-filter-i18n.h:62
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "Rezultat"
 
-#: ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "PoÅ¡iljalac"
 
@@ -10849,47 +10859,49 @@ msgid "Unset Status"
 msgstr "Nepostavljen status"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
 # bug: no need for plural-forms
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "NeproÄ?itanih poruka:"
 msgstr[1] "NeproÄ?itanih poruka:"
 msgstr[2] "NeproÄ?itanih poruka:"
+msgstr[3] "NeproÄ?itanih poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
 msgstr[1] "Ukupno poruka:"
 msgstr[2] "Ukupno poruka:"
+msgstr[3] "Ukupno poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "IskoriÅ¡Ä?enost kvote (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
 #, c-format
 msgid "Quota usage"
 msgstr "IskoriÅ¡Ä?enost kvote"
 
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
@@ -10897,38 +10909,32 @@ msgstr "Osobine fascikle"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
 msgid "C_reate"
 msgstr "Na_pravi"
 
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
 msgid "Folder _name:"
 msgstr "_Ime fascikle:"
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:151
-#: ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160
-#: ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169
-#: ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056
-#: ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1064 ../mail/mail-vfolder.c:1129
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176
-#: ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:748
-#: ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
 msgid "Loading..."
 msgstr "UÄ?itavanje..."
 
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretraga fascikli u â??%sâ??"
@@ -10955,280 +10961,328 @@ msgstr "Imena fascikli ne mogu da sadrÅ¾e â??/â??"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:1083
+#: ../mail/em-folder-tree.c:1084
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poÅ¡tu"
 
-#: ../mail/em-folder-tree.c:1489
-#: ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
 #, c-format
 msgid "Moving folder %s"
 msgstr "PremeÅ¡tanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:1491
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
 #, c-format
 msgid "Copying folder %s"
 msgstr "UmnoÅ¾avanje fascikle %s"
 
-#: ../mail/em-folder-tree.c:1498
-#: ../mail/message-list.c:2103
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2164
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "PremeÅ¡tanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:1500
-#: ../mail/message-list.c:2105
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2166
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "UmnoÅ¾avanje poruka u fasciklu %s"
 
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nije moguÄ?e ubaciti poruku(e) u ostavu na najviÅ¡em nivou"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
 msgid "Copy Folder To"
 msgstr "UmnoÅ¾i fasciklu u"
 
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
-#, c-format
-msgid "Creating folder `%s'"
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
+#, fuzzy, c-format
+#| msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
 msgstr "Pravljenje fascikle â??%sâ??"
 
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Odjava sa fascikle â??%sâ??"
 
-#: ../mail/em-format-html-display.c:103
-#: ../mail/em-format-html.c:1535
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1576
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../mail/em-format-html-display.c:103
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:90
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka autentiÄ?na."
 
-#: ../mail/em-format-html-display.c:104
-#: ../mail/em-format-html.c:1536
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1577
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../mail/em-format-html-display.c:104
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "Ova poruka je potpisana i ispravna Å¡to znaÄ?i da je poÅ¡iljalac poruke vrlo verovatno autentiÄ?an."
+#: ../mail/em-format-html-display.c:91
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Ova poruka je potpisana i ispravna Å¡to znaÄ?i da je poÅ¡iljalac poruke vrlo "
+"verovatno autentiÄ?an."
 
-#: ../mail/em-format-html-display.c:105
-#: ../mail/em-format-html.c:1537
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1578
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../mail/em-format-html-display.c:105
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
-msgstr "Potpis ove poruke nije mogao biti proveren, moÅ¾da je izmenjena u prenosu."
+#: ../mail/em-format-html-display.c:92
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+"Potpis ove poruke nije mogao biti proveren, moÅ¾da je izmenjena u prenosu."
 
-#: ../mail/em-format-html-display.c:106
-#: ../mail/em-format-html.c:1538
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1579
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali nije moguÄ?a provera poÅ¡iljaoca"
 
-#: ../mail/em-format-html-display.c:106
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
-msgstr "Ova poruka je potpisana ispravnim potpisom, ali poÅ¡iljalac poruke ne moÅ¾e biti proveren."
+#: ../mail/em-format-html-display.c:93
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"Ova poruka je potpisana ispravnim potpisom, ali poÅ¡iljalac poruke ne moÅ¾e "
+"biti proveren."
 
-#: ../mail/em-format-html-display.c:107
-#: ../mail/em-format-html.c:1539
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1580
 msgid "Signature exists, but need public key"
 msgstr "Potpis postoji, ali traÅ¾i javni kljuÄ?"
 
-#: ../mail/em-format-html-display.c:107
-msgid "This message is signed with a signature, but there is no corresponding public key."
+#: ../mail/em-format-html-display.c:94
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
 msgstr "Ova poruka je potpisana, ali nema odgovarajuÄ?eg javnog kljuÄ?a."
 
-#: ../mail/em-format-html-display.c:114
-#: ../mail/em-format-html.c:1545
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1586
 msgid "Unencrypted"
 msgstr "NeÅ¡ifrovano"
 
-#: ../mail/em-format-html-display.c:114
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
-msgstr "Ova poruka nije Å¡ifrovana. Njen sadrÅ¾aj je moguÄ?e videti u prenosu preko Interneta."
+#: ../mail/em-format-html-display.c:101
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
+msgstr ""
+"Ova poruka nije Å¡ifrovana. Njen sadrÅ¾aj je moguÄ?e videti u prenosu preko "
+"Interneta."
 
-#: ../mail/em-format-html-display.c:115
-#: ../mail/em-format-html.c:1546
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1587
 msgid "Encrypted, weak"
 msgstr "Å ifrovano, slabo"
 
-#: ../mail/em-format-html-display.c:115
-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 message in a practical amount of time."
-msgstr "Ova poruka je Å¡ifrovana, ali slabim algoritmom.  TeÅ¡ko je, ali ne i nemoguÄ?e da neko sa strane u dogledno vreme vidi sadrÅ¾aj ove poruke."
+#: ../mail/em-format-html-display.c:102
+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 "
+"message in a practical amount of time."
+msgstr ""
+"Ova poruka je Å¡ifrovana, ali slabim algoritmom.  TeÅ¡ko je, ali ne i nemoguÄ?e "
+"da neko sa strane u dogledno vreme vidi sadrÅ¾aj ove poruke."
 
-#: ../mail/em-format-html-display.c:116
-#: ../mail/em-format-html.c:1547
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1588
 msgid "Encrypted"
 msgstr "Å ifrovano"
 
-#: ../mail/em-format-html-display.c:116
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
-msgstr "Ova poruka je Å¡ifrovana.  TeÅ¡ko Ä?e neko sa strane videti sadrÅ¾aj ove poruke."
+#: ../mail/em-format-html-display.c:103
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
+"Ova poruka je Å¡ifrovana.  TeÅ¡ko Ä?e neko sa strane videti sadrÅ¾aj ove poruke."
 
-#: ../mail/em-format-html-display.c:117
-#: ../mail/em-format-html.c:1548
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1589
 msgid "Encrypted, strong"
 msgstr "Å ifrovano, jako"
 
-#: ../mail/em-format-html-display.c:117
-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 practical amount of time."
-msgstr "Ova poruka je Å¡ifrovana, jakim algoritmom. Veoma je teÅ¡ko da neko sa strane u dogledno vreme vidi sadrÅ¾aj ove poruke."
+#: ../mail/em-format-html-display.c:104
+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 "
+"practical amount of time."
+msgstr ""
+"Ova poruka je Å¡ifrovana, jakim algoritmom. Veoma je teÅ¡ko da neko sa strane "
+"u dogledno vreme vidi sadrÅ¾aj ove poruke."
 
-#: ../mail/em-format-html-display.c:248
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
 msgid "_View Certificate"
 msgstr "Pre_gledaj sertifikat"
 
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat nije Ä?itljiv"
 
-#: ../mail/em-format-html-display.c:509
-msgid "Evolution cannot render this email as it is too large to process. You can view it unformatted or with an external text editor."
-msgstr "Evolucija ne moÅ¾e da iscrta ovo pismo poÅ¡to je preveliko. MoÅ¾ete ga pogledati neformatirano ili pomoÄ?u drugog ureÄ?ivaÄ?a teksta."
+#: ../mail/em-format-html-display.c:497
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolucija ne moÅ¾e da iscrta ovo pismo poÅ¡to je preveliko. MoÅ¾ete ga "
+"pogledati neformatirano ili pomoÄ?u drugog ureÄ?ivaÄ?a teksta."
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
 msgid "Completed on"
 msgstr "ZavrÅ¡eno za"
 
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
 msgid "Overdue:"
 msgstr "PrekoraÄ?eno:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:737
 msgid "by"
 msgstr "od"
 
-#: ../mail/em-format-html-display.c:962
-#: ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:949 ../mail/em-format-html-display.c:996
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:951
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1016
 msgid "O_pen With"
 msgstr "O_tvori pomoÄ?u"
 
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:176
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. strana od %d"
 
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:153
 msgid "Formatting message"
 msgstr "Oblikovanje poruke"
 
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:352
 msgid "Formatting Message..."
 msgstr "Oblikovanje poruke..."
 
-#: ../mail/em-format-html.c:1386
-#: ../mail/em-format-html.c:1395
-#, c-format
-msgid "Retrieving `%s'"
+#: ../mail/em-format-html.c:1421 ../mail/em-format-html.c:1430
+#, fuzzy, c-format
+#| msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
 msgstr "DovlaÄ?enje â??%sâ??"
 
-#: ../mail/em-format-html.c:1854
+#: ../mail/em-format-html.c:1901
 msgid "Unknown external-body part."
 msgstr "Nepoznat spoljni deo poruke."
 
-#: ../mail/em-format-html.c:1862
+#: ../mail/em-format-html.c:1909
 msgid "Malformed external-body part."
 msgstr "LoÅ¡e sloÅ¾en spoljni deo poruke."
 
-#: ../mail/em-format-html.c:1892
+#: ../mail/em-format-html.c:1939
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "PokazivaÄ? na FTP stranicu (%s)"
 
-#: ../mail/em-format-html.c:1903
+#: ../mail/em-format-html.c:1950
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "PokazivaÄ? na lokalnu datoteku (%s) koja odgovara stranici â??%sâ??"
 
-#: ../mail/em-format-html.c:1905
+#: ../mail/em-format-html.c:1952
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "PokazivaÄ? na lokalnu datoteku (%s)"
 
-#: ../mail/em-format-html.c:1926
+#: ../mail/em-format-html.c:1973
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "PokazivaÄ? na mreÅ¾ni podatak (%s)"
 
-#: ../mail/em-format-html.c:1937
+#: ../mail/em-format-html.c:1984
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "PokazivaÄ? na nepoznati spoljni podatak (tipa â??%sâ??)"
 
 #. 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:2628
-#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+#: ../mail/em-format-html.c:2647
+#, fuzzy, c-format
+#| msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgid "This message was sent by %s on behalf of %s"
 msgstr "Poruku Å¡alje <b>%s</b> u ime <b>%s</b>"
 
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
+#, fuzzy, c-format
+#| msgid "No summary available."
+msgid "No HTML stream available"
+msgstr "Nema dostupnog saÅ¾etka."
+
+#: ../mail/em-subscribe-editor.c:677
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ova ostava ne podrÅ¾ava prijave, ili nisu omoguÄ?ene."
 
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
 msgid "Subscribed"
 msgstr "Prijavljeno"
 
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
 msgid "Folder"
 msgstr "Fascikla"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
 msgid "Please select a server."
 msgstr "Izaberite server."
 
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, fuzzy, c-format
+#| msgid "Are you sure you want to open {0} messages at once?"
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "Sigurno Å¾elite da otvorite {0} poruka odjednom?"
+msgstr[1] "Sigurno Å¾elite da otvorite {0} poruka odjednom?"
+msgstr[2] "Sigurno Å¾elite da otvorite {0} poruka odjednom?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+#, fuzzy
+#| msgid "_Do not show this message again."
+msgid "_Do not show this message again"
+msgstr "_Ne prikazuj ponovo ovu poruku."
+
+#: ../mail/em-utils.c:314
 msgid "Message Filters"
 msgstr "Filteri poruka"
 
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -11237,7 +11291,7 @@ msgstr "Poruke od %s"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
@@ -11278,157 +11332,190 @@ msgid "\"Send and Receive Mail\" window width"
 msgstr "Å irina prozora â??Slanje i primanje poÅ¡teâ??"
 
 #: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "Dozvoli Evoluciji da prikaÅ¾e tekstualni deo ograniÄ?ene veliÄ?ine"
-
-#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "Uvek traÅ¾i povratnicu"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Automatic emoticon recognition"
 msgstr "Automatsko prepoznavanje emotikona"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Check incoming mail being junk"
 msgstr "Proveri da li je pristigla poÅ¡ta Ä?ubre"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Composer Window default height"
 msgstr "Podrazumevana visina prozora sastavljaÄ?a"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default width"
 msgstr "Podrazumevana Å¡irina prozora sastavljaÄ?a"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljaÄ?a za uÄ?itavanje/prilaganje"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "SaÅ¾mi prikaz adresa u TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Compress display of addresses in TO/CC/BCC to the number specified in address_count."
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid ""
+"Compress display of addresses in TO/CC/BCC to the number specified in "
+"address_count."
 msgstr "SaÅ¾mi prikaz adresa u TO/CC/BCC na broj odreÄ?en u address_count."
 
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Controls how frequently local changes are synchronized with the remote mail server. The interval must be at least 30 seconds."
-msgstr "KontroliÅ¡e uÄ?estalost usklaÄ?ivanja lokalnih izmena sa mreÅ¾nim serverom poÅ¡te. Interval mora biti najmanje 30 sekundi."
+#: ../mail/evolution-mail.schemas.in.h:22
+msgid ""
+"Controls how frequently local changes are synchronized with the remote mail "
+"server. The interval must be at least 30 seconds."
+msgstr ""
+"KontroliÅ¡e uÄ?estalost usklaÄ?ivanja lokalnih izmena sa mreÅ¾nim serverom poÅ¡te. "
+"Interval mora biti najmanje 30 sekundi."
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid "Custom headers to use while checking for junk."
 msgstr "PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neÅ¾eljene poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:25
-msgid "Custom headers to use while checking for junk. The list elements are string in the format \"headername=value\"."
-msgstr "PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neÅ¾eljene poÅ¡te. Elementi spiska su niz formata â??headername=valueâ??."
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid ""
+"Custom headers to use while checking for junk. The list elements are string "
+"in the format \"headername=value\"."
+msgstr ""
+"PrilagoÄ?ena zaglavlja za upotrebu prilikom provere neÅ¾eljene poÅ¡te. Elementi "
+"spiska su niz formata â??headername=valueâ??."
 
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid "Default charset in which to compose messages"
 msgstr "Podrazumevani skup znakova za sastavljanje poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages."
 msgstr "Podrazumevani skup znakova za sastavljanje poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleÄ?ivanja"
 
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default height of the Composer Window."
 msgstr "Podrazumevana visina prozora sastavljaÄ?a."
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the mail browser window."
 msgstr "Podrazumevana visina prozora pregledaÄ?a poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default height of the subscribe dialog."
 msgstr "Podrazumevana visina prozorÄ?eta za prijavu."
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default maximized state of the mail browser window."
 msgstr "Podrazumevano stanje uveÄ?anog prozora pregledaÄ?a poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raÅ¡irenu raspravu"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default width of the Composer Window."
 msgstr "Podrazumevana Å¡irina prozora sastavljaÄ?a."
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the mail browser window."
 msgstr "Podrazumevana Å¡irina prozora pregledaÄ?a poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Default width of the subscribe dialog."
 msgstr "Podrazumevana Å¡irina prozorÄ?eta za prijavu."
 
-#: ../mail/evolution-mail.schemas.in.h:40
-msgid "Determines whether to look up addresses for junk filtering in local address book only"
-msgstr "UtvrÄ?uje da li da samo u adresaru pregleda adrese u potrazi za neÅ¾eljenom poÅ¡tom"
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid ""
+"Determines whether to look up addresses for junk filtering in local address "
+"book only"
+msgstr ""
+"UtvrÄ?uje da li da samo u adresaru pregleda adrese u potrazi za neÅ¾eljenom "
+"poÅ¡tom"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "UtvrÄ?uje da li da pregleda u adresaru adrese poÅ¡iljaoca"
 
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid ""
+"Determines whether to lookup the sender email in address book. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote address books (like LDAP) are marked for "
+"autocompletion."
+msgstr ""
+"UtvrÄ?uje da li da pretraÅ¾i u adresaru adrese poÅ¡iljaoca. Ukoliko je pronaÄ?e, "
+"ne svrstava je u neÅ¾eljenu poÅ¡tu. TraÅ¾i je u adresarima oznaÄ?enim za "
+"samodopunjavanje. MoÅ¾e biti sporo ako su adresari (recimo LDAP) oznaÄ?eni za "
+"samodopunjavanje."
+
 #: ../mail/evolution-mail.schemas.in.h:42
-msgid "Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion."
-msgstr "UtvrÄ?uje da li da pretraÅ¾i u adresaru adrese poÅ¡iljaoca. Ukoliko je pronaÄ?e, ne svrstava je u neÅ¾eljenu poÅ¡tu. TraÅ¾i je u adresarima oznaÄ?enim za samodopunjavanje. MoÅ¾e biti sporo ako su adresari (recimo LDAP) oznaÄ?eni za samodopunjavanje."
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+"UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neÅ¾eljene "
+"poÅ¡te"
 
 #: ../mail/evolution-mail.schemas.in.h:43
-msgid "Determines whether to use custom headers to check for junk"
-msgstr "UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neÅ¾eljene poÅ¡te"
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neÅ¾eljene "
+"poÅ¡te. Ukoliko je opcija ukljuÄ?ena a zaglavlja navedena, provera Ä?e biti brÅ¾a."
 
 #: ../mail/evolution-mail.schemas.in.h:44
-msgid "Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed."
-msgstr "UtvrÄ?uje da li da koristi prilagoÄ?ena zaglavlja prilikom provere neÅ¾eljene poÅ¡te. Ukoliko je opcija ukljuÄ?ena a zaglavlja navedena, provera Ä?e biti brÅ¾a."
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+"UtvrÄ?uje da li da koristi isti font u poljima â??Å aljeâ?? and â??Naslovâ?? u uspravnom "
+"pregledu kolone â??Porukeâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:45
-msgid "Determines whether to use the same fonts for both \"From\" and \"Subject\" lines in the \"Messages\" column in vertical view."
-msgstr "UtvrÄ?uje da li da koristi isti font u poljima â??Å aljeâ?? and â??Naslovâ?? u uspravnom pregledu kolone â??Porukeâ??."
-
-#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorijum za uÄ?itavanje/prilaganje datoteka u sastavljaÄ?."
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for saving mail component files."
 msgstr "Direktorijum za Ä?uvanje datoteka modula za poÅ¡tu."
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "IskljuÄ?uje ili omoguÄ?ava skraÄ?ivanje naziva fascikli u boÄ?noj povrÅ¡i"
 
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr "PrikaÅ¾i samo tekst poruka koje ne prelaze odreÄ?enu veliÄ?inu"
+
 #: ../mail/evolution-mail.schemas.in.h:49
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaj razdvojnik potpisa"
@@ -11454,8 +11541,12 @@ msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smeÄ?em pri zatvaranju Evolucije."
 
 #: ../mail/evolution-mail.schemas.in.h:55
-msgid "Enable animated images in HTML mail. Many users find animated images annoying and prefer to see a static image instead."
-msgstr "OmoguÄ?ava animirane slike u HTML poÅ¡ti. Mnogim korisnicima smetaju animirane i umesto njih Å¾ele nepokretne slike."
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+"OmoguÄ?ava animirane slike u HTML poÅ¡ti. Mnogim korisnicima smetaju animirane "
+"i umesto njih Å¾ele nepokretne slike."
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -11482,633 +11573,960 @@ msgid "Enable search folders on startup."
 msgstr "OmoguÄ?ava fascikle pretrage pri pokretanju."
 
 #: ../mail/evolution-mail.schemas.in.h:62
-msgid "Enable the side bar search feature to allow interactive searching of folder names."
-msgstr "OmoguÄ?ava pretraÅ¾ivanje iz boÄ?ne trake, Å¡to donosi interaktivnost u pretrazi naziva fascikli."
+msgid ""
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
+msgstr ""
+"OmoguÄ?ava pretraÅ¾ivanje iz boÄ?ne trake, Å¡to donosi interaktivnost u pretrazi "
+"naziva fascikli."
 
 #: ../mail/evolution-mail.schemas.in.h:63
-msgid "Enable this to use Space bar key to scroll in message preview, message list and folders."
-msgstr "UkljuÄ?ite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i spisak poruka i fascikli."
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+"UkljuÄ?ite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
+"spisak poruka i fascikli."
 
-# bug: unclear
 #: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "UkljuÄ?ite da iscrtavate tekstualni deo poruke ograniÄ?ene veliÄ?ine."
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"OmoguÄ?ava prikaz samo teksta poruka koje ne prelaze veliÄ?inu odreÄ?enu kljuÄ?em "
+"â??message_text_part_limitâ??."
 
 #: ../mail/evolution-mail.schemas.in.h:65
-msgid "Enable/disable caret mode"
-msgstr "UkljuÄ?uje/iskljuÄ?uje prikaz kursora"
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:66
-#: ../mail/mail-config.ui.h:45
-msgid "Encode file names in an Outlook/GMail way"
-msgstr "Kodiraj nazive datoteka na Outlook/GMail naÄ?in"
+#, fuzzy
+#| msgid ""
+#| "Enable this to use Space bar key to scroll in message preview, message "
+#| "list and folders."
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr ""
+"UkljuÄ?ite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
+"spisak poruka i fascikli."
 
 #: ../mail/evolution-mail.schemas.in.h:67
-msgid "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 "Kodira nazive datoteka u zaglavljima poÅ¡te kao Å¡to to rade Outlook ili GMail, kako bi ispravno prikazali nazive sa UTF-8 slovima koje Å¡alje Evolucija, poÅ¡to se ne pridrÅ¾avaju RFC 2231, nego koriste neispravan standard RFC 2047."
+msgid "Enable/disable caret mode"
+msgstr "UkljuÄ?uje/iskljuÄ?uje prikaz kursora"
 
-#: ../mail/evolution-mail.schemas.in.h:68
-msgid "Height of the message-list pane"
-msgstr "Visina povrÅ¡i liste poruka"
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
+msgid "Encode file names in an Outlook/GMail way"
+msgstr "Kodiraj nazive datoteka na Outlook/GMail naÄ?in"
 
 #: ../mail/evolution-mail.schemas.in.h:69
-msgid "Height of the message-list pane."
-msgstr "Visina povrÅ¡i liste poruka."
+msgid ""
+"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 ""
+"Kodira nazive datoteka u zaglavljima poÅ¡te kao Å¡to to rade Outlook ili GMail, "
+"kako bi ispravno prikazali nazive sa UTF-8 slovima koje Å¡alje Evolucija, "
+"poÅ¡to se ne pridrÅ¾avaju RFC 2231, nego koriste neispravan standard RFC 2047."
 
 #: ../mail/evolution-mail.schemas.in.h:70
-msgid "Hides the per-folder preview and removes the selection"
-msgstr "Skriva pregled po fasciklama i uklanja izbor"
+msgid "Flush Outbox after filtering"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:71
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
-msgstr "Ukoliko korisnik pokuÅ¡a da otvori 10 ili viÅ¡e poruka odjednom, pita ga da li zaista Å¾eli to da uradi."
+msgid "Group Reply replies to list"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:72
-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 in GNOME's MIME type database may be used for displaying content."
-msgstr "Ukoliko u okviru Evolucije nema ugraÄ?enog pregledaÄ?a za ovaj MIME tip, svi MIME tipovi sa ovog spiska koji su vezani za pregledaÄ? Bonobo delova u Gnomovoj bazi MIME tipova mogu biti koriÅ¡Ä?eni za prikaz sadrÅ¾aja."
+msgid "Height of the message-list pane"
+msgstr "Visina povrÅ¡i liste poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:73
-msgid "Initial height of the \"Filter Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "PoÄ?etna visina prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira ukoliko korisnik produÅ¾i prozor."
+msgid "Height of the message-list pane."
+msgstr "Visina povrÅ¡i liste poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:74
-msgid "Initial height of the \"Search Folder Editor\" window. The value updates as the user resizes the window vertically."
-msgstr "PoÄ?etna visina prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se aÅ¾urira ukoliko korisnik produÅ¾i prozor."
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
 #: ../mail/evolution-mail.schemas.in.h:75
-msgid "Initial height of the \"Send and Receive Mail\" window. The value updates as the user resizes the window vertically."
-msgstr "PoÄ?etna visina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se aÅ¾urira ukoliko korisnik produÅ¾i prozor."
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
+msgstr ""
+"Ukoliko korisnik pokuÅ¡a da otvori 10 ili viÅ¡e poruka odjednom, pita ga da li "
+"zaista Å¾eli to da uradi."
 
 #: ../mail/evolution-mail.schemas.in.h:76
-msgid "Initial maximize state of the \"Filter Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Filter Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "PoÄ?etno stanje uveÄ?anog prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne koristi ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ovaj kljuÄ? samo upotpunjuje postavke."
+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 "
+"in GNOME's MIME type database may be used for displaying content."
+msgstr ""
+"Ukoliko u okviru Evolucije nema ugraÄ?enog pregledaÄ?a za ovaj MIME tip, svi "
+"MIME tipovi sa ovog spiska koji su vezani za pregledaÄ? Bonobo delova u "
+"Gnomovoj bazi MIME tipova mogu biti koriÅ¡Ä?eni za prikaz sadrÅ¾aja."
 
 #: ../mail/evolution-mail.schemas.in.h:77
-msgid "Initial maximize state of the \"Search Folder Editor\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Search Folder Editor\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "PoÄ?etno stanje uveÄ?anog prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se aÅ¾urira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne koristi ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ovaj kljuÄ? samo upotpunjuje postavke."
+msgid "Ignore list Reply-To:"
+msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:78
-msgid "Initial maximize state of the \"Send and Receive Mail\" window. The value updates when the user maximizes or unmaximizes the window. Note, this particular value is not used by Evolution since the \"Send and Receive Mail\" window cannot be maximized. This key exists only as an implementation detail."
-msgstr "PoÄ?etna veliÄ?ina uveÄ?anog prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se aÅ¾urira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne koristi ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ova vrednost samo upotpunjuje postavke."
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+"PoÄ?etna visina prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira ukoliko "
+"korisnik produÅ¾i prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:79
-msgid "Initial width of the \"Filter Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "PoÄ?etna Å¡irina prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira ukoliko korisnik proÅ¡iri prozor."
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"PoÄ?etna visina prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se aÅ¾urira "
+"ukoliko korisnik produÅ¾i prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:80
-msgid "Initial width of the \"Search Folder Editor\" window. The value updates as the user resizes the window horizontally."
-msgstr "PoÄ?etna Å¡irina prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se aÅ¾urira ukoliko korisnik proÅ¡iri prozor."
+msgid ""
+"Initial height of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+"PoÄ?etna visina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se aÅ¾urira ukoliko "
+"korisnik produÅ¾i prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:81
-msgid "Initial width of the \"Send and Receive Mail\" window. The value updates as the user resizes the window horizontally."
-msgstr "PoÄ?etna Å¡irina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se aÅ¾urira ukoliko korisnik proÅ¡iri prozor."
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+"PoÄ?etno stanje uveÄ?anog prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira "
+"ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne koristi "
+"ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ovaj kljuÄ? samo "
+"upotpunjuje postavke."
 
 #: ../mail/evolution-mail.schemas.in.h:82
-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 the search results."
-msgstr "OmoguÄ?ava/onemoguÄ?ava ponavljanje upozorenja da je brisanje poruke iz fascikle pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+"PoÄ?etno stanje uveÄ?anog prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se "
+"aÅ¾urira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne "
+"koristi ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ovaj kljuÄ? samo "
+"upotpunjuje postavke."
 
 #: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "Poslednje vreme praÅ¾njenja Ä?ubreta"
+msgid ""
+"Initial maximize state of the \"Send and Receive Mail\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Send and Receive Mail"
+"\" window cannot be maximized. This key exists only as an implementation "
+"detail."
+msgstr ""
+"PoÄ?etna veliÄ?ina uveÄ?anog prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se "
+"aÅ¾urira ukoliko korisnik uveÄ?a ili umanji prozor. Primetite da Evolucija ne "
+"koristi ovu vrednost poÅ¡to ovaj prozor ne moÅ¾e biti uveÄ?an. Ova vrednost "
+"samo upotpunjuje postavke."
 
 #: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "Poslednje vreme praÅ¾njenja smeÄ?a"
+msgid ""
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
+msgstr ""
+"PoÄ?etna Å¡irina prozora â??UreÄ?ivaÄ?a filteraâ??. Vrednost se aÅ¾urira ukoliko "
+"korisnik proÅ¡iri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:85
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"PoÄ?etna Å¡irina prozora â??UreÄ?ivaÄ?a fascikle pretrageâ??. Vrednost se aÅ¾urira "
+"ukoliko korisnik proÅ¡iri prozor."
+
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid ""
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
+"PoÄ?etna Å¡irina prozora â??Slanje i primanje poÅ¡teâ??. Vrednost se aÅ¾urira ukoliko "
+"korisnik proÅ¡iri prozor."
+
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid ""
+"Instead of the normal \"Reply to All\" behaviour, this option will make the "
+"'Group Reply' toolbar button try to reply only to the mailing list through "
+"which you happened to receive the copy of the message to which you're "
+"replying."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:88
+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 "
+"the search results."
+msgstr ""
+"OmoguÄ?ava/onemoguÄ?ava ponavljanje upozorenja da je brisanje poruke iz fascikle "
+"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+
+#: ../mail/evolution-mail.schemas.in.h:89
+#, fuzzy
+#| 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 the search results."
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"private reply to a message which arrived via a mailing list."
+msgstr ""
+"OmoguÄ?ava/onemoguÄ?ava ponavljanje upozorenja da je brisanje poruke iz fascikle "
+"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid ""
+"It disables/enables the repeated prompts to warn that you are sending a "
+"reply to many people."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:91
+msgid ""
+"It disables/enables the repeated prompts to warn that you are trying sending "
+"a private reply to a message which arrived via a mailing list, but the list "
+"sets a Reply-To: header which redirects your reply back to the list"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:92
+#, fuzzy
+#| msgid "Last time empty junk was run"
+msgid "Last time Empty Junk was run"
+msgstr "Poslednje vreme praÅ¾njenja Ä?ubreta"
+
+#: ../mail/evolution-mail.schemas.in.h:93
+#, fuzzy
+#| msgid "Last time empty trash was run"
+msgid "Last time Empty Trash was run"
+msgstr "Poslednje vreme praÅ¾njenja smeÄ?a"
+
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Layout style"
 msgstr "Stil razmeÅ¡taja"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "Lista MIME tipova radi provere za Bonobo pregledaÄ?ima delova"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "List of accepted licenses"
 msgstr "Spisak prihvaÄ?enih licenci"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "List of accounts"
 msgstr "Spisak naloga"
 
-#: ../mail/evolution-mail.schemas.in.h:91
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
-msgstr "Spisak naloga koje poznaje poÅ¡tanski deo Evolucije. Spisak sadrÅ¾i nizove koje imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Spisak naloga koje poznaje poÅ¡tanski deo Evolucije. Spisak sadrÅ¾i nizove "
+"koje imenuju poddirektorijume u odnosu na /apps/evolution/mail/accounts."
 
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "List of custom headers and whether they are enabled."
 msgstr "Spisak prilagoÄ?enih zaglavlja i da li su ukljuÄ?ena."
 
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "List of dictionary language codes used for spell checking."
 msgstr "Spisak oznaka jezika reÄ?nika koji se koriste za proveru pravopisa."
 
-#: ../mail/evolution-mail.schemas.in.h:94
-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."
-msgstr "Spisak oznaka koje poznaje poÅ¡tanski deo Evolucije. Spisak sadrÅ¾i nizove oblika ime:boja gde boja koristi HTML hex kodiranje."
+#: ../mail/evolution-mail.schemas.in.h:103
+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."
+msgstr ""
+"Spisak oznaka koje poznaje poÅ¡tanski deo Evolucije. Spisak sadrÅ¾i nizove "
+"oblika ime:boja gde boja koristi HTML hex kodiranje."
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "List of protocol names whose license has been accepted."
 msgstr "Spisak imena protokola Ä?ija je licenca prihvaÄ?ena."
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Load images for HTML messages over HTTP"
 msgstr "UÄ?itava slike za HTML poruke preko HTTP-a"
 
-#: ../mail/evolution-mail.schemas.in.h:97
-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 contacts. \"2\" - Always load images off the net."
-msgstr "UÄ?itava slike za HTML poruke preko HTTP(S)-a. MoguÄ?e su vrednosti: â??0â?? - Nikada ne uÄ?itava slike sa mreÅ¾e. â??1â?? - UÄ?itava slike iz poruka ukoliko je poÅ¡iljalac u kontaktima. â??2â?? - Uvek uÄ?itava slike sa mreÅ¾e."
+#: ../mail/evolution-mail.schemas.in.h:106
+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 "
+"contacts. \"2\" - Always load images off the net."
+msgstr ""
+"UÄ?itava slike za HTML poruke preko HTTP(S)-a. MoguÄ?e su vrednosti: â??0â?? - "
+"Nikada ne uÄ?itava slike sa mreÅ¾e. â??1â?? - UÄ?itava slike iz poruka ukoliko je "
+"poÅ¡iljalac u kontaktima. â??2â?? - Uvek uÄ?itava slike sa mreÅ¾e."
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Log filter actions"
 msgstr "BeleÅ¾i radnje filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Log filter actions to the specified log file."
 msgstr "BeleÅ¾i radnje filtera u navedenu datoteku dnevnika."
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleÅ¾enje radnji filtera"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleÅ¾enje radnji filtera."
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Mail browser height"
 msgstr "Visina pregledaÄ?a poÅ¡te"
 
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Mail browser maximized"
 msgstr "UveÄ?an pregledaÄ? poÅ¡te"
 
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Mail browser width"
 msgstr "Å irina pregledaÄ?a poÅ¡te"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Mark as Seen after specified timeout"
 msgstr "OznaÄ?ava kao viÄ?enu posle navedenog roka"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Mark as Seen after specified timeout."
 msgstr "OznaÄ?ava kao viÄ?enu posle navedenog roka."
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Mark citations in the message \"Preview\""
 msgstr "OznaÄ?ava citate u pregledu poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Mark citations in the message \"Preview\"."
 msgstr "OznaÄ?ava citate u pregledu poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:118
+#, fuzzy
+#| msgid "Message Display"
+msgid "Message text limit for display"
+msgstr "Prikaz poruke"
+
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "Stil prikaza poruke (â??normalâ?? za normalan prikaz; â??full headersâ?? za prikaz svih zaglavlja; â??sourceâ?? za izvorni prikaz)"
+msgstr ""
+"Stil prikaza poruke (â??normalâ?? za normalan prikaz; â??full headersâ?? za prikaz "
+"svih zaglavlja; â??sourceâ?? za izvorni prikaz)"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana izmeÄ?u praÅ¾njenja Ä?ubreta na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana izmeÄ?u praÅ¾njenja smeÄ?a na izlazu"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme izmeÄ?u praÅ¾njenja Ä?ubreta na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme izmeÄ?u praÅ¾njenja smeÄ?a na izlazu, u danima."
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u TO/CC/BCC"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt on empty subject"
 msgstr "Pita kada je naslov prazan"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:126
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Pita korisnika kada pokuÅ¡a da isprazni fasciklu."
 
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Pita korisnika kada pokuÅ¡a da poÅ¡alje poruku bez naslova."
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Prompt when deleting messages in search folder"
 msgstr "Upozori kod brisanja poruka iz fascikle pretrage"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:129
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when mailing list hijacks private replies"
+msgstr "Pita pri oznaÄ?avanju viÅ¡e poruka"
+
+#: ../mail/evolution-mail.schemas.in.h:130
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when replying privately to list messages"
+msgstr "Pita pri oznaÄ?avanju viÅ¡e poruka"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when replying to many recipients"
+msgstr "Upozori kada Å¡aljeÅ¡ poruke samo sa navedenim Bcc primaocima"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Prompt when user expunges"
 msgstr "Pita pri praÅ¾njenju"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Prompt when user only fills Bcc"
 msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Pita korisnika kada pokuÅ¡a da otvori 10 ili viÅ¡e poruka odjednom"
 
-#: ../mail/evolution-mail.schemas.in.h:122
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
-msgstr "Pita kada korisnik pokuÅ¡a da poÅ¡alje HTML poruku primaocima koji moÅ¾da ne Å¾ele da primaju HTML poÅ¡tu."
+#: ../mail/evolution-mail.schemas.in.h:135
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
+msgstr ""
+"Pita kada korisnik pokuÅ¡a da poÅ¡alje HTML poruku primaocima koji moÅ¾da ne "
+"Å¾ele da primaju HTML poÅ¡tu."
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Pita korisnika kada pokuÅ¡a da poÅ¡alje poruku bez primalaca."
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Pita kada korisnik pokuÅ¡a da poÅ¡alje neÅ¾eljeni HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:138
 msgid "Prompt while marking multiple messages"
 msgstr "Pita pri oznaÄ?avanju viÅ¡e poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:139
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavi personalizovane potpise povrh odgovora"
 
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "Put the cursor at the bottom of replies"
 msgstr "Postavlja kursor na dno odgovora"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:141
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "Prepoznaje emotikone u tekstu i zamenjuje ih slikama."
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:142
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaje veze u tekstu i zamenjuje ih."
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima Ä?ubreta u dolaznoj poÅ¡ti."
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Save directory"
 msgstr "SaÄ?uvaj direktorijum"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Search for the sender photo in local address books"
 msgstr "TraÅ¾i sliku poÅ¡iljaoca u lokalnim adresarima"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano Å¡alji poÅ¡tu kao HTML"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Send HTML mail by default."
 msgstr "Podrazumevano Å¡alje poÅ¡tu kao HTML."
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Sender email-address column in the message list"
 msgstr "Prikazuje kolonu sa e-adresama  u spisku poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Server synchronization interval"
 msgstr "Interval sinhronizacije sa serverom"
 
-#: ../mail/evolution-mail.schemas.in.h:137
-msgid "Set to TRUE in case you do not want to add signature delimiter before your signature when composing a mail."
-msgstr "Postavite na TRUE u sluÄ?aju da ne Å¾elite dodavanje razdvojnika ispred potpisa pri pisanju. "
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+"Postavite na TRUE u sluÄ?aju da ne Å¾elite dodavanje razdvojnika ispred potpisa "
+"pri pisanju. "
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "PrikaÅ¾i polje â??Bccâ?? pri slanju poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "PrikaÅ¾i polje â??Ccâ?? pri slanju poruke"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "PrikaÅ¾i polje â??Å aljeâ?? pri slanju na dopisnu listu"
 
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr "PrikaÅ¾i polje â??Å aljeâ?? pri slanju poruke"
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "PrikaÅ¾i polje â??Odgovor zaâ?? pri slanju na dopisnu listu"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Prikazuje polje â??Odgovor zaâ?? kada Å¡alje poruku"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "Show Animations"
 msgstr "PrikaÅ¾i animacije"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "Show all message headers"
 msgstr "PrikaÅ¾i sva zaglavlja poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "Show all the headers when viewing a messages."
 msgstr "Prikazuje sva zaglavlja pri pregledu poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show deleted messages in the message-list"
 msgstr "PrikaÅ¾i obrisane poruke u listi poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Show image animations"
 msgstr "Prikazuje animirane slike"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show original \"Date\" header value."
 msgstr "Prikazuje originalnu vrednost â??Datumâ??."
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Show photo of the sender"
 msgstr "Prikatuje sliku poÅ¡iljaoca"
 
-#: ../mail/evolution-mail.schemas.in.h:153
-msgid "Show the \"Bcc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
-
-#: ../mail/evolution-mail.schemas.in.h:154
-msgid "Show the \"Cc\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
+#: ../mail/evolution-mail.schemas.in.h:165
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? "
+"nakon izbora naloga poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:155
-msgid "Show the \"From\" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen."
-msgstr "Prikazuje polje â??Å aljeâ?? pri slanju na dopisnu listu. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga dopisne liste."
+#: ../mail/evolution-mail.schemas.in.h:166
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+"Prikazuje polje â??Bccâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? "
+"nakon izbora naloga poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid "Show the \"From\" field when sending a mail message. This is controlled from the View menu when a mail account is chosen."
-msgstr "Prikazuje polje â??Å aljeâ?? pri slanju poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga poÅ¡te."
+#: ../mail/evolution-mail.schemas.in.h:167
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+"Prikazuje polje â??Å aljeâ?? pri slanju na dopisnu listu. Ovo se postavlja iz menija "
+"â??Pregledâ?? nakon izbora naloga dopisne liste."
 
-#: ../mail/evolution-mail.schemas.in.h:157
-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 "Prikazuje polje â??Odgovor zaâ?? pri slanju na dopisnu listu. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga dopisne liste."
+#: ../mail/evolution-mail.schemas.in.h:168
+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 ""
+"Prikazuje polje â??Odgovor zaâ?? pri slanju na dopisnu listu. Ovo se postavlja iz "
+"menija â??Pregledâ?? nakon izbora naloga dopisne liste."
 
-#: ../mail/evolution-mail.schemas.in.h:158
-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 "Prikazuje polje â??Odgovor zaâ?? pri slanju na poruke. Ovo se postavlja iz menija â??Pregledâ?? nakon izbora naloga naloga poÅ¡te."
+#: ../mail/evolution-mail.schemas.in.h:169
+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 ""
+"Prikazuje polje â??Odgovor zaâ?? pri slanju na poruke. Ovo se postavlja iz menija "
+"â??Pregledâ?? nakon izbora naloga naloga poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:159
-msgid "Show the email-address of the sender in a separate column in the message list."
+#: ../mail/evolution-mail.schemas.in.h:170
+msgid ""
+"Show the email-address of the sender in a separate column in the message "
+"list."
 msgstr "Prikazuje e-adresu poÅ¡iljaoca u posebnoj koloni u spisku poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:160
-msgid "Show the original \"Date\" header (with a local time only if the time zone differs). Otherwise always show \"Date\" header value in a user preferred format and local time zone."
-msgstr "Prikazuje originalno zaglavlje â??Datumâ?? (lokalno vreme se prikazuje samo ako se vremenske zone razlikuju). InaÄ?e uvek prikazuje vrednost zaglavlja â??Datumâ?? prema postavkama i vremenskoj zoni korisnika."
+#: ../mail/evolution-mail.schemas.in.h:171
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+"Prikazuje originalno zaglavlje â??Datumâ?? (lokalno vreme se prikazuje samo ako "
+"se vremenske zone razlikuju). InaÄ?e uvek prikazuje vrednost zaglavlja â??Datumâ?? "
+"prema postavkama i vremenskoj zoni korisnika."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku poÅ¡iljaoca u oknu za Ä?itanje poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:173
+msgid ""
+"Some mailing lists set a Reply-To: header to trick users into sending "
+"replies to the list, even when they ask Evolution to make a private reply. "
+"Setting this option to TRUE will attempt to ignore such Reply-To: headers, "
+"so that Evolution will do as you ask it. If you use the private reply "
+"action, it will reply privately, while if you use the 'Reply to List' action "
+"it will do that. It works by comparing the Reply-To: header with a List-"
+"Post: header, if there is one."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "Spell check inline"
 msgstr "Provera pravopisa unutar"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "Spell checking color"
 msgstr "Boja za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid "Subscribe dialog default width"
 msgstr "Podrazumevana Å¡irina prozora za prijavu"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "OgraniÄ?enje tekstualnog dela poruke"
-
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za Ä?ubre"
 
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:181
+#, fuzzy
+#| msgid "The last time empty junk was run, in days since the epoch."
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Poslednje vreme praÅ¾njenja Ä?ubreta, u danima od poÄ?etka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
+#: ../mail/evolution-mail.schemas.in.h:182
+#, fuzzy
+#| msgid "The last time empty trash was run, in days since the epoch."
+msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Vreme praÅ¾njenja smeÄ?a, u danima od poÄ?etka epohe."
 
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "The layout style determines where to place the preview pane in relation to the message list. \"0\" (Classic View) places the preview pane below the message list. \"1\" (Vertical View) places the preview pane next to the message list."
-msgstr "Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak poruka. â??0â?? (klasiÄ?an pregled) smeÅ¡ta ovu povrÅ¡ ispoda spiska poruka. â??1â?? (vertikalan pregled) smeÅ¡ta povrÅ¡ pored spiska poruka."
+#: ../mail/evolution-mail.schemas.in.h:183
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+"Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak poruka. "
+"â??0â?? (klasiÄ?an pregled) smeÅ¡ta ovu povrÅ¡ ispoda spiska poruka. "
+"â??1â?? (vertikalan pregled) smeÅ¡ta povrÅ¡ pored spiska poruka."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veliÄ?ine za prikaz poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "This can have three possible values. \"0\" for errors. \"1\" for warnings. \"2\" for debug messages."
-msgstr "MoÅ¾e imati tri moguÄ?e vrednosti. â??0â?? za greÅ¡ke. â??1â?? za upozorenja. â??2â?? za poruke o dijagnozi kvara."
+#: ../mail/evolution-mail.schemas.in.h:186
+msgid ""
+"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
+"\"2\" for debug messages."
+msgstr ""
+"MoÅ¾e imati tri moguÄ?e vrednosti. â??0â?? za greÅ¡ke. â??1â?? za upozorenja. â??2â?? za "
+"poruke o dijagnozi kvara."
 
 # bug: s/interms/in terms/ (space)
-#: ../mail/evolution-mail.schemas.in.h:176
-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."
-msgstr "Ovo odreÄ?uje najveÄ?u veliÄ?inu tekstualnog dela koji moÅ¾e biti formatiran u Evoluciji. Podrazumevano je 4MB / 4096 KB i navedeno je kao broj KB."
+#: ../mail/evolution-mail.schemas.in.h:187
+#, fuzzy
+#| 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."
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"Ovo odreÄ?uje najveÄ?u veliÄ?inu tekstualnog dela koji moÅ¾e biti formatiran u "
+"Evoluciji. Podrazumevano je 4MB / 4096 KB i navedeno je kao broj KB."
 
-#: ../mail/evolution-mail.schemas.in.h:177
-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 to the other available plugins."
-msgstr "Ovo je podrazumevani dodatak kuke za Ä?ubre, Ä?ak i ako su ukljuÄ?eni viÅ¡estruki prikljuÄ?ci. Ukoliko je pomenuti podrazumevani prikljuÄ?ak iskljuÄ?en, preostali dostupni prikljuÄ?ci neÄ?e biti aktivirani."
+#: ../mail/evolution-mail.schemas.in.h:188
+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 "
+"to the other available plugins."
+msgstr ""
+"Ovo je podrazumevani dodatak kuke za Ä?ubre, Ä?ak i ako su ukljuÄ?eni viÅ¡estruki "
+"prikljuÄ?ci. Ukoliko je pomenuti podrazumevani prikljuÄ?ak iskljuÄ?en, preostali "
+"dostupni prikljuÄ?ci neÄ?e biti aktivirani."
 
-#: ../mail/evolution-mail.schemas.in.h:178
-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."
-msgstr "Ovak kljuÄ? je proÄ?itan jednom i potom vraÄ?en na â??falseâ?? (netaÄ?no). Ovo uklanja poÅ¡tu sa spiska i pregled za tu fasciklu."
+#: ../mail/evolution-mail.schemas.in.h:189
+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."
+msgstr ""
+"Ovak kljuÄ? je proÄ?itan jednom i potom vraÄ?en na â??falseâ?? (netaÄ?no). Ovo uklanja "
+"poÅ¡tu sa spiska i pregled za tu fasciklu."
 
-#: ../mail/evolution-mail.schemas.in.h:179
-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;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "Ovaj kljuÄ? treba da sadrÅ¾i listu XML struktura za navoÄ?enje prilagoÄ?enih zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header enabled&gt; - omoguÄ?eno za prikazivanje zaglavlja u pregledu poÅ¡te."
+#: ../mail/evolution-mail.schemas.in.h:190
+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;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"Ovaj kljuÄ? treba da sadrÅ¾i listu XML struktura za navoÄ?enje prilagoÄ?enih "
+"zaglavlja i potrebu njihovog prikazivanja. XML struktura je formata &lt;header "
+"enabled&gt; - omoguÄ?eno za prikazivanje zaglavlja u pregledu poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:180
-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 mail sent by known contacts from junk filtering."
-msgstr "Ova opcija se odnosi na kljuÄ? lookup_addressbook i koristi se za odreÄ?ivanje da li da se adresa traÅ¾i samo u lokalnom adresaru kako bi se izdvojila poÅ¡ta primljena od poznatih poÅ¡iljalaca od one neÅ¾eljene."
+#: ../mail/evolution-mail.schemas.in.h:191
+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 "
+"mail sent by known contacts from junk filtering."
+msgstr ""
+"Ova opcija se odnosi na kljuÄ? lookup_addressbook i koristi se za odreÄ?ivanje "
+"da li da se adresa traÅ¾i samo u lokalnom adresaru kako bi se izdvojila poÅ¡ta "
+"primljena od poznatih poÅ¡iljalaca od one neÅ¾eljene."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "This option would help in improving the speed of fetching."
 msgstr "Ova Ä?e opcija pripomoÄ?i brzini pribavljanja poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:182
-msgid "This sets the number of addresses to show in default message list view, beyond which a '...' is shown."
-msgstr "Ovo podeÅ¡ava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, posle Ä?ega je â??...â?? prikazano."
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid ""
+"This sets the number of addresses to show in default message list view, "
+"beyond which a '...' is shown."
+msgstr ""
+"Ovo podeÅ¡ava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
+"posle Ä?ega je â??...â?? prikazano."
 
-#: ../mail/evolution-mail.schemas.in.h:183
-msgid "This setting specifies whether the threads should be in expanded or collapsed state by default. Evolution requires a restart."
-msgstr "Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi podrazumevano biti raÅ¡ireni ili skupljeni. Evolucija zahteva ponovno pokretanje."
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi podrazumevano biti raÅ¡ireni ili "
+"skupljeni. Evolucija zahteva ponovno pokretanje."
 
-#: ../mail/evolution-mail.schemas.in.h:184
-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 restart."
-msgstr "Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi biti razvrstani po poslednjoj poruci jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
+#: ../mail/evolution-mail.schemas.in.h:195
+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 "
+"restart."
+msgstr ""
+"Ovo podeÅ¡avanje odreÄ?uje da li Ä?e nizovi biti razvrstani po poslednjoj poruci "
+"jednog niza, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Thread the message-list based on Subject"
 msgstr "PrikaÅ¾i poruke prema naslovu rasprave"
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Timeout for marking message as seen"
 msgstr "Vreme za oznaÄ?avanje poruke kao viÄ?ene"
 
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Timeout for marking message as seen."
 msgstr "Vreme za oznaÄ?avanje poruke kao viÄ?ene."
 
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr "Boja za podvlaÄ?enje pravopisnih greÅ¡ki prilikom provere pravopisa."
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Use custom fonts"
 msgstr "Koristi sopstvene fontove"
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagoÄ?ene fontove za prikaz poÅ¡te."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid "Use only local spam tests."
 msgstr "Koristi samo lokalne provere spama."
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
-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 "Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo kursor da bude kada se odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno poruke."
+#: ../mail/evolution-mail.schemas.in.h:207
+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 ""
+"Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo kursor da bude kada se "
+"odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno "
+"poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:197
-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 "Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo potpis da bude kada se odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno poruke."
+#: ../mail/evolution-mail.schemas.in.h:208
+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 ""
+"Korisnicima se miÅ¡ljenje razlikuje gde bi trebalo potpis da bude kada se "
+"odgovara na poruku. Ovo utvrÄ?uje da li Ä?e biti postavljen na vrh ili na dno "
+"poruke."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:209
 msgid "Variable width font"
 msgstr "Font promenljive veliÄ?ine"
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:210
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Da li se povratnica podrazumevano dodaje svakoj poruci."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:211
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "Da li da onemoguÄ?i opciju skraÄ?ivanja naziva fascikli u boÄ?noj traci."
 
-#: ../mail/evolution-mail.schemas.in.h:201
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
-msgstr "Da li pokuÅ¡ati prikaz rasprave po naslovu kada poruke ne sadrÅ¾e zaglavlja In-Reply-To ili References."
+#: ../mail/evolution-mail.schemas.in.h:212
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
+msgstr ""
+"Da li pokuÅ¡ati prikaz rasprave po naslovu kada poruke ne sadrÅ¾e zaglavlja In-"
+"Reply-To ili References."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:213
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Da li se poruke niÅ¾u na osnovu poslednje poruke u raspravi"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:214
+msgid ""
+"Whether to flush Outbox after filtering is done. Outbox flush will happen "
+"only when there was used any 'Forward to' filter action and approximately "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:215
 msgid "Width of the message-list pane"
 msgstr "Å irina povrÅ¡i spiska poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:216
 msgid "Width of the message-list pane."
 msgstr "Å irina povrÅ¡i spiska poruka."
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
 msgid "Importing Elm data"
 msgstr "UvoÅ¾enje Elm podataka"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:374
-#: ../modules/mail/e-mail-shell-view.c:952
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
+#: ../modules/mail/e-mail-shell-view.c:951
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
 msgid "Mail"
 msgstr "PoÅ¡ta"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
 msgid "Evolution Elm importer"
 msgstr "Evolucija Elm uvoznik"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
 msgid "Import mail from Elm."
 msgstr "VaÅ¾na poÅ¡ta iz programa Elm."
 
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+#, fuzzy
+#| msgid "Destination folder:"
+msgid "_Destination folder:"
 msgstr "OdrediÅ¡na fascikla:"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:243
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#, fuzzy
+#| msgid "Subject"
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "Naslov"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#, fuzzy
+#| msgid "From"
+msgctxt "mboxImp"
+msgid "From"
+msgstr "Å alje"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poÅ¡tansko sanduÄ?e (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poÅ¡tanskog sanduÄ?eta"
 
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
 msgid "Importing mailbox"
 msgstr "UvoÅ¾enje poÅ¡tanskog sanduÄ?eta"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
+#, fuzzy, c-format
+#| msgid "Importing `%s'"
+msgid "Importing '%s'"
 msgstr "UvoÅ¾enje â??%sâ??"
 
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretraga %s"
@@ -12117,469 +12535,564 @@ msgstr "Pretraga %s"
 msgid "Importing Pine data"
 msgstr "UvoÅ¾enje Pine podataka"
 
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
 msgid "Evolution Pine importer"
 msgstr "Evolucija Pine uvoznik"
 
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
 msgid "Import mail from Pine."
 msgstr "Uvozi poÅ¡tu iz programa Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "PoÅ¡ta za %s"
 
-#: ../mail/mail-autofilter.c:236
-#: ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
 #, c-format
 msgid "Mail from %s"
 msgstr "PoÅ¡ta od %s"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(Napomena: zahteva ponovno pokretanje programa)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
 #: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Opcija za prikaz prve poruke</b> (ne preporuÄ?uje se)"
+msgid "(Not Recommended)"
+msgstr ""
 
 #: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(Napomena: zahteva ponovno pokretanje programa)"
+
+#: ../mail/mail-config.ui.h:4
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Uvek potpiÅ¡i odlazeÄ?e poruke sa ovog naloga"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "_TakoÄ?e Å¡ifruj na sebe pri slanju Å¡ifrovane poÅ¡te"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek poÅ¡alji _kopiju (cc):"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek poÅ¡alji _nevidljivu kopiju (Bcc):"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj kljuÄ?evima mog priveska pri Å¡ifrovanju"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Uv_ek Å¡ifruj i meni pri slanju Å¡ifrovane poÅ¡te"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Always request rea_d receipt"
 msgstr "Uvek traÅ¾i povratnicu"
 
 #: ../mail/mail-config.ui.h:14
-#: ../modules/addressbook/addressbook-config.c:993
+msgid "Apply the same _view settings to all folders"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
 msgid "Authentication"
 msgstr "Autentifikacija"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Automatically insert _emoticon images"
 msgstr "Uvek umetni slike _emotikona"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Ch_eck for Supported Types"
 msgstr "_Proveri podrÅ¾ane tipove"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li Ä?ubreta u _prilagoÄ?enim zaglavljima"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li Ä?ubreta u _pristigloj poÅ¡ti"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu Ä?ubre"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Cle_ar"
 msgstr "OÄ?i_sti"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgid "Clea_r"
 msgstr "OÄ?is_ti"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogreÅ¡no napisane reÄ?i:"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../mail/mail-config.ui.h:26
-#: ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
 msgid "Configuration"
 msgstr "PodeÅ¡avanje"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniÅ¡ fasciklu"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "Default Behavior"
 msgstr "Podrazumevano ponaÅ¡anje"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
 msgid "Delete Mail"
 msgstr "ObriÅ¡i poÅ¡tu"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Delete junk messages on e_xit"
 msgstr "ObriÅ¡i Ä?ubre pri i_zlazu"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitalno potpiÅ¡i od_lazne poruke (podrazumevano)"
 
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:39
+#, fuzzy
+#| msgid "Displayed Message _Headers"
+msgid "Displayed Message Headers"
 msgstr "Prikazana _zaglavlja poruka"
 
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+#| msgid "Do not format messages when text si_ze exceeds"
+msgid "Do not display messages when text si_ze exceeds"
 msgstr "Ne formatiraj poruke kada veliÄ?i_na preÄ?e"
 
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ne oznaÄ?ava_j poruke kao Ä?ubre ako je poÅ¡iljalac u mom adresaru"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Do not quote"
 msgstr "Ne citiraj"
 
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
 msgid "Drafts _Folder:"
 msgstr "_Fascikla Nacrti:"
 
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni fascikle sa _smeÄ?em na izlazu"
 
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
 msgid "Enable Magic S_pacebar"
 msgstr "OmoguÄ?ava MagiÄ?nu razmak_nicu"
 
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
 msgid "Enable Sea_rch Folders"
 msgstr "UkljuÄ?i fascikle pret_rage"
 
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za Å¡i_frovanje:"
 
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
 msgid "Encrypt out_going messages (by default)"
 msgstr "_Å ifruj odlazeÄ?e poruke (podrazumevano)"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
 msgid "Fi_xed-width:"
 msgstr "UtvrÄ?ene-Å¡irine:"
 
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
 msgid "Fix_ed width Font:"
 msgstr "Font nep_romenjive Å¡irine:"
 
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
 msgid "Font Properties"
 msgstr "Osobine fonta"
 
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
 msgid "Format messages in _HTML"
 msgstr "Oblikuj poruke u H_TML"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
 msgid "Full Nam_e:"
 msgstr "Ime i prezime:"
 
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
+msgid "Group Reply goes only to mailing list, if possible"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:58
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:59
 msgid "H_TTP Proxy:"
 msgstr "H_TTP posrednik:"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:60
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:61
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:63
+msgid "Ignore Reply-To: for mailing lists"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:64
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Outlook stil)"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:67
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.ui.h:63
-#: ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:68 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:69
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:70
 msgid "Loading Images"
 msgstr "UÄ?itavanje slika"
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:71
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja poÅ¡te"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:72
 msgid "Mailbox location"
 msgstr "Lokacija poÅ¡tanskog sanduÄ?eta"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Message Fonts"
 msgstr "Fontovi poruke"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
-#: ../mail/mail-config.ui.h:73
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+#: ../mail/mail-config.ui.h:78
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "Napomena: neÄ?ete biti upitani za lozinku dok se ne poveÅ¾ete prvi put"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Opcija se zanemaruje ukoliko je pronaÄ?eno poklapanje sa prilagoÄ?enim zaglavljem za Ä?ubretom."
+msgstr ""
+"Opcija se zanemaruje ukoliko je pronaÄ?eno poklapanje sa prilagoÄ?enim "
+"zaglavljem za Ä?ubretom."
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:83
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG IB _kljuÄ?a:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Pass_word:"
 msgstr "_Lozinka:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Port:"
 msgstr "Port:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada Å¡aljeÅ¡ poruke samo sa navedenim Bcc primaocima"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "PriliÄ?no dobra privatnost (PGP/GPG)"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Printed Fonts"
 msgstr "Fontovi za Å¡tampu"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
+msgid "Prompt when mailing list redirects private reply back to list"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:92
+#, fuzzy
+#| msgid "Prompt while marking multiple messages"
+msgid "Prompt when sending private replies to mailing _list messages"
+msgstr "Pita pri oznaÄ?avanju viÅ¡e poruka"
+
+#: ../mail/mail-config.ui.h:93
+#, fuzzy
+#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+msgid "Prompt when sending replies to _many recipients"
+msgstr "Upozori kada Å¡aljeÅ¡ poruke samo sa navedenim Bcc primaocima"
+
+#: ../mail/mail-config.ui.h:94
 msgid "Proxy Settings"
 msgstr "Postavke mreÅ¾nog posrednika"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:100
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
+msgid "SHA1"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:102
+msgid "SHA256"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:103
+msgid "SHA384"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:104
+msgid "SHA512"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:106
 msgid "SSL is not supported in this build of Evolution"
 msgstr "SSL nije podrÅ¾an u ovom izdanju Evolucije"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:107
 msgid "S_earch for sender photograph only in local address books"
 msgstr "Tr_aÅ¾i fotografiju poÅ¡iljaoca samo u lokalnim adresarima"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:108
 msgid "S_elect..."
 msgstr "Izab_eri..."
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:109
 msgid "S_end message receipts:"
 msgstr "_PoÅ¡alji povratnice:"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:110
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:111
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:113
 msgid "Select Drafts Folder"
 msgstr "Odabira fasciklu Priprema"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:114
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font fiksirane veliÄ?ine"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:115
 msgid "Select HTML fixed width font for printing"
 msgstr "Izaberite HTML font fiksirane veliÄ?ine za Å¡tampu"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:116
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veliÄ?ine"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:117
 msgid "Select HTML variable width font for printing"
 msgstr "Izaberite HTML font promenljive veliÄ?ine za Å¡tampu"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:118
+#, fuzzy
+#| msgid "Select Folder"
+msgid "Select Junk Folder"
+msgstr "Izaberite fasciklu"
+
+#: ../mail/mail-config.ui.h:119
 msgid "Select Sent Folder"
 msgstr "Odabira fasciklu Poslato"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:120
+#, fuzzy
+#| msgid "Select Drafts Folder"
+msgid "Select Trash Folder"
+msgstr "Odabira fasciklu Priprema"
+
+#: ../mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Fotografija poÅ¡iljaoca"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:122
 msgid "Sending Mail"
 msgstr "Slanje poÅ¡te"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:123
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:124
 msgid "Sent and Draft Messages"
 msgstr "Poslate poruke i nacrti"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:125
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traÅ¾i autentifikaciju"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:126
 msgid "Server Configuration"
 msgstr "PodeÅ¡avanje servera"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:127
 msgid "Server _Type:"
 msgstr "_Tip servera: "
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:128
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Si_gning algorithm:"
+msgstr "Sertifikat za _potpisivanje:"
+
+#: ../mail/mail-config.ui.h:129
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "Sig_ning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:132
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:133
+#, fuzzy
+#| msgid "Sig_ning certificate:"
+msgid "Signing _algorithm:"
+msgstr "Sertifikat za _potpisivanje:"
+
+#: ../mail/mail-config.ui.h:134
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:135
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru zapoÄ?ni _kucanje na dnu"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:137
 msgid "T_ype:"
 msgstr "T_ip:"
 
-#: ../mail/mail-config.ui.h:122
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
-msgstr "Lista jezika ovde oslikava samo one jezike za koje imate instaliran reÄ?nik."
+#: ../mail/mail-config.ui.h:138
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Lista jezika ovde oslikava samo one jezike za koje imate instaliran reÄ?nik."
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:139
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -12589,7 +13102,14 @@ msgstr ""
 "potpis. Ime koje ste dali Ä?e biti koriÅ¡Ä?eno\n"
 "samo za prikazivanje na ekranu. "
 
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:143
+#, fuzzy
+#| msgid "Posting destination"
+msgid "Top Posting Option"
+msgstr "OdrediÅ¡na poÅ¡ta"
+
+#: ../mail/mail-config.ui.h:144
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -12597,188 +13117,201 @@ msgstr ""
 "Ukucajte ime po kome Å¾elite da nazovete ovaj nalog.\n"
 "Na primer: â??Poslovniâ?? ili â??LiÄ?niâ??"
 
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:146
 msgid "Us_ername:"
 msgstr "KorisniÄ?ko_ime:"
 
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:147
 msgid "Use Authe_ntication"
 msgstr "Koristi aute_ntifikaciju"
 
-#: ../mail/mail-config.ui.h:130
-#: ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:148 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
 msgid "User_name:"
 msgstr "KorisniÄ?ko_ime:"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:149
 msgid "V_ariable-width:"
 msgstr "Pro_menljiva veliÄ?ina:"
 
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:150
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:151
 msgid "_Always load images from the Internet"
 msgstr "_Uvek uÄ?itavaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:152
 msgid "_Authentication Type"
 msgstr "Tip _autentifikacije"
 
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:153
 msgid "_Default junk plugin:"
 msgstr "_Podrazumevani prikljuÄ?ak za Ä?ubre:"
 
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:154
 msgid "_Direct connection to the Internet"
 msgstr "_Direktna veza sa Internetom"
 
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:155
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
 
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:156
 msgid "_Forward style:"
 msgstr "Stil _prosleÄ?ivanja:"
 
-#: ../mail/mail-config.ui.h:139
+# bug: requires a comment on usage
+#: ../mail/mail-config.ui.h:157
+#, fuzzy
+#| msgid "Current Folder"
+msgid "_Junk Folder:"
+msgstr "tekuÄ?oj fascikli"
+
+#: ../mail/mail-config.ui.h:158
 msgid "_Keep Signature above the original message on replying"
 msgstr "_ZadrÅ¾i potpis iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:159
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:160
 msgid "_Load images in messages from contacts"
 msgstr "_UÄ?itaj slike od kontakata u poruku"
 
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:161
 msgid "_Lookup in local address book only"
 msgstr "_PotraÅ¾i samo u lokalnom adresaru"
 
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:162
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:163
 msgid "_Manual proxy configuration:"
 msgstr "_RuÄ?no podeÅ¡avanje posrednika:"
 
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:164
 msgid "_Mark messages as read after"
 msgstr "_OznaÄ?i poruke kao proÄ?itane posle"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:166
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne uÄ?itavaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:167
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:168
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML poÅ¡te kontaktima koji ih ne Å¾ele"
 
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:169
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada Å¡aljeÅ¡ poruke bez naslova"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:170
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:171
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:172
 msgid "_Secure HTTP Proxy:"
 msgstr "_Bezbedan HTTP posrednik:"
 
-#: ../mail/mail-config.ui.h:155
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:174 ../modules/addressbook/ldap-config.ui.h:29
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "S_erver:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:176
 msgid "_Show image animations"
 msgstr "PrikaÅ¾i _animacije"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:177
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_PrikaÅ¾i fotografiju poÅ¡iljaoca u pregledu poÅ¡te"
 
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:179
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "_SaÅ¾mi zaglavlja To / Cc / Bcc u "
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:180
+#, fuzzy
+#| msgid "Drafts _Folder:"
+msgid "_Trash Folder:"
+msgstr "_Fascikla Nacrti:"
+
+#: ../mail/mail-config.ui.h:181
 msgid "_Use Secure Connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:182
 msgid "_Use system defaults"
 msgstr "_Koristi sistemske postavke"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:183
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:163
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:184 ../smime/gui/smime-ui.ui.h:47
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:186
 msgid "addresses"
 msgstr "Adrese"
 
-#: ../mail/mail-config.ui.h:165
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:187 ../smime/gui/smime-ui.ui.h:48
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:188
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:189
 msgid "description"
 msgstr "opis"
 
 #: ../mail/mail-dialogs.ui.h:1
-msgid "    "
-msgstr "    "
-
-#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "Sve aktivne mreÅ¾ne fascikle"
 
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
 msgstr "Sve lokale i aktivne mreÅ¾ne fascikle"
 
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
 msgstr "Sve lokalne fascikle"
 
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
 msgid "Call"
 msgstr "Poziv"
 
 # timezone.
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
 msgid "Co_mpleted"
 msgstr "Za_vrÅ¡eno"
 
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+#| msgid "collapse"
+msgid "Collapse _all"
+msgstr "skuplja"
+
 #: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digitalni potpis"
@@ -12788,58 +13321,68 @@ msgid "Do Not Forward"
 msgstr "Ne prosleÄ?uj"
 
 #: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+#| msgid "E_xpand All Threads"
+msgid "E_xpand all"
+msgstr "Razgranaj sve ra_sprave"
+
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Encryption"
 msgstr "Å ifriranje"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "For Your Information"
 msgstr "Za VaÅ¡u informaciju"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
 msgid "License Agreement"
 msgstr "Ugovor o licenci"
 
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Review"
 msgstr "ProÄ?itati"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "S_erver:"
 msgstr "S_erver:"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Security Information"
 msgstr "Sigurnosni podaci"
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
 msgid "Specific folders"
 msgstr "OdreÄ?ene fascikle"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -12847,191 +13390,191 @@ msgstr ""
 "Poruke koje ste izabrali za praÄ?enje su dole izlistane.\n"
 "Izaberite radnju za izvrÅ¡avanje iz menija â??Oznakaâ??."
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Due By:"
 msgstr "_Rok:"
 
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_naÄ?ite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
 
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
 msgid "Fetching Mail"
 msgstr "Uzimanje poÅ¡te"
 
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlazeÄ?ih filtera: %s"
 
-#: ../mail/mail-ops.c:597
-#: ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to append to %s: %s\n"
+#| "Appending to local `Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
 msgstr ""
 "Neuspelo dopunjavanje u %s: %s\n"
 "Dopunjavanje u lokalnu fasciklu â??Poslatoâ??."
 
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:654
+#, fuzzy, c-format
+#| msgid "Failed to append to local `Sent' folder: %s"
+msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Neuspelo dopunjavanje u lokalnu fasciklu â??Poslatoâ??: %s"
 
-#: ../mail/mail-ops.c:752
-#: ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Slanje poruke %d od %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neuspelo slanje %d od %d poruka"
 
-#: ../mail/mail-ops.c:791
-#: ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../mail/mail-ops.c:793
-#: ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
 msgid "Complete."
 msgstr "ZavrÅ¡eno."
 
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Ä?uvanje poruke u fasciklu â??%sâ??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "PremeÅ¡tanje poruka u â??%sâ??"
 
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "UmnoÅ¾avanje poruka u â??%sâ??"
 
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Pretraga fascikli u â??%sâ??"
 
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
 msgid "Forwarded messages"
 msgstr "ProsleÄ?ene poruke"
 
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Otvaranje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
 #, c-format
 msgid "Retrieving quota information for folder '%s'"
 msgstr "Dobijanje podataka o kvoti za fasciklu â??%sâ??"
 
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
 #, c-format
 msgid "Opening store '%s'"
 msgstr "Otvaranje ostave â??%sâ??"
 
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjanje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "SmeÅ¡tanje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "PraÅ¾njenje i smeÅ¡tanje naloga â??%sâ??"
 
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
 #, c-format
 msgid "Storing account '%s'"
 msgstr "SmeÅ¡tanje naloga â??%sâ??"
 
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "OsveÅ¾avanje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "PraÅ¾njenje fascikle â??%sâ??"
 
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacivanje smeÄ?a u â??%sâ??"
 
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
 
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "DovlaÄ?enje %d poruke"
 msgstr[1] "DovlaÄ?enje %d poruke"
 msgstr[2] "DovlaÄ?enje %d poruka"
+msgstr[3] "DovlaÄ?enje %d poruke"
 
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Ä?uvanje %d poruke"
 msgstr[1] "Ä?uvanje %d poruke"
 msgstr[2] "Ä?uvanje %d poruka"
+msgstr[3] "Ä?uvanje %d poruke"
 
-#: ../mail/mail-ops.c:2136
+#: ../mail/mail-ops.c:2192
 #, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
+#| msgid ""
+#| "Error saving messages to: %s:\n"
+#| " %s"
+msgid "Error saving messages to: %s:\n"
 msgstr ""
 "GreÅ¡ka pri Ä?uvanju poruke u: %s:\n"
-" %s"
 
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
 msgid "Saving attachment"
 msgstr "Ä?uvanje priloga"
 
-#: ../mail/mail-ops.c:2226
-#: ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13040,390 +13583,464 @@ msgstr ""
 "Nije moguÄ?e pravljenje izlazne datoteke: %s:\n"
 " %s"
 
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
-msgstr "Nije moguÄ? upis podataka: %s"
+#: ../mail/mail-ops.c:2310
+#| msgid "Could not write data: %s"
+msgid "Could not write data: "
+msgstr "Nije moguÄ? upis podataka: "
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekidanje veze sa â??%sâ??"
 
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezivanje na â??%sâ??"
 
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Priprema nalog â??%sâ?? za rad van mreÅ¾e"
 
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
 msgid "Checking Service"
 msgstr "Provera servisa"
 
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
 msgid "Canceling..."
 msgstr "Otkazivanje..."
 
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje poÅ¡te"
 
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
 msgid "Cancel _All"
 msgstr "OtkaÅ¾i _sve"
 
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
 msgid "Updating..."
 msgstr "AÅ¾uriranje..."
 
-#: ../mail/mail-send-recv.c:553
-#: ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
 msgid "Waiting..."
 msgstr "Ä?ekanje..."
 
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
 #, c-format
 msgid "Checking for new mail"
 msgstr "Provera za nove poruke"
 
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
 msgid "User canceled operation."
 msgstr "Korisnik je otkazao operaciju."
 
-#: ../mail/mail-session.c:663
-msgid "No destination address provided, forward of the message has been cancelled."
+#: ../mail/mail-session.c:724
+#, c-format
+msgid ""
+"No destination address provided, forward of the message has been cancelled."
 msgstr "Nije dostavljena odrediÅ¡na adresa, prosleÄ?ivanje poruke je otkazano."
 
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:733
+#, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "Nije pronaÄ?en nalog za koriÅ¡Ä?enje, prosleÄ?ivanje poruke je otkazano."
 
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:128
+#, fuzzy, c-format
+#| msgid "Could not create spool directory `%s': %s"
+msgid "Could not create spool directory '%s': %s"
 msgstr "Nije moguÄ?e pravljenje direktorijuma za pripremu â??%sâ??: %s"
 
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:161
+#, fuzzy, c-format
+#| msgid "Trying to movemail a non-mbox source `%s'"
+msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "PokuÅ¡ava premeÅ¡tanje poÅ¡te iz ne-mbox izvora â??%sâ??"
 
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ProsleÄ?ena poruka - %s"
 
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
 msgid "Forwarded message"
 msgstr "ProsleÄ?ena poruka"
 
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:318
+#, fuzzy, c-format
+#| msgid "Invalid folder: `%s'"
+msgid "Invalid folder: '%s'"
 msgstr "Neispravna fascikla â??%sâ??"
 
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "PodeÅ¡avanje fascikle pretrage: %s"
 
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "AÅ¾uriranje fascikla pretrage za â??%s: %sâ??"
 
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "AÅ¾uriranje fascikla pretrage za â??%sâ??"
 
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../mail/mail-vfolder.c:1182
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1287
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
 #: ../mail/mail.error.xml.h:1
+#, fuzzy
+#| msgid "Check Junk Failed"
+msgid "\"Check Junk\" Failed"
+msgstr "Provera neÅ¾eljene poÅ¡te nije uspela"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+#| msgid "Report Junk Failed"
+msgid "\"Report Junk\" Failed"
+msgstr "IzveÅ¡tavanje za Ä?ubre nije uspelo"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+#| msgid "Report Not Junk Failed"
+msgid "\"Report Not Junk\" Failed"
+msgstr "IzveÅ¡tavanje da nije Ä?ubre neuspelo"
+
+#: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Fascikla imena â??{0}â?? veÄ? postoji. Dodelite drugi naziv."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Fascikla imena â??{1}â?? veÄ? postoji. Dodelite drugi naziv."
 
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit."
 msgstr ""
 "Fascikla sa sadrÅ¾ajem na â??{1}â?? veÄ? postoji.\n"
 "\n"
-"MoÅ¾ete ili da ignoriÅ¡ete ovu fasciklu, prepiÅ¡ete je ili dopunite njen sadrÅ¾aj, ili izaÄ?ete."
+"MoÅ¾ete ili da ignoriÅ¡ete ovu fasciklu, prepiÅ¡ete je ili dopunite njen "
+"sadrÅ¾aj, ili izaÄ?ete."
 
-#: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for \"{1}\". Send the receipt notification to {0}?"
+#: ../mail/mail.error.xml.h:9
+msgid ""
+"A read receipt notification has been requested for \"{1}\". Send the receipt "
+"notification to {0}?"
 msgstr "Povratnica je zatraÅ¾ena za â??{1}â??. Poslati povratnicu za {0}?"
 
 # mail:vfolder-notunique secondary
-#: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name \"{0}\". Please specify a different name."
+#: ../mail/mail.error.xml.h:10
+msgid ""
+"A signature already exists with the name \"{0}\". Please specify a different "
+"name."
 msgstr "Potpis nazvan â??{0}â?? veÄ? postoji. Navedite drugo ime."
 
-#: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
-msgstr "Dodavanjem smislenog naslova porukama daÄ?ete primaocima do znanja o Ä?emu piÅ¡ete."
+#: ../mail/mail.error.xml.h:11
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
+msgstr ""
+"Dodavanjem smislenog naslova porukama daÄ?ete primaocima do znanja o Ä?emu "
+"piÅ¡ete."
 
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovaj nalog i sve pripadajuÄ?e elemente?"
 
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno Å¾elite da obriÅ¡ete ovaj nalog?"
 
-#: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+#: ../mail/mail.error.xml.h:14
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Sigurno Å¾elite da iskljuÄ?ite ovaj nalog i obriÅ¡ete sve posrednike?"
 
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "Sigurno Å¾elite da otvorite {0} poruka odjednom?"
-
-#: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
-msgstr "Sigurno Å¾elite trajno da uklonite sve obrisane poruke iz svih fascikli?"
+#: ../mail/mail.error.xml.h:15
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Sigurno Å¾elite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
-#: ../mail/mail.error.xml.h:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder \"{0}\"?"
+#: ../mail/mail.error.xml.h:16
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in "
+"folder \"{0}\"?"
 msgstr "Å½elite li trajno da uklonite sve obrisane poruke iz fascikle â??{0}â???"
 
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete poruku u HTML obliku?"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete poruku sa neispravnom adresom?"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete poruku sa neispravnim adresama?"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete poruku samo sa BCC primaocima?"
 
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Sigurno Å¾elite da poÅ¡aljete poruku bez naslova?"
 
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "Zbog â??{0}â??."
-
 #: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "Zbog â??{2}â??."
-
-#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "Prazan potpis"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Nije moguÄ?e dodavati fasciklu pretrage â??{0}â??."
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nije moguÄ?e umnoÅ¾iti fasciklu â??{0}â?? u â??{1}â??."
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
 msgstr "Nije moguÄ?e napraviti fasciklu â??{0}â??."
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
 msgstr "Nije moguÄ?e pravljenje privremenog direktorijuma za Ä?uvanje."
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Nije moguÄ?e napraviti direktorijum za Ä?uvanje, zbog â??{1}â??"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Nije moguÄ?e obrisati fasciklu â??{0}â??."
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nije moguÄ?e obrisati sistemsku fasciklu â??{0}â??."
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Nije moguÄ?e urediti fasciklu pretrage â??{0}â?? poÅ¡to ne postoji."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nije moguÄ?e premestiti fasciklu â??{0}â?? u â??{1}â??."
 
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+#| msgid "Cannot open source \"{1}\""
+msgid "Cannot open source \"{1}\"."
 msgstr "Nije moguÄ?e otvoriti izvor â??{1}â??"
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
 msgstr "Nije moguÄ?e otvoriti izvor â??{2}â??."
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
 msgstr "Nije moguÄ?e otvoriti cilj â??{2}â??."
 
-#: ../mail/mail.error.xml.h:36
-msgid "Cannot read the license file \"{0}\", due to an installation problem. You will not be able to use this provider until you can accept its license."
-msgstr "Nije moguÄ?e proÄ?itati datoteku licence â??{0}â??, zbog problema sa instalacijom. NeÄ?ete moÄ?i da koristite ovog pruÅ¾aoca dok ne prihvatite licencu."
+#: ../mail/mail.error.xml.h:35
+msgid ""
+"Cannot read the license file \"{0}\", due to an installation problem. You "
+"will not be able to use this provider until you can accept its license."
+msgstr ""
+"Nije moguÄ?e proÄ?itati datoteku licence â??{0}â??, zbog problema sa instalacijom. "
+"NeÄ?ete moÄ?i da koristite ovog pruÅ¾aoca dok ne prihvatite licencu."
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nije moguÄ?e preimenovati â??{0}â?? u â??{1}â??."
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Nije moguÄ?e preimenovati ili premestiti sistemsku fascikluâ??{0}â??."
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
 msgstr "Nije moguÄ?e Ä?uvanje izmena na nalogu."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nije moguÄ?e Ä?uvanje u direktorijum â??{0}â??."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
 msgstr "Nije moguÄ?e Ä?uvanje u datoteku â??{0}â??."
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
 msgstr "Nije moguÄ?e postaviti skriptu za potpis â??{0}â??."
 
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "Provera neÅ¾eljene poÅ¡te nije uspela"
-
-#: ../mail/mail.error.xml.h:44
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u veÄ?ini lozinki veliÄ?ina slova bitna; moÅ¾da su ukljuÄ?ena velika slova."
+#: ../mail/mail.error.xml.h:42
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Proverite da li ste ispravno otkucali lozinku. Ne zaboravite da je u veÄ?ini "
+"lozinki veliÄ?ina slova bitna; moÅ¾da su ukljuÄ?ena velika slova."
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "Could not save signature file."
 msgstr "Nije moguÄ?e Ä?uvanje datoteke potpisa."
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "Obrisati poruke u fascikli pretrage â??{0}â???"
 
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+#| msgid "Do not disable"
+msgid "Do _Not Disable"
+msgstr "Nemoj iskljuÄ?iti"
+
 #: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "Ne _briÅ¡i"
+#, fuzzy
+#| msgid "Do _not Send"
+msgid "Do _Not Send"
+msgstr "Ne Å¡alj_i"
 
 #: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "Ne briÅ¡i"
+#, fuzzy
+#| msgid "_Do not Synchronize"
+msgid "Do _Not Synchronize"
+msgstr "_Ne usklaÄ?uj"
 
 #: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "Nemoj iskljuÄ?iti"
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr ""
+"Å½elite li lokalno da uskladite fascikle koje su oznaÄ?ene za koriÅ¡Ä?enje van "
+"mreÅ¾e?"
 
 #: ../mail/mail.error.xml.h:50
-msgid "Do you want to locally synchronize the folders that are marked for offline usage?"
-msgstr "Å½elite li lokalno da uskladite fascikle koje su oznaÄ?ene za koriÅ¡Ä?enje van mreÅ¾e?"
-
-#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "Da li Å¾elite da sve poruke oznaÄ?ite kao proÄ?itane?"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
 msgstr "Å½elite li da saÄ?uvate promene?"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Unesite lozinku."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "GreÅ¡ka pri uÄ?itavanju definicija filtera."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
 msgstr "GreÅ¡ka tokom operacije."
 
-#: ../mail/mail.error.xml.h:56
+#. Translators: the {0} is replaced with an operation name, which failed.
+#. It can be basically anything run asynchronously, like "Fetching Mail",
+#. "Sending message" and others, mostly from mail-ops.c file.
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "GreÅ¡ka prilikom {0}."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji, nije moguÄ?e prepisivanje."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Ukoliko nastavite, neÄ?ete moÄ?i da vratite ove poruke."
 
-#: ../mail/mail.error.xml.h:60
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-msgstr "Ukoliko obriÅ¡ete fasciklu, sav njen sadrÅ¾aj i sadrÅ¾aj podfascikli Ä?e biti trajno obrisani."
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
+#| msgid ""
+#| "If you delete the folder, all of its contents and its subfolders contents "
+#| "will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders' contents "
+"will be deleted permanently."
+msgstr ""
+"Ukoliko obriÅ¡ete fasciklu, sav njen sadrÅ¾aj i sadrÅ¾aj podfascikli Ä?e biti "
+"trajno obrisani."
 
-#: ../mail/mail.error.xml.h:61
-msgid "If you delete the folder, all of its contents will be deleted permanently."
+#: ../mail/mail.error.xml.h:63
+msgid ""
+"If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Ukoliko obriÅ¡ete fasciklu, sav njen sadrÅ¾aj Ä?e biti trajno obrisan."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ako nastavite, svi posredniÄ?ki nalozi biÄ?e trajno uklonjeni."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -13431,168 +14048,165 @@ msgstr ""
 "Ukoliko nastavite, podaci naloga i svi pripadajuÄ?i\n"
 "podaci Ä?e biti trajno obrisani."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Ukoliko nastavite, podaci naloga biÄ?e trajno obrisani."
 
-#: ../mail/mail.error.xml.h:66
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr "Ukoliko izaÄ?ete, ove poruke neÄ?e biti poslate dok ponovo ne pokrenete Evoluciju."
+#: ../mail/mail.error.xml.h:68
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
+msgstr ""
+"Ukoliko izaÄ?ete, ove poruke neÄ?e biti poslate dok ponovo ne pokrenete "
+"Evoluciju."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
 msgid "Invalid authentication"
 msgstr "Neispravna autentifikacija"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
 msgid "Mail Deletion Failed"
 msgstr "NeuspeÅ¡no brisanje poÅ¡te"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
 msgid "Mail filters automatically updated."
 msgstr "Filteri poÅ¡te su automatski aÅ¾urirani."
 
-#: ../mail/mail.error.xml.h:71
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+#: ../mail/mail.error.xml.h:73
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
 msgid "Missing folder."
 msgstr "Nedostaje fascikla."
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
 msgid "Opening too many messages at once may take a long time."
 msgstr "Otvaranje previÅ¡e poruka odjednom moÅ¾e suviÅ¡e da potraje."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
 msgid "Please check your account settings and try again."
 msgstr "Proverite podeÅ¡avanja naloga i pokuÅ¡ajte ponovo."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
 msgid "Please enable the account or send using another account."
 msgstr "OmoguÄ?ite nalog ili poÅ¡aljite koriÅ¡Ä?enjem drugog naloga."
 
-#: ../mail/mail.error.xml.h:78
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
-msgstr "Unesite vaÅ¾eÄ?u elektronsku adresu u polje Prima:. MoÅ¾ete pretraÅ¾iti elektronske adrese klikom na dugme Prima: pored polja za unos."
+#: ../mail/mail.error.xml.h:80
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"Unesite vaÅ¾eÄ?u elektronsku adresu u polje Prima:. MoÅ¾ete pretraÅ¾iti "
+"elektronske adrese klikom na dugme Prima: pored polja za unos."
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}"
 msgstr ""
 "Proverite da li sledeÄ?i primaoci Å¾ele i mogu da prime HTML poÅ¡tu:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
 msgid "Please provide an unique name to identify this signature."
 msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
 msgid "Please wait."
 msgstr "SaÄ?ekajte."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem pri prenosu stare fascikle poÅ¡te â??{0}â??."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "Slanje upita serveru za listu podrÅ¾anih mehanizama autentifikacije."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
 msgid "Read receipt requested."
 msgstr "ZatraÅ¾ene povratnice."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Zaista obrisati fasciklu â??{0}â?? i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
 msgid "Really delete folder \"{0}\"?"
 msgstr "Zaista obrisati fasciklu â??{0}â???"
 
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "IzveÅ¡tavanje za Ä?ubre nije uspelo"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "IzveÅ¡tavanje da nije Ä?ubre neuspelo"
-
 #: ../mail/mail.error.xml.h:90
+#, fuzzy
+#| msgid "_Private"
+msgid "Reply _Privately"
+msgstr "L_iÄ?no"
+
+#: ../mail/mail.error.xml.h:93
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski aÅ¾urirane."
 
+#: ../mail/mail.error.xml.h:94
+msgid "Send private reply?"
+msgstr ""
+
 # bug(slobo): verovatno izveÅ¡taj o dostavi
-#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "PoÅ¡alji povratnicu"
+#: ../mail/mail.error.xml.h:95
+#, fuzzy
+#| msgid "Sender or Recipients"
+msgid "Send reply to all recipients?"
+msgstr "PoÅ¡iljalac ili primaoci"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:96
 msgid "Signature Already Exists"
 msgstr "Potpis veÄ? postoji"
 
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "Uskladi"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Uskladiti fascikle lokalno za rad van mreÅ¾e?"
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:95
-msgid "System folders are required for Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu preimenovati, premestiti ili obrisati."
+#: ../mail/mail.error.xml.h:98
+msgid ""
+"System folders are required for Evolution to function correctly and cannot "
+"be renamed, moved, or deleted."
+msgstr ""
+"Sistemske fascikle neophodne da bi Evolucija ispravno radila se ne mogu "
+"preimenovati, premestiti ili obrisati."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "Kontakat lista kojoj Å¡aljete je podeÅ¡ena da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
-
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"SledeÄ?a(e) fascikla(e) pretrage:\n"
-"{0}\n"
-"Koristi sada uklonjenu fasciklu:\n"
-"    â??{1}â??\n"
-"I sada je(su) aÅ¾urirana(e)."
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"SledeÄ?e(a) pravilo(a) filtera:\n"
-"{0}\n"
-"Koristi sada uklonjenu fasciklu:\n"
-"    â??{1}â??\n"
-"I sada je(su) aÅ¾urirano(a)."
+"Mnogi sistemi e-poÅ¡te dodaju zaglavlje Izgleda-prima porukama koje imaju samo "
+"BCC primaoce. Ovo Ä?e zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
+"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -13600,7 +14214,7 @@ msgstr ""
 "Nije prepoznata ispravna adresa sledeÄ?eg primaoca:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -13608,11 +14222,11 @@ msgstr ""
 "Nisu prepoznate ispravne adrese sledeÄ?ih primalaca:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:106
 msgid "The script file must exist and be executable."
 msgstr "Datoteka skripte mora postojati i biti izvrÅ¡na."
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13620,207 +14234,267 @@ msgstr ""
 "Ova fascikla je moÅ¾da posredno dodata,\n"
 "idite u ureÄ?ivaÄ? fascikle pretrage i dodajte je izriÄ?ito, ako Å¾elite."
 
-#: ../mail/mail.error.xml.h:116
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "Ova poruka se ne moÅ¾e poslati poÅ¡to je iskljuÄ?en nalog sa kojeg Å¡aljete"
 
-#: ../mail/mail.error.xml.h:117
-msgid "This message cannot be sent because you have not specified any recipients"
+#: ../mail/mail.error.xml.h:110
+msgid ""
+"This message cannot be sent because you have not specified any recipients"
 msgstr "Ova poruka se ne moÅ¾e poslati poÅ¡to niste naveli nijednog primaoca"
 
-#: ../mail/mail.error.xml.h:118
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "Ovaj server ne podrÅ¾ava traÅ¾eni tip autentifikacije i moÅ¾da uopÅ¡te ne podrÅ¾ava autentifikaciju."
+#: ../mail/mail.error.xml.h:111
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"Ovaj server ne podrÅ¾ava traÅ¾eni tip autentifikacije i moÅ¾da uopÅ¡te ne "
+"podrÅ¾ava autentifikaciju."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:112
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije saÄ?uvan."
 
-#: ../mail/mail.error.xml.h:120
-msgid "This will mark all messages as read in the selected folder and its subfolders."
-msgstr "Ovo oznaÄ?ava sve poruke kao proÄ?itane u izabranoj fascikli i podfasciklama."
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all messages as read in the selected folder and its "
+"subfolders."
+msgstr ""
+"Ovo oznaÄ?ava sve poruke kao proÄ?itane u izabranoj fascikli i podfasciklama."
+
+#: ../mail/mail.error.xml.h:114
+#, fuzzy
+#| msgid ""
+#| "This will mark all messages as read in the selected folder and its "
+#| "subfolders."
+msgid "This will mark all messages as read in the selected folder."
+msgstr ""
+"Ovo oznaÄ?ava sve poruke kao proÄ?itane u izabranoj fascikli i podfasciklama."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:115
 msgid "Unable to connect to the GroupWise server."
 msgstr "Neuspelo povezivanje na GroupWise server."
 
-#: ../mail/mail.error.xml.h:122
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
-msgstr "Nije moguÄ?e otvaranje fascikle nacrta za ovaj nalog. Koristiti sistemsku fasciklu nacrta?"
+#: ../mail/mail.error.xml.h:116
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nije moguÄ?e otvaranje fascikle nacrta za ovaj nalog. Koristiti sistemsku "
+"fasciklu nacrta?"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:117
 msgid "Unable to read license file."
 msgstr "Nije moguÄ?e Ä?itanje datoteke licence."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:118
 msgid "Use _Default"
 msgstr "Koristi _podrazumevano"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:119
 msgid "Use default drafts folder?"
 msgstr "Koristiti podrazumevanu fasciklu nacrta?"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:120
 msgid ""
-"Warning: Deleting messages from a Search Folder will delete the actual message from one of your local or remote folders.\n"
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
 "Do you really want to do this?"
 msgstr ""
-"Upozorenje: brisanje poruka iz fascikle pretrage Ä?e obrisati samu poruku sa njene lokacije u fascikli.\n"
+"Upozorenje: brisanje poruka iz fascikle pretrage Ä?e obrisati samu poruku sa "
+"njene lokacije u fascikli.\n"
 "Å½elite li ovo da uradite?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:122
+msgid ""
+"You are replying privately to a message which arrived via a mailing list, "
+"but the list is trying to redirect your reply to go back to the list. Are "
+"you sure you want to proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:123
+msgid ""
+"You are replying to a message which arrived via a mailing list, but you are "
+"replying privately to the sender; not to the list. Are you sure you want to "
+"proceed?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:124
+#, fuzzy
+#| msgid ""
+#| "Retracting a message may remove it from the recipient's mailbox. Are you "
+#| "sure you want to do this?"
+msgid ""
+"You are replying to a message which was sent to many recipients. Are you "
+"sure you want to reply to ALL of them?"
+msgstr ""
+"PovlaÄ?enje poruke je moÅ¾e ukloniti iz sanduÄ?eta primaoca. Å½elite li ovo da "
+"uradite? "
+
+#: ../mail/mail.error.xml.h:125
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlaÅ¡Ä?enja da obriÅ¡ete ovu poÅ¡tu."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:126
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:127
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Imate neposlate poruke, Å¾elite li ipak da izaÄ?ete?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:128
 msgid "You may not create two accounts with the same name."
 msgstr "Ne moÅ¾ete otvoriti dva naloga istog imena."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:129
 msgid "You must name this Search Folder."
 msgstr "Morate imenovati ovu fasciklu pretrage."
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:130
 msgid "You must specify a folder."
 msgstr "Morate navesti fasciklu."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "Morate navesti bar jednu fasciklu kao izvor.\n"
-"Bilo pojedinaÄ?nim izborom fascikli, i/ili izborom svih lokalnih fascikli, svih mreÅ¾nih fascikli ili i jednih i drugih."
+"Bilo pojedinaÄ?nim izborom fascikli, i/ili izborom svih lokalnih fascikli, "
+"svih mreÅ¾nih fascikli ili i jednih i drugih."
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:133
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prijava na server â??{0}â?? kao â??{0}â?? nije uspela."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:134
 msgid "_Append"
 msgstr "_Dodaj"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:135
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "_OnemoguÄ?i"
+
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "_Zanemari promene"
 
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "_Ne usklaÄ?uj"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:862
+#: ../mail/mail.error.xml.h:137
+#: ../modules/mail/e-mail-shell-view-actions.c:827
 msgid "_Empty Trash"
 msgstr "Isprazni _SmeÄ?e"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:138
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:139
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
-#: ../mail/message-list.c:1122
+# bug(slobo): verovatno izveÅ¡taj o dostavi
+#: ../mail/mail.error.xml.h:142
+#, fuzzy
+#| msgid "Send Receipt"
+msgid "_Send Receipt"
+msgstr "PoÅ¡alji povratnicu"
+
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+#| msgid "Synchronize"
+msgid "_Synchronize"
+msgstr "Uskladi"
+
+#: ../mail/message-list.c:1170
 msgid "Unseen"
 msgstr "NeviÄ?eno"
 
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1171
 msgid "Seen"
 msgstr "ViÄ?eno"
 
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1172
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:1125
+#: ../mail/message-list.c:1173
 msgid "Forwarded"
 msgstr "ProsleÄ?eno"
 
-#: ../mail/message-list.c:1126
+#: ../mail/message-list.c:1174
 msgid "Multiple Unseen Messages"
 msgstr "ViÅ¡estruke neviÄ?ene poruke"
 
-#: ../mail/message-list.c:1127
+#: ../mail/message-list.c:1175
 msgid "Multiple Messages"
 msgstr "ViÅ¡estruke poruke"
 
-#: ../mail/message-list.c:1131
+#: ../mail/message-list.c:1179
 msgid "Lowest"
 msgstr "NajniÅ¾e"
 
-#: ../mail/message-list.c:1132
+#: ../mail/message-list.c:1180
 msgid "Lower"
 msgstr "NiÅ¾e"
 
-#: ../mail/message-list.c:1136
+#: ../mail/message-list.c:1184
 msgid "Higher"
 msgstr "ViÅ¡e"
 
-#: ../mail/message-list.c:1137
+#: ../mail/message-list.c:1185
 msgid "Highest"
 msgstr "NajviÅ¡e"
 
-#: ../mail/message-list.c:1747
-#: ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1795 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1754
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1802 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
 msgstr "Danas %l:%M %p"
 
-#: ../mail/message-list.c:1763
+#: ../mail/message-list.c:1811
 msgid "Yesterday %l:%M %p"
 msgstr "JuÄ?e %l:%M %p"
 
-#: ../mail/message-list.c:1775
+#: ../mail/message-list.c:1823
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1783
+#: ../mail/message-list.c:1831
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1785
+#: ../mail/message-list.c:1833
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2537
+#: ../mail/message-list.c:2598
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:2588
-#: ../shell/e-shell-view.c:723
-msgid "Shell Backend"
-msgstr "Pozadinski proces"
-
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4399
-#: ../mail/message-list.c:4895
+#: ../mail/message-list.c:4402 ../mail/message-list.c:4809
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4726
-msgid "No message satisfies your search criteria. Either clear search with Search->Clear menu item or change it."
-msgstr "Nema poruke sa zadatim uslovim pretrage. MoÅ¾ete oÄ?istiti pretragu iz menija Pretraga->OÄ?isti ili je izmeniti."
-
-#: ../mail/message-list.c:4728
-msgid "There are only hidden messages in this folder. Use View->Show Hidden Messages to show them."
-msgstr "U ovoj su fascikli samo skrivene slike. Da bi ih videli, upotrebite Pregled->PrikaÅ¾i skrivene slike."
+#: ../mail/message-list.c:4633
+msgid ""
+"No message satisfies your search criteria. Either clear search with Search-"
+">Clear menu item or change it."
+msgstr ""
+"Nema poruke sa zadatim uslovim pretrage. MoÅ¾ete oÄ?istiti pretragu iz menija "
+"Pretraga->OÄ?isti ili je izmeniti."
 
-#: ../mail/message-list.c:4730
+#: ../mail/message-list.c:4635
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -13849,7 +14523,7 @@ msgid "Sent Messages"
 msgstr "Poslate poruke"
 
 #: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
 msgid "Size"
 msgstr "VeliÄ?ina"
 
@@ -13858,27 +14532,27 @@ msgid "Subject - Trimmed"
 msgstr "Naslov - skraÄ?eno"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Body contains"
 msgstr "Telo sadrÅ¾i"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "Message contains"
 msgstr "Poruka sadrÅ¾i"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Recipients contain"
 msgstr "Primaoci sadrÅ¾e"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "Sender contains"
 msgstr "PoÅ¡iljalac sadrÅ¾i"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1303
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
 msgid "Subject contains"
 msgstr "Naslov sadrÅ¾i"
 
@@ -13887,60 +14561,95 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrÅ¾e"
 
 #: ../modules/addressbook/addressbook-config.c:206
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."
-msgstr "Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo ako on podrÅ¾ava SSL Å¡ifrovanje."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo "
+"ako on podrÅ¾ava SSL Å¡ifrovanje."
 
 #: ../modules/addressbook/addressbook-config.c:208
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."
-msgstr "Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo ako on podrÅ¾ava TLS Å¡ifrovanje."
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"Odabir ove moguÄ?nosti znaÄ?i da Ä?e se Evolucija povezati na LDAP server samo "
+"ako on podrÅ¾ava TLS Å¡ifrovanje."
 
 #: ../modules/addressbook/addressbook-config.c:210
-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 "Odabir ove moguÄ?nosti znaÄ?i da server ne podrÅ¾ava ni SSL ni TLS Å¡ifrovanje. To znaÄ?i da VaÅ¡a veza neÄ?e biti sigurna i da Ä?ete biti ranjivi na sigurnosne napade. "
-
-#: ../modules/addressbook/addressbook-config.c:592
-msgid "Use in _Birthday & Anniversaries calendar"
+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 ""
+"Odabir ove moguÄ?nosti znaÄ?i da server ne podrÅ¾ava ni SSL ni TLS Å¡ifrovanje. "
+"To znaÄ?i da VaÅ¡a veza neÄ?e biti sigurna i da Ä?ete biti ranjivi na sigurnosne "
+"napade. "
+
+#: ../modules/addressbook/addressbook-config.c:602
+#, fuzzy
+#| msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Koristi u kalendaru _RoÄ?endani i godiÅ¡njice"
 
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
 msgid "Copy _book content locally for offline operation"
 msgstr "UmnoÅ¾i sadrÅ¾aj _knjige lokalno za rad van mreÅ¾e"
 
-#: ../modules/addressbook/addressbook-config.c:736
-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 "Ovo je port LDAP servera na koji Ä?e Evolucija pokuÅ¡ati da se poveÅ¾e. PonuÄ?en je spisak standardnih portova. Pitajte administratora sistema koji port da navedete."
+#: ../modules/addressbook/addressbook-config.c:746
+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 ""
+"Ovo je port LDAP servera na koji Ä?e Evolucija pokuÅ¡ati da se poveÅ¾e. PonuÄ?en "
+"je spisak standardnih portova. Pitajte administratora sistema koji port da "
+"navedete."
 
-#: ../modules/addressbook/addressbook-config.c:810
-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 "Evolucija Ä?e koristiti ovaj metod za autentifikaciju.  Primetite da njegovo ukljuÄ?ivanje na â??Elektronska adresaâ?? zahteva anonimni pristup na LDAP server."
+#: ../modules/addressbook/addressbook-config.c:820
+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 ""
+"Evolucija Ä?e koristiti ovaj metod za autentifikaciju.  Primetite da njegovo "
+"ukljuÄ?ivanje na â??Elektronska adresaâ?? zahteva anonimni pristup na LDAP server."
 
-#: ../modules/addressbook/addressbook-config.c:885
-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 "Obim pretrage definiÅ¡e dubinu kojom Å¾elite da pretraga obuhvati stablo direktorijuma. Obim pretrage â??podâ?? Ä?e ukljuÄ?iti sve unose ispod baze za pretragu. Obim pretrage â??jedanâ?? Ä?e ukljuÄ?iti samo unose jedan nivo ispod VaÅ¡e baze."
+#: ../modules/addressbook/addressbook-config.c:895
+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 ""
+"Obim pretrage definiÅ¡e dubinu kojom Å¾elite da pretraga obuhvati stablo "
+"direktorijuma. Obim pretrage â??podâ?? Ä?e ukljuÄ?iti sve unose ispod baze za "
+"pretragu. Obim pretrage â??jedanâ?? Ä?e ukljuÄ?iti samo unose jedan nivo ispod VaÅ¡e "
+"baze."
 
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalji"
 
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
 #: ../modules/mail/e-mail-shell-view.c:54
 msgid "Searching"
 msgstr "PretraÅ¾ivanje"
 
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
 msgid "New Address Book"
 msgstr "Novi adresar"
 
@@ -13985,12 +14694,23 @@ msgid "Show preview pane"
 msgstr "PrikaÅ¾i povrÅ¡ za pregled"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-msgid "The layout style determines where to place the preview pane in relation to the contact list. \"0\" (Classic View) places the preview pane below the contact list. \"1\" (Vertical View) places the preview pane next to the contact list."
-msgstr "Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak kontakata. â??0â?? (klasiÄ?an pregled) smeÅ¡ta ovu povrÅ¡ ispoda spiska kontakata. â??1â?? (vertikalan pregled) smeÅ¡ta povrÅ¡ pored spiska kontakata."
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+"Stil razmeÅ¡taja utvrÄ?uje poloÅ¾aj pregleda u odnosu na spisak kontakata. "
+"â??0â?? (klasiÄ?an pregled) smeÅ¡ta ovu povrÅ¡ ispoda spiska kontakata. "
+"â??1â?? (vertikalan pregled) smeÅ¡ta povrÅ¡ pored spiska kontakata."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
-msgstr "Broj znakova koji se moraju ukucati pre nego Å¡to Evolucija pokuÅ¡a da samodopuni."
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr ""
+"Broj znakova koji se moraju ukucati pre nego Å¡to Evolucija pokuÅ¡a da "
+"samodopuni."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
 msgid "URI for the folder last used in the select names dialog"
@@ -14001,412 +14721,321 @@ msgid "URI for the folder last used in the select names dialog."
 msgstr "Adresa za poslednju koriÅ¡Ä?enu fasciklu u prozorÄ?etu za izbor imena."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
-msgid "Whether force showing the mail address with the name of the autocompleted contact in the entry."
-msgstr "Da li da u unosu obavezno prikaÅ¾e adresu e-poÅ¡te sa imenom samodopunjenog kontakta."
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+"Da li da u unosu obavezno prikaÅ¾e adresu e-poÅ¡te sa imenom samodopunjenog "
+"kontakta."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "Whether to show the preview pane."
 msgstr "Da li se prikazuje povrÅ¡ za pregled."
 
-#: ../modules/addressbook/autocompletion-config.c:159
-msgid "Table column:"
-msgstr "Kolona tabele:"
-
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
 #: ../modules/addressbook/autocompletion-config.c:162
+#: ../modules/mail/em-mailer-prefs.c:1165
+msgid "_Table column:"
+msgstr "Kolona _tabele:"
+
+#: ../modules/addressbook/autocompletion-config.c:165
 msgid "Autocompletion"
 msgstr "Samodopunjavanje"
 
-#: ../modules/addressbook/autocompletion-config.c:165
+#: ../modules/addressbook/autocompletion-config.c:168
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:97
+#: ../modules/addressbook/e-book-shell-migrate.c:148
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
 msgid "Create a new contact"
 msgstr "Napravi novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Kontakt li_sta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
 msgid "Create a new contact list"
 msgstr "Napravi novu kontakt listu"
 
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
 msgid "Create a new address book"
 msgstr "Napravi novi adresar"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:401
+#: ../modules/calendar/e-cal-shell-backend.c:104
+#: ../modules/calendar/e-cal-shell-migrate.c:57
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "Izvorni spisak"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-msgid "The registry of address books"
-msgstr "Registar adresara"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "Trenutni pregled"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr "Trenutno izabran pregled adresara"
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-msgid "Previewed Contact"
-msgstr "Pregledan kontakt"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-msgid "The contact being shown in the preview pane"
-msgstr "Kontakt koji se prikazuje u pregledu"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-msgid "Preview is Visible"
-msgstr "Pregled je vidljiv"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-msgid "Whether the preview pane is visible"
-msgstr "Da li se prikazuje pregled"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP serveri"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "Postavke samodopunjavanja"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Putanja i hijerarhija fascikli za kontakte u Evoluciji izmenjena je od Evolucije 1.x.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Format za kontakte dopisnih lista je izmenjen.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"NaÄ?in na koji Evolucija smeÅ¡ta neke brojeve telefona je izmenjen.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Dnevnik promena i datoteke mapa Evolucija Palm Sync su izmenjeni.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi podatke sa Pilot Sync ureÄ?aja..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:761
-#: ../modules/calendar/e-memo-shell-sidebar.c:687
-#: ../modules/calendar/e-task-shell-sidebar.c:687
-msgid "Source Selector Widget"
-msgstr "VidÅ¾et izvornog izbornika"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-msgid "This widget displays groups of address books"
-msgstr "Ovaj vidÅ¾et prikazuje grupe adresara"
+#: ../modules/addressbook/e-book-shell-backend.c:312
+msgid "Certificates"
+msgstr "Sertifikati"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
 msgid "Save as vCard"
 msgstr "SaÄ?uvaj kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
 msgid "Co_py All Contacts To..."
 msgstr "UmnoÅ¾i _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
 msgid "Copy the contacts of the selected address book to another"
 msgstr "UmnoÅ¾i kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
 msgid "D_elete Address Book"
 msgstr "O_briÅ¡i adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
 msgid "Delete the selected address book"
 msgstr "ObriÅ¡i izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premesti kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
 msgid "Address _Book Properties"
 msgstr "PodeÅ¡avanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
 msgid "Show properties of the selected address book"
 msgstr "PrikaÅ¾i svojstva izabranog adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
 msgid "Rename the selected address book"
 msgstr "Preimenuj izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
 msgid "S_ave Address Book as vCard"
 msgstr "_SaÄ?uvaj adresar kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "SaÄ?uvaj kontakte izabranog adresara kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
 msgid "Stop loading"
 msgstr "Prekini uÄ?itavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
 msgid "_Copy Contact To..."
 msgstr "_UmnoÅ¾i kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
 msgid "Copy selected contacts to another address book"
 msgstr "UmnoÅ¾i izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
 msgid "_Find in Contact..."
 msgstr "_PronaÄ?i u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
 msgid "Search for text in the displayed contact"
 msgstr "PretraÅ¾i tekst prikazanom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
 msgid "Send selected contacts to another person"
 msgstr "PoÅ¡alji izabrane kontakte drugoj osobi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
 msgid "Move selected contacts to another address book"
 msgstr "Premesti izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
 msgid "New Contact _List..."
 msgstr "Novi kontakt _spisak..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "View the current contact"
 msgstr "Pregledaj tekuÄ?i kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
 msgid "_Send Message to Contact..."
 msgstr "_PoÅ¡alji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
 msgid "Send a message to the selected contacts"
 msgstr "PoÅ¡alji poruku izabranim kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1090
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Delete"
 msgstr "_ObriÅ¡i"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "_Properties"
 msgstr "O_sobine"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "_Save as vCard..."
 msgstr "_SaÄ?uvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
 msgid "Show contact preview window"
 msgstr "PrikaÅ¾i prozor za pregled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1185
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
 msgid "_Classic View"
 msgstr "_KlasiÄ?ni prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
 msgid "Show contact preview below the contact list"
 msgstr "PrikaÅ¾i pregled kontakta ispod kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
 msgid "Show contact preview alongside the contact list"
 msgstr "PrikaÅ¾i pregled kontakta pored kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "Print all shown contacts"
 msgstr "Å tampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred Å¡tampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Print selected contacts"
 msgstr "Å tampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "Ä?uva kao vKartu..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "Save selected contacts as a vCard"
 msgstr "SaÄ?uvaj izabrane kontakte kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:345
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:347
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:378
 msgid "_Send Message to Contacts"
 msgstr "_PoÅ¡alji poruku kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:380
 msgid "_Send Message to List"
 msgstr "_PoÅ¡alji poruku na listu"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:382
 msgid "_Send Message to Contact"
 msgstr "_PoÅ¡alji poruku kontaktu"
 
@@ -14430,110 +15059,105 @@ msgstr "Kontakt"
 msgid "Contact information for %s"
 msgstr "Kontakt podaci za %s"
 
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
 msgid "1"
 msgstr "1"
 
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:4
 msgid "5"
 msgstr "5"
 
 #: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
 msgid "Anonymously"
 msgstr "Anonimno"
 
 #. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
 msgid "B_rowse this book until limit reached"
 msgstr "Pre_gleda ovaj adresar dok se ne dostigne limit"
 
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
 msgid "Lo_gin:"
 msgstr "Pri_java:"
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
 msgid "One"
 msgstr "Jedan"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
 msgstr "Propusnik pretrage"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
 msgstr "Osnova za _pretragu:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
 msgstr "P_ropusnik pretrage:"
 
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "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 "Filter pretrage je vrsta objekta za kojim se traga. Ako se ovo ne izmeni, podrazumevana pretraga Ä?e biti obavljena na vrsti â??osobaâ??."
+#: ../modules/addressbook/ldap-config.ui.h:16
+msgid ""
+"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 ""
+"Filter pretrage je vrsta objekta za kojim se traga. Ako se ovo ne izmeni, "
+"podrazumevana pretraga Ä?e biti obavljena na vrsti â??osobaâ??."
 
 #. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
 msgid "Sub"
 msgstr "Pod"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Supported Search Bases"
 msgstr "PodrÅ¾ane baze za pretragu"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "Using distinguished name (DN)"
 msgstr "Koristi posebno ime (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using email address"
 msgstr "KoriÅ¡Ä?enje elektronske adrese"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "_Download limit:"
 msgstr "OgraniÄ?enje za _preuzimanje:"
 
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Find Possible Search Bases"
 msgstr "_NaÄ?i moguÄ?e baze za pretragu"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Login method:"
 msgstr "Metod _prijave:"
 
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Search scope:"
 msgstr "Obim p_retrage:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
 msgstr "_Rok:"
 
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Use secure connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "karte"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "U_vezi"
 
@@ -14554,98 +15178,71 @@ msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
-#: ../modules/calendar/e-memo-shell-backend.c:110
+#: ../modules/calendar/e-cal-shell-backend.c:106
+#: ../modules/calendar/e-cal-shell-migrate.c:176
+#: ../modules/calendar/e-memo-shell-backend.c:94
 #: ../modules/calendar/e-memo-shell-migrate.c:136
-#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-backend.c:94
+#: ../modules/calendar/e-task-shell-migrate.c:145
 msgid "On The Web"
 msgstr "Na vebu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:108
 #: ../plugins/calendar-weather/calendar-weather.c:117
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:193
+#: ../modules/calendar/e-cal-shell-migrate.c:60
 msgid "Birthdays & Anniversaries"
 msgstr "RoÄ?endani i godiÅ¡njice"
 
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:396
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:403
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:405
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:410
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:412
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:420
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:707
+#: ../plugins/itip-formatter/itip-formatter.c:2667
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr "Registar kalendara"
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Mesto i hijerarhija fascikli kalendara u Evoluciji je izmenjena od Evolucije 1.h.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Nije moguÄ? prenos starih podeÅ¡avanja iz evolution/config.xmldb"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "Nije moguÄ? prenos kalendara â??%sâ??"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:167
-#: ../modules/calendar/e-memo-shell-sidebar.c:162
-#: ../modules/calendar/e-task-shell-sidebar.c:162
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
+#: ../modules/calendar/e-memo-shell-sidebar.c:163
+#: ../modules/calendar/e-task-shell-sidebar.c:163
 #, c-format
 msgid ""
 "Error on %s\n"
@@ -14654,36 +15251,22 @@ msgstr ""
 "GreÅ¡ka na %s\n"
 " %s"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:226
+#: ../modules/calendar/e-cal-shell-sidebar.c:237
 msgid "Loading calendars"
 msgstr "UÄ?itavanje kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:615
+#: ../modules/calendar/e-cal-shell-sidebar.c:664
+#, fuzzy
+#| msgid "_New Calendar"
+msgid "_New Calendar..."
+msgstr "Novi _kalendar"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:681
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:741
-msgid "Date Navigator Widget"
-msgstr "VidÅ¾et navigatora za datum"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:742
-msgid "This widget displays a miniature calendar"
-msgstr "Ovaj vidÅ¾et prikazuje minijaturni kalendar"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:751
-msgid "Default Calendar Client"
-msgstr "Podrazumevani klijent kalendara"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:752
-msgid "Default client for calendar operations"
-msgstr "Podrazumevani klijent za rad sa kalendarom"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:762
-msgid "This widget displays groups of calendars"
-msgstr "Ovaj vidÅ¾et prikazuje grupe kalendara"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:950
+#: ../modules/calendar/e-cal-shell-sidebar.c:1022
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Otvaranje kalendara na %s"
@@ -14694,8 +15277,13 @@ msgid "Print"
 msgstr "Å tampaj"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:306
-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 events."
-msgstr "Ova Ä?e radnja trajno obrisati sve dogaÄ?aje pre izabranog roka. Ukoliko nastavite, neÄ?ete moÄ?i da povratite ove dogaÄ?aje."
+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 "
+"events."
+msgstr ""
+"Ova Ä?e radnja trajno obrisati sve dogaÄ?aje pre izabranog roka. Ukoliko "
+"nastavite, neÄ?ete moÄ?i da povratite ove dogaÄ?aje."
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
@@ -14707,298 +15295,298 @@ msgstr "Izbaci dogaÄ?aje starije od"
 msgid "Copying Items"
 msgstr "UmnoÅ¾avanje stavki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "PremeÅ¡tanje stavki"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
 msgid "event"
 msgstr "dogaÄ?aj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
 msgid "Save as iCalendar"
 msgstr "SaÄ?uvaj kao iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Copy..."
 msgstr "_UmnoÅ¾i..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
 msgid "D_elete Calendar"
 msgstr "Ob_riÅ¡i kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Delete the selected calendar"
 msgstr "ObriÅ¡i izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "Izaberi _danaÅ¡nji dan"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Select today"
 msgstr "Izaberi danaÅ¡nji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Select a specific date"
 msgstr "Bira odreÄ?eni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
 msgid "Purge old appointments and meetings"
 msgstr "Izbaci stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "Re_fresh"
 msgstr "O_sveÅ¾i"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
 msgid "Refresh the selected calendar"
 msgstr "OsveÅ¾i izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Rename the selected calendar"
 msgstr "Preimenuj izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Show _Only This Calendar"
 msgstr "PrikaÅ¾i _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Cop_y to Calendar..."
 msgstr "_UmnoÅ¾i u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "_Delete Appointment"
 msgstr "_ObriÅ¡i zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete selected appointments"
 msgstr "ObriÅ¡i izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "Delete This _Occurrence"
 msgstr "ObriÅ¡i ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Delete this occurrence"
 msgstr "ObriÅ¡i ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Delete All Occ_urrences"
 msgstr "ObriÅ¡i sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Delete all occurrences"
 msgstr "ObriÅ¡i sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _dogaÄ?aj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new all day event"
 msgstr "Pravi novi celodnevni dogaÄ?aj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "Create a new meeting"
 msgstr "Pravi novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "View the current appointment"
 msgstr "Pregleda tekuÄ?e zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
 msgid "Save as iCalendar..."
 msgstr "SaÄ?uvaj kao iCalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "_Schedule Meeting..."
 msgstr "_ZakaÅ¾i sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvori zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvori sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+msgid "Quit"
+msgstr "IzaÄ?i"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
 msgid "Show one day"
 msgstr "PrikaÅ¾i jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
 msgid "Show as list"
 msgstr "PrikaÅ¾i kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
 msgid "Show one month"
 msgstr "PrikaÅ¾i jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
 msgid "Show one week"
 msgstr "PrikaÅ¾i jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
 msgid "Show one work week"
 msgstr "PrikaÅ¾i jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeÄ?u nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
 msgid "Description contains"
 msgstr "Opis sadrÅ¾i"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
 msgid "Summary contains"
 msgstr "SaÅ¾etak sadrÅ¾i"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
 msgid "Print this calendar"
 msgstr "Å tampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred Å¡tampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 msgid "Go To"
 msgstr "Idi na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
 msgid "memo"
 msgstr "beleÅ¡ka"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
 msgid "New _Memo"
 msgstr "Nova _beleÅ¡ka"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:279
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Create a new memo"
 msgstr "NapiÅ¡i jednu novu beleÅ¡ku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
 msgid "_Open Memo"
 msgstr "_Otvori beleÅ¡ku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "View the selected memo"
 msgstr "Pogledaj izabranu beleÅ¡ku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
 msgid "Print the selected memo"
 msgstr "Å tampa izabranu beleÅ¡ku"
 
@@ -15007,22 +15595,22 @@ msgstr "Å tampa izabranu beleÅ¡ku"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
 msgid "task"
 msgstr "zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "_Mark as Complete"
 msgstr "_OznaÄ?i kao zavrÅ¡eno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Mark selected tasks as complete"
 msgstr "ObeleÅ¾i izabrane zadatke kao zavrÅ¡ene"
 
@@ -15031,96 +15619,76 @@ msgid "_Mark as Incomplete"
 msgstr "_OznaÄ?i kao nezavrÅ¡eno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Mark selected tasks as incomplete"
 msgstr "ObeleÅ¾ava izabrane zadatke kao nezavrÅ¡ene"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:340
-#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-backend.c:277
+#: ../modules/calendar/e-task-shell-view-actions.c:774
 msgid "Create a new task"
 msgstr "Napravi novi zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "View the selected task"
 msgstr "Pregleda izabrani zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "_Save as iCalendar..."
 msgstr "_SaÄ?uvaj kao iKalendar..."
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
 msgid "Print the selected task"
 msgstr "Å tampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:277
 msgctxt "New"
 msgid "Mem_o"
 msgstr "BeleÅ¡k_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:284
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleÅ¡ka"
 
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:286
 msgid "Create a new shared memo"
 msgstr "Napravi novu deljenu beleÅ¡ku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:294
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo list"
 msgstr "Sastavi novi spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-backend.c:588
-msgid "The registry of memo lists"
-msgstr "Registar spiskova beleÅ¡ki"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-msgid "The memo table model"
-msgstr "Model tabele beleÅ¡ki"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:221
+#: ../modules/calendar/e-memo-shell-sidebar.c:231
 msgid "Loading memos"
 msgstr "UÄ?itavanje beleÅ¡ki je u toku"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:569
+#: ../modules/calendar/e-memo-shell-sidebar.c:603
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:677
-msgid "Default Memo Client"
-msgstr "Podrazumevani klijent beleÅ¡ki"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:678
-msgid "Default client for memo operations"
-msgstr "Podrazumevani klijent za radnje sa beleÅ¡kama"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:688
-msgid "This widget displays groups of memo lists"
-msgstr "Ovaj vidÅ¾et prikazuje grupe beleÅ¡ki"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:868
+#: ../modules/calendar/e-memo-shell-sidebar.c:908
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Otvaranje beleÅ¡ki sa %s je u toku"
@@ -15130,63 +15698,63 @@ msgstr "Otvaranje beleÅ¡ki sa %s je u toku"
 msgid "Print Memos"
 msgstr "Å tampaj beleÅ¡ke"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_Delete Memo"
 msgstr "_ObriÅ¡i beleÅ¡ku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
 msgid "_Find in Memo..."
 msgstr "P_ronaÄ?i u beleÅ¡ci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
 msgid "Search for text in the displayed memo"
 msgstr "PretraÅ¾i tekst u prikazanoj beleÅ¡ci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "D_elete Memo List"
 msgstr "Ob_riÅ¡i spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Delete the selected memo list"
 msgstr "ObriÅ¡i izabrani spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "_New Memo List"
 msgstr "_Novi spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Refresh the selected memo list"
 msgstr "OsveÅ¾i izabrani spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Rename the selected memo list"
 msgstr "Preimenuj izabrani spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
 msgid "Show _Only This Memo List"
 msgstr "PrikaÅ¾i _samo ovaj spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
 msgid "Memo _Preview"
 msgstr "_Pregled beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
 msgid "Show memo preview pane"
 msgstr "PrikaÅ¾i pregled beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview below the memo list"
 msgstr "PrikaÅ¾i pregled beleÅ¡ki ispod spiska beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
 msgid "Show memo preview alongside the memo list"
 msgstr "PrikaÅ¾i pregled beleÅ¡ki pored spiska beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
 msgid "Print the list of memos"
 msgstr "Å tampaj spisak beleÅ¡ki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
 msgid "Preview the list of memos to be printed"
 msgstr "Pregled spiska beleÅ¡ki za Å¡tampu"
 
@@ -15197,6 +15765,7 @@ msgid_plural "%d memos"
 msgstr[0] "%d beleÅ¡ka"
 msgstr[1] "%d beleÅ¡ke"
 msgstr[2] "%d beleÅ¡ki"
+msgstr[3] "%d beleÅ¡ka"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:420
 #: ../modules/calendar/e-task-shell-view-private.c:569
@@ -15212,76 +15781,40 @@ msgstr "ObriÅ¡i beleÅ¡ke"
 msgid "Delete Memo"
 msgstr "ObriÅ¡i beleÅ¡ku"
 
-#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-backend.c:275
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:329
+#: ../modules/calendar/e-task-shell-backend.c:282
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:331
+#: ../modules/calendar/e-task-shell-backend.c:284
 msgid "Create a new assigned task"
 msgstr "Dodeli novi zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-backend.c:292
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-backend.c:294
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "Create a new task list"
 msgstr "Napravi novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:598
-msgid "The registry of task lists"
-msgstr "Registar spiskova zadataka"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-msgid "The task table model"
-msgstr "Model tabele zadataka"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Mesto i hijerarhija fascikli zaduÅ¾enja u Evoluciji je izmenjena od Evolucije 1.h.\n"
-"\n"
-"Budite strpljivi dok Evolucija prenosi fascikle..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "Nije moguÄ? prenos zaduÅ¾enja â??%sâ??"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:221
+#: ../modules/calendar/e-task-shell-sidebar.c:231
 msgid "Loading tasks"
 msgstr "UÄ?itavanje zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:569
+#: ../modules/calendar/e-task-shell-sidebar.c:603
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:677
-msgid "Default Task Client"
-msgstr "Podrazumevani klijent zadataka"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:678
-msgid "Default client for task operations"
-msgstr "Podrazumevani klijent za radnje sa zadacima"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:688
-msgid "This widget displays groups of task lists"
-msgstr "Ovaj vidÅ¾et prikazuje grupe zadataka"
-
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:868
+#: ../modules/calendar/e-task-shell-sidebar.c:908
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaranje zadataka u %s"
@@ -15291,105 +15824,107 @@ msgstr "Otvaranje zadataka u %s"
 msgid "Print Tasks"
 msgstr "Å tampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"Ova operacija Ä?e trajno obrisati sve zadatke obeleÅ¾ene kao zavrÅ¡ene. Ako nastavite, neÄ?ete moÄ?i da povratite ove zadatke.\n"
+"Ova operacija Ä?e trajno obrisati sve zadatke obeleÅ¾ene kao zavrÅ¡ene. Ako "
+"nastavite, neÄ?ete moÄ?i da povratite ove zadatke.\n"
 "\n"
 "Zaista obrisati ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
 msgid "_Delete Task"
 msgstr "_ObriÅ¡i zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
 msgid "_Find in Task..."
 msgstr "_PronaÄ?i u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
 msgid "Search for text in the displayed task"
 msgstr "PretraÅ¾i tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "Copy..."
 msgstr "UmnoÅ¾i..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "D_elete Task List"
 msgstr "O_briÅ¡i spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Delete the selected task list"
 msgstr "ObriÅ¡i izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Refresh the selected task list"
 msgstr "OsveÅ¾i izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Rename the selected task list"
 msgstr "Preimenuj izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
 msgid "Show _Only This Task List"
 msgstr "PrikaÅ¾i _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
 msgid "Mar_k as Incomplete"
 msgstr "O_znaÄ?i kao nezavrÅ¡eno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Delete completed tasks"
 msgstr "ObriÅ¡i zavrÅ¡ene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
 msgid "Show task preview pane"
 msgstr "PrikaÅ¾i pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview below the task list"
 msgstr "PrikaÅ¾i pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
 msgid "Show task preview alongside the task list"
 msgstr "PrikaÅ¾i pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Completed Tasks"
 msgstr "ZavrÅ¡eni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeÄ?u nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Overdue Tasks"
 msgstr "PrekoraÄ?eni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
 msgid "Print the list of tasks"
 msgstr "Å tampaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregled spiska zadataka pred Å¡tampu"
 
@@ -15404,6 +15939,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d zadatak"
 msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
+msgstr[3] "%d zadatak"
 
 #: ../modules/calendar/e-task-shell-view.c:351
 msgid "Delete Tasks"
@@ -15414,7 +15950,7 @@ msgid "Delete Task"
 msgstr "ObriÅ¡i zadatak"
 
 #. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
 #, c-format
 msgid "%d attached messages"
 msgstr "%d priloÅ¾enih poruka"
@@ -15426,7 +15962,7 @@ msgstr "%d priloÅ¾enih poruka"
 # is not permitted.
 #. Translators: "None" for a junk hook name,
 #. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
 msgctxt "mail-junk-hook"
 msgid "None"
 msgstr "NiÅ¡ta"
@@ -15449,148 +15985,140 @@ msgstr "_Fascikla za poÅ¡tu"
 msgid "Create a new mail folder"
 msgstr "Napravi novu fasciklu za poÅ¡tu"
 
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:478
 msgid "Mail Accounts"
 msgstr "PoÅ¡tanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:486
 msgid "Mail Preferences"
 msgstr "Postavke poÅ¡te"
 
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:494
 msgid "Composer Preferences"
 msgstr "Postavke sastavljaÄ?a"
 
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:502
 msgid "Network Preferences"
 msgstr "Postavke mreÅ¾e"
 
-#: ../modules/mail/e-mail-shell-content.c:679
-msgid "Group by Threads"
-msgstr "GrupiÅ¡i po temama"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr "Da li da grupiÅ¡e poruke po temama"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:855
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:870
 msgid "_Disable Account"
 msgstr "_OnemoguÄ?i nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:822
 msgid "Disable this account"
 msgstr "OnemoguÄ?i ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:829
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno ukloni sve obrisane poruke iz svih fascikli"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:869
+#: ../modules/mail/e-mail-shell-view-actions.c:834
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:876
+#: ../modules/mail/e-mail-shell-view-actions.c:841
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzima poruke za rad van mreÅ¾e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:878
+#: ../modules/mail/e-mail-shell-view-actions.c:843
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Preuzima poruke za naloge i fascikle koje su oznaÄ?ene za rad van mreÅ¾e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:883
+#: ../modules/mail/e-mail-shell-view-actions.c:848
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni Za slanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:890
+#: ../modules/mail/e-mail-shell-view-actions.c:855
 msgid "_Copy Folder To..."
 msgstr "_UmnoÅ¾i fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:892
+#: ../modules/mail/e-mail-shell-view-actions.c:857
 msgid "Copy the selected folder into another folder"
 msgstr "UmnoÅ¾i izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:899
+#: ../modules/mail/e-mail-shell-view-actions.c:864
 msgid "Permanently remove this folder"
 msgstr "Trajno ukloni ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:904
+#: ../modules/mail/e-mail-shell-view-actions.c:869
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:906
+#: ../modules/mail/e-mail-shell-view-actions.c:871
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno ukloni sve obrisane poruke iz ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:911
+#: ../modules/mail/e-mail-shell-view-actions.c:876
 msgid "Mar_k All Messages as Read"
 msgstr "OznaÄ?i sve po_ruke kao proÄ?itane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:878
 msgid "Mark all messages in the folder as read"
 msgstr "OznaÄ?ava sve poruke u fascikli kao proÄ?itane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:918
+#: ../modules/mail/e-mail-shell-view-actions.c:883
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:885
 msgid "Move the selected folder into another folder"
 msgstr "Premesti izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:925
+#: ../modules/mail/e-mail-shell-view-actions.c:890
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:927
+#: ../modules/mail/e-mail-shell-view-actions.c:892
 msgid "Create a new folder for storing mail"
 msgstr "Napravi novu fasciklu za smeÅ¡taj poÅ¡te"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:934
+#: ../modules/mail/e-mail-shell-view-actions.c:899
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:941
+#: ../modules/mail/e-mail-shell-view-actions.c:906
 msgid "Refresh the folder"
 msgstr "OsveÅ¾ava fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:948
+#: ../modules/mail/e-mail-shell-view-actions.c:913
 msgid "Change the name of this folder"
 msgstr "Promeni ime ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:918
 msgid "Select Message _Thread"
 msgstr "Izaberi raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:955
+#: ../modules/mail/e-mail-shell-view-actions.c:920
 msgid "Select all messages in the same thread as the selected message"
 msgstr "OznaÄ?i sve poruke iste rasprave kao izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:925
 msgid "Select Message S_ubthread"
 msgstr "Bira p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:962
+#: ../modules/mail/e-mail-shell-view-actions.c:927
 msgid "Select all replies to the currently selected message"
 msgstr "OznaÄ?ava sve odgovore na trenutno izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:967
+#: ../modules/mail/e-mail-shell-view-actions.c:932
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:969
+#: ../modules/mail/e-mail-shell-view-actions.c:934
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavi se sa izabrane fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:974
+#: ../modules/mail/e-mail-shell-view-actions.c:939
 msgid "Empty _Trash"
 msgstr "Izbaci _smeÄ?e"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../modules/mail/e-mail-shell-view-actions.c:941
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno ukloni sve obrisane poruke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:946
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -15599,333 +16127,345 @@ msgstr "_Nova oznaka"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:990
+#: ../modules/mail/e-mail-shell-view-actions.c:955
 msgid "N_one"
 msgstr "N_iÅ¡ta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:997
-msgid "Hide _Read Messages"
-msgstr "Sakrij pro_Ä?itane poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:999
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Privremeno sakrij sve proÄ?itane poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1004
-msgid "Hide S_elected Messages"
-msgstr "Sakrij i_zabrane poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1006
-msgid "Temporarily hide the selected messages"
-msgstr "Privremeno sakrij izabrane poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1011
-msgid "Show Hidde_n Messages"
-msgstr "Pri_kaÅ¾i skrivene poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1013
-msgid "Show messages that have been temporarily hidden"
-msgstr "PrikaÅ¾i poruke koje su privremeno skrivene"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1034
+#: ../modules/mail/e-mail-shell-view-actions.c:978
 msgid "Cancel the current mail operation"
 msgstr "OtkaÅ¾i trenutnu operaciju sa poÅ¡tom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1039
+#: ../modules/mail/e-mail-shell-view-actions.c:983
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1041
+#: ../modules/mail/e-mail-shell-view-actions.c:985
 msgid "Collapse all message threads"
 msgstr "Skupi celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1046
+#: ../modules/mail/e-mail-shell-view-actions.c:990
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1048
+#: ../modules/mail/e-mail-shell-view-actions.c:992
 msgid "Expand all message threads"
 msgstr "Razgranaj sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1053
+#: ../modules/mail/e-mail-shell-view-actions.c:997
 msgid "_Message Filters"
 msgstr "F_ilteri za poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1055
+#: ../modules/mail/e-mail-shell-view-actions.c:999
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravi ili uredi pravila za filtriranje nove poÅ¡te"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1060
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1062
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
 msgid "Create or edit search folder definitions"
 msgstr "Napravi ili uredi definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1067
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1069
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavi se ili odjavi na fascikle na mreÅ¾nim serverima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1076
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
 msgid "F_older"
 msgstr "Fas_cikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1083
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1123
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
-msgid "Hide _Deleted Messages"
-msgstr "Sakrij _obrisane poruke"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1149
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Sakrij obrisane poruke umesto njihovog precrtavanja"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1156
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
 msgid "Show Message _Preview"
 msgstr "Prika_Å¾i pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1158
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
 msgid "Show message preview pane"
 msgstr "PrikaÅ¾i pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1164
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#| msgid "Show deleted messages"
+msgid "Show _Deleted Messages"
+msgstr "PrikaÅ¾i o_brisane poruke"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#, fuzzy
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show deleted messages with a line through them"
+msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
 msgid "_Group By Threads"
 msgstr "GrupiÅ¡i po raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
 msgid "Show message preview below the message list"
 msgstr "PrikaÅ¾i pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
 msgid "Show message preview alongside the message list"
 msgstr "PrikaÅ¾i pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1202
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1209
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
 msgid "Important Messages"
 msgstr "VaÅ¾ne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1216
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1223
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
 msgid "Messages Not Junk"
 msgstr "Poruke nisu Ä?ubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1230
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1237
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1244
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
 msgid "Read Messages"
 msgstr "ProÄ?itane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1251
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
 msgid "Recent Messages"
 msgstr "SkoraÅ¡nje poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1258
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
 msgid "Unread Messages"
 msgstr "NeproÄ?itane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
 msgid "Subject or Addresses contain"
 msgstr "Naslov ili adrese sadrÅ¾e"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1320
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1327
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
 msgid "Current Account"
 msgstr "tekuÄ?em nalogu"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1334
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
 msgid "Current Folder"
 msgstr "tekuÄ?oj fascikli"
 
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:936
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d izabrana,"
 msgstr[1] "%d izabrane,"
 msgstr[2] "%d izabranih,"
+msgstr[3] "%d izabrana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:947
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
-msgstr[0] "%d obrisano"
+msgstr[0] "%d obrisana"
 msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
+msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:953
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d Ä?ubre"
 msgstr[1] "%d Ä?ubreta"
 msgstr[2] "%d Ä?ubreta"
+msgstr[3] "%d Ä?ubre"
 
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:966
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d nacrt"
 msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
+msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
-msgstr[0] "%d neposlato"
+msgstr[0] "%d neposlata"
 msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
+msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
-msgstr[0] "%d poslato"
+msgstr[0] "%d poslata"
 msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
+msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:990
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d neproÄ?itana,"
 msgstr[1] "%d neproÄ?itane,"
 msgstr[2] "%d neproÄ?itanih,"
+msgstr[3] "%d neproÄ?itana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:993
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d ukupno"
 msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
+msgstr[3] "%d ukupno"
 
 #: ../modules/mail/e-mail-shell-view.c:548
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:868
 msgid "Proxy _Logout"
 msgstr "_Odjava sa mreÅ¾nog posrednika"
 
-#: ../modules/mail/em-composer-prefs.c:473
+#: ../modules/mail/em-account-prefs.c:130
+msgid "Evolution Account Assistant"
+msgstr "PomoÄ?nik naloga Evolucije"
+
+#: ../modules/mail/em-account-prefs.c:179
+msgid "Account Editor"
+msgstr "UreÄ?ivaÄ? naloga"
+
+# has "activatable" set.
+#: ../modules/mail/em-composer-prefs.c:498
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "OmoguÄ?eno"
+
+#: ../modules/mail/em-composer-prefs.c:502
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
 # bug: requires a comment on usage
 # sliÄ?no kao za mesece i nedelje
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
 msgid "Every time"
 msgstr "svaki put"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
 msgid "Once per day"
 msgstr "jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
 msgid "Once per week"
 msgstr "jednom nedeljno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
 msgid "Once per month"
 msgstr "jednom meseÄ?no"
 
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
 msgid "Add Custom Junk Header"
 msgstr "Dodaje prilagoÄ?eno zaglavlje za neÅ¾eljenu poÅ¡tu"
 
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
 msgid "Header Name:"
 msgstr "Naziv fascikle:"
 
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
 msgid "Header Value Contains:"
 msgstr "Vrednost zaglavlja sadrÅ¾i:"
 
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
 msgid "Contains Value"
 msgstr "SadrÅ¾i vrednost"
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722
-#: ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
 #, c-format
 msgid "%s plugin is available and the binary is installed."
 msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
 
 #. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730
-#: ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
 #, 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 "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
 
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
 msgid "No junk plugin available"
 msgstr "Nema dostupnog prikljuÄ?ka za Ä?ubre"
 
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "_Table column:"
-msgstr "Kolona _tabele:"
-
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
 msgid "Show _original header value"
 msgstr "PrikaÅ¾i _originalnu vrednost zaglavlja"
 
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "Proveri da li je Evolucija podrazumevani program za poÅ¡tu"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr ""
+"Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program "
+"za poÅ¡tu."
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#, fuzzy
+#| msgid "Do you want to make Evolution your default e-mail client?"
+msgid "Do you want to make Evolution your default email client?"
+msgstr "Å½elite li da Evoluciju uÄ?inite podrazumevanim klijentom e-poÅ¡te?"
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
 msgstr "Zdravo Python"
@@ -15942,6 +16482,53 @@ msgstr "Test prikljuÄ?ak Python"
 msgid "Test Plugin for Python EPlugin loader."
 msgstr "PokretaÄ? test prikljuÄ?ka za Python EPlugin."
 
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:393
+msgid "Please select the information that you would like to import:"
+msgstr "Izaberite podatke koje Å¾elite da uvezete:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:549
+#, c-format
+msgid "From %s:"
+msgstr "Od %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#, fuzzy
+#| msgid "Importing files"
+msgid "Importing Files"
+msgstr "UvoÅ¾enje datoteka"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "PomoÄ?nik podeÅ¡avanja Evolucije"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "Dobro doÅ¡li"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+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"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"Dobro doÅ¡li u Evoluciju. Nekoliko narednih ekrana Ä?e omoguÄ?iti da se "
+"Evolucija poveÅ¾e na naloge eletronske poÅ¡te i da uveze datoteke iz drugih "
+"programa. \n"
+"\n"
+"Kliknite â??Napredâ?? da nastavite. "
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
 msgstr "Dodaje lokalne adresare u Evoluciju."
@@ -15951,21 +16538,25 @@ msgid "Local Address Books"
 msgstr "Lokalni adresari"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
-msgid "List of clues for the attachment reminder plugin to look for in a message body"
-msgstr "Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga tragati u telu poruke"
-
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid "List of clues for the attachment reminder plugin to look for in a message body."
-msgstr "Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga tragati u telu poruke."
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+"Spisak predmeta za kojima Ä?e prikljuÄ?ak za podseÄ?anje ukljuÄ?ivanja priloga "
+"tragati u telu poruke"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
 msgid "Keywords"
 msgstr "KljuÄ?ne reÄ?i"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
-msgid "Evolution has found some keywords that suggest that this message should contain an attachment, but cannot find one."
-msgstr "Evolucija je pronaÅ¡la neke kljuÄ?ne reÄ?i koje navode da bi poruka trebalo da sadrÅ¾i prilog, ali isti ne moÅ¾e da pronaÄ?e."
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Evolucija je pronaÅ¡la neke kljuÄ?ne reÄ?i koje navode da bi poruka trebalo da "
+"sadrÅ¾i prilog, ali isti ne moÅ¾e da pronaÄ?e."
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid "Message has no attachments"
@@ -15995,55 +16586,65 @@ msgstr "UnutraÅ¡nji audio"
 msgid "Play audio attachments directly in mail messages."
 msgstr "PuÅ¡ta audio priloge direktno u porukama."
 
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite ime za rezervnu kopiju Evolucije"
 
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izaberite ime rezervne kopije Evolucije za povraÄ?aj"
 
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
 msgid "_Restart Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraÄ?aja"
 
-#: ../plugins/backup-restore/backup-restore.c:290
-msgid "You can restore Evolution from your backup. It can restore all the Mails, Calendars, Tasks, Memos, Contacts. It also restores all your personal settings, mail filters etc."
-msgstr "Evoluciju moÅ¾ete povratiti iz rezervne kopije. MoÅ¾ete povratiti poÅ¡tu, kalendare, zadatke, beleÅ¡ke, kontakte. TakoÄ?e se  mogu povratiti sve liÄ?ne postavke, filteri za poÅ¡tu, itd."
+#: ../plugins/backup-restore/backup-restore.c:298
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
+msgstr ""
+"Evoluciju moÅ¾ete povratiti iz rezervne kopije. MoÅ¾ete povratiti poÅ¡tu, "
+"kalendare, zadatke, beleÅ¡ke, kontakte. TakoÄ?e se  mogu povratiti sve liÄ?ne "
+"postavke, filteri za poÅ¡tu, itd."
 
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
 msgid "_Restore Evolution from the backup file"
 msgstr "_Povrati Evoluciju iz datoteke rezervne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Izaberite arhivu Evolucije za povraÄ?aj:"
 
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Choose a file to restore"
 msgstr "Izaberite datoteku za povraÄ?aj"
 
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
 msgid "Restore from backup"
 msgstr "VraÄ?a iz rezervne kopije"
 
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#: ../plugins/backup-restore/backup-restore.c:361
+#, fuzzy
+#| msgid "_Backup Settings..."
+msgid "_Backup Evolution Settings..."
 msgstr "_IzraÄ?uje rezervu postavki..."
 
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Pravi rezervu podataka i postavki Evolucije u arhivu"
 
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#: ../plugins/backup-restore/backup-restore.c:368
+#, fuzzy
+#| msgid "R_estore Settings..."
+msgid "R_estore Evolution Settings..."
 msgstr "Op_oravlja postavke..."
 
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Oporavlja podatke i postavke Evolucije iz arhive"
 
@@ -16079,7 +16680,8 @@ msgstr "IzraÄ?uje rezervnu kopiju naloga i postavke Evolucije"
 
 #: ../plugins/backup-restore/backup.c:202
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
-msgstr "Izrada rezervne kopije podataka Evolucije (poÅ¡ta, kalendari, zadaci, beleÅ¡ke)"
+msgstr ""
+"Izrada rezervne kopije podataka Evolucije (poÅ¡ta, kalendari, zadaci, beleÅ¡ke)"
 
 #: ../plugins/backup-restore/backup.c:213
 msgid "Backup complete"
@@ -16093,7 +16695,9 @@ msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
 #: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#, fuzzy
+#| msgid "Backup current Evolution data"
+msgid "Back up current Evolution data"
 msgstr "IzraÄ?uje rezervnu kopiju trenutnih podataka Evolucije"
 
 #: ../plugins/backup-restore/backup.c:260
@@ -16123,32 +16727,32 @@ msgid "Restoring from the folder %s"
 msgstr "VrÅ¡i povraÄ?aj iz fascikle %s"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Backup"
 msgstr "Rezervna kopija Evolucije"
 
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
 msgid "Evolution Restore"
 msgstr "PovraÄ?aj Evolucije"
 
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
 msgid "Backing up Evolution Data"
 msgstr "IzraÄ?uje rezervnu kopiju podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
 msgid "Please wait while Evolution is backing up your data."
 msgstr "SaÄ?ekajte dok Evolucija pravi rezervnu kopiju podataka."
 
 # shell:noshell-reason title
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
 msgid "Restoring Evolution Data"
 msgstr "PovraÄ?aj podataka Evolucije"
 
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
 msgid "Please wait while Evolution is restoring your data."
 msgstr "SaÄ?ekajte dok Evolucija vraÄ?a podatke u prvobitno stanje."
 
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ovo moÅ¾e potrajati, u zavisnosti od koliÄ?ine podataka na nalogu."
 
@@ -16166,63 +16770,85 @@ msgid "Are you sure you want to close Evolution?"
 msgstr "Sigurno Å¾elite da zatvorite Evoluciju?"
 
 #: ../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 "Sigurno Å¾elite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr ""
+"Sigurno Å¾elite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-msgid "Evolution backup can start only when Evolution is not running. Please make sure that you save and close all your unsaved windows before proceeding.  If you want Evolution to restart automatically after backup, please enable the toggle button."
-msgstr "Izrada rezervne kopije moÅ¾e biti pokrenuta samo kada Evolucija ne radi. Pre nego Å¡to nastavite, proverite da li ste saÄ?uvali i zatvorili sve prozore u kojima ste radili. Ukoliko Å¾elite da se Evolucija sama pokrene nakon zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
+#, fuzzy
+#| msgid "Choose an action:"
+msgid "Close and Backup Evolution"
+msgstr "Izaberite radnju:"
 
+# shell:noshell-reason title
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+#, fuzzy
+#| msgid "Restart Evolution"
+msgid "Close and Restore Evolution"
+msgstr "Ponovo pokreÄ?e Evoluciju"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Insufficient Permissions"
 msgstr "Nedovoljna ovlaÅ¡Ä?enja"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid "Invalid Evolution backup file"
 msgstr "Neispravna datoteka rezervne kopije Evolucije"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
 msgid "Please select a valid backup file to restore."
 msgstr "Izaberite ispravnu datoteku za povraÄ?aj"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
 msgstr "U izabranu fasciklu se ne moÅ¾e pisati."
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "This will delete all your current Evolution data and settings and restore them from your backup. Evolution restore can start only when Evolution is not running. Please make sure that you close all your unsaved windows before you proceed. If you want Evolution to restart automatically restart after restore, please enable the toggle button."
-msgstr "Ovo Ä?e obrisati sve trenutne podatke i postavke Evolucije i povratiti ih iz rezervne kopije. Ova procedura se moÅ¾e pokrenuti samo kada Evolucija ne radi. Pre nego Å¡to nastavite, proverite da li ste zatvorili sve prozore u kojima ste radili. Ukoliko Å¾elite da se Evolucija sama pokrene nakon zavrÅ¡etka procedure, oznaÄ?ite ovu opciju."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:9
+msgid ""
+"To backup your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding."
+msgstr ""
 
-#: ../plugins/bbdb/bbdb.c:686
-#: ../plugins/bbdb/bbdb.c:695
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
+msgid ""
+"To restore your data and settings, you must first close Evolution. Please "
+"make sure that you save any unsaved data before proceeding. This will delete "
+"all your current Evolution data and settings and restore them from your "
+"backup."
+msgstr ""
+
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
 msgid "Create _address book entries when sending mails"
 msgstr "Pravi unose u _adresar pri slanju poÅ¡te"
 
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Instant Messaging Contacts"
 msgstr "Brze poruke"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+#| msgid "Synchronize contact info and images from Pidgin buddy list"
+msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "UsklaÄ?uje podatke o kontaktima i slikama sa listom drugara u PidÅ¾inu"
 
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za Pidgin listu prijatelja"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -16234,34 +16860,37 @@ msgstr "BBDB"
 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 lists."
+"Automatically fills your address book with names and email addresses as you "
+"reply to messages.  Also fills in IM contact information from your buddy "
+"lists."
 msgstr ""
 "OslobaÄ?a Vas teÅ¡kog rada u upravljanju adresarom.\n"
 "\n"
-"Automatski popunjava adresar imenima i adresama e-poÅ¡te kada odgovarate na poruke. TakoÄ?e popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
+"Automatski popunjava adresar imenima i adresama e-poÅ¡te kada odgovarate na "
+"poruke. TakoÄ?e popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
 #, c-format
 msgid "Bogofilter is not available. Please install it first."
 msgstr "Bogofilter nije dostupan. Prvo ga instalirajte."
 
 #. 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:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
 #, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "DoÅ¡lo je do greÅ¡ke u pripremi %s: %s."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr "Zavisan proces Bogofiltera ne reaguje, gasim..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr "Ä?ekanje na zavisan proces Bogofiltera ometeno, prekidam..."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr "Cev ka Bogofilteru je pukla, oznaka greÅ¡ke: %d."
@@ -16275,8 +16904,12 @@ msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke poÅ¡te u Unikod"
 
 #: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
-msgid "Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets."
-msgstr "Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta Ä?iji su uzrok razliÄ?iti kodni rasporedi."
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr ""
+"Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta "
+"Ä?iji su uzrok razliÄ?iti kodni rasporedi."
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
 msgid "Bogofilter Junk Filter"
@@ -16290,15 +16923,15 @@ msgstr "Opcije Bogofiltera"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtrira neÅ¾eljenu poÅ¡tu koriÅ¡Ä?enjem Bogofiltera."
 
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
 msgid "Authentication failed. Server requires correct login."
 msgstr "Autentifikacija nije uspela. Server zahteva ispravnu prijavu."
 
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
 msgid "Given URL cannot be found."
 msgstr "Datu adresu nije moguÄ?e pronaÄ?i."
 
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
 #, c-format
 msgid ""
 "Server returned unexpected data.\n"
@@ -16307,37 +16940,31 @@ msgstr ""
 "Server je dao neoÄ?ekivan odgovor.\n"
 "%d - %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Nepoznata greÅ¡ka"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
 msgid "Failed to parse server response."
 msgstr "Neuspelo Ä?itanje odgovora servera."
 
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
 msgid "Events"
 msgstr "DogaÄ?aji"
 
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
 msgid "User's calendars"
 msgstr "KorisniÄ?ki kalendari"
 
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
 msgid "Failed to get server URL."
 msgstr "Neuspelo dobijanje adrese servera."
 
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
 msgid "Searching for user's calendars..."
 msgstr "TraÅ¾enje korisniÄ?kih kalendara..."
 
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
 msgid "Could not find any user calendar."
 msgstr "Nije moguÄ?e pronaÄ?i nijedan kalendar."
 
@@ -16351,67 +16978,64 @@ msgstr "Prethodni pokuÅ¡aj nije uspeo: %s"
 msgid "Previous attempt failed with code %d"
 msgstr "Prethodni pokuÅ¡aj nije uspeo, kod %d"
 
-#: ../plugins/caldav/caldav-browse-server.c:799
-#, c-format
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#: ../plugins/caldav/caldav-browse-server.c:801
+#, fuzzy, c-format
+#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
 msgstr "Unesite lozinku za korisnika <b>%s</b> na serveru <b>%s</b>"
 
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
 msgstr "Nije moguÄ?e pravljenje soup poruke za adresu â??%sâ??"
 
 #. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
 msgid "Searching folder content..."
 msgstr "TraÅ¾enje sadrÅ¾aja fascikle..."
 
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
 msgid "List of available calendars:"
 msgstr "Spisak dostupnih kalendara:"
 
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
 msgid "Supports"
 msgstr "PodrÅ¡ke"
 
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
 #, c-format
 msgid "Failed to create thread: %s"
 msgstr "Nije uspelo pravljenje niza: %s"
 
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
 #, c-format
 msgid "Server URL '%s' is not a valid URL"
 msgstr "Adresa servera â??%sâ?? nije ispravna"
 
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
 msgid "Browse for a CalDAV calendar"
 msgstr "Traga za CalDAV kalendarom"
 
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
 msgid "_URL:"
 msgstr "_Adresa :"
 
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
 msgid "Use _SSL"
 msgstr "Koristi Å¡ifrovanu vezu"
 
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
 msgid "Brows_e server for a calendar"
 msgstr "Po_traÅ¾i kalendar na serveru"
 
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
 msgid "Re_fresh:"
 msgstr "O_sveÅ¾i:"
 
@@ -16423,34 +17047,34 @@ msgstr "Dodaje podrÅ¡ku za CalDAV u Evoluciju."
 msgid "CalDAV Support"
 msgstr "PodrÅ¡ka za CalDAV"
 
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
 msgid "_Customize options"
 msgstr "_Prilagodi opcije"
 
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
 msgid "File _name:"
 msgstr "_Ime datoteke:"
 
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
 msgid "Choose calendar file"
 msgstr "Izaberite datoteku kalendara"
 
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
 msgid "On open"
 msgstr "Pri otvaranju"
 
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
 msgid "On file change"
 msgstr "Kod izmene datoteke"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
 msgid "Periodically"
 msgstr "PeriodiÄ?no"
 
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
 msgid "Force read _only"
 msgstr "Forsira _samo za Ä?itanje"
 
@@ -16462,11 +17086,11 @@ msgstr "Dodaje lokalne kalendare u Evoluciju."
 msgid "Local Calendars"
 msgstr "Lokalni kalendari"
 
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
 msgid "_Secure connection"
 msgstr "_Koristi sigurnu vezu"
 
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
 msgid "Userna_me:"
 msgstr "KorisniÄ?ko_ime:"
 
@@ -16514,7 +17138,7 @@ msgstr "Vreme: vedra noÄ?"
 msgid "Weather: Thunderstorms"
 msgstr "Vreme: grmljavine"
 
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
 msgid "Select a location"
 msgstr "Izaberite mesto"
 
@@ -16524,21 +17148,21 @@ msgstr "Izaberite mesto"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
 msgctxt "weather-cal-location"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
 msgid "_Units:"
 msgstr "_Jedinice:"
 
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
 msgid "Metric (Celsius, cm, etc)"
 msgstr "MetriÄ?ne (Celzijus, cm, itd.)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "Imperijalne (Farenhajt, inÄ?i, itd.)"
 
@@ -16567,43 +17191,53 @@ msgstr "Dodaje kartu sa lokacijom kontakta, kada je moguÄ?e."
 msgid "Map for contacts"
 msgstr "Karta za kontakte"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "Proveri da li je Evolucija podrazumevani program za poÅ¡tu"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#, fuzzy
+#| msgid "Select folder to import into"
+msgid "Select folder to import OE folder into"
+msgstr "Izaberite fasciklu za uvoz"
 
-#: ../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."
-msgstr "Svaki put kada se Evolucija pokrene, proveri da li je podrazumevani program za poÅ¡tu."
+#: ../plugins/dbx-import/dbx-importer.c:251
+#, fuzzy
+#| msgid "Importing Outlook data"
+msgid "Importing Outlook Express data"
+msgstr "UvoÅ¾enje Outlook podataka"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "Pri pokretanju proverava da li je Evolucija podrazumevani klijent za poÅ¡tu."
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+#| msgid "Import Outlook messages from PST file"
+msgid "Import Outlook Express messages from DBX file"
+msgstr "Uvozi Outlook poruke iz datoteke PST"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "Podrazumevani klijent za poÅ¡tu "
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+#| msgid "Outlook PST import"
+msgid "Outlook DBX import"
+msgstr "Outlook PST uvoz"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "Å½elite li da Evoluciju uÄ?inite podrazumevanim klijentom e-poÅ¡te?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+#| msgid "Outlook personal folders (.pst)"
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "LiÄ?ne fascikle Outlook (.pst)"
 
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
 msgid "Mark as _default address book"
 msgstr "OznaÄ?ava kao _podrazumevan adresar"
 
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
 msgid "A_utocomplete with this address book"
 msgstr "Samo_dopuni ovim adresarom"
 
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
 msgid "Mark as _default calendar"
 msgstr "OznaÄ?ava kao _podrazumevan kalendar"
 
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
 msgid "Mark as _default task list"
 msgstr "OznaÄ?ava kao _podrazumevan spisak zadataka"
 
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
 msgid "Mark as _default memo list"
 msgstr "OznaÄ?ava kao _podrazumevan spisak beleÅ¡ki"
 
@@ -16620,8 +17254,14 @@ msgid "List of Custom Headers"
 msgstr "Spisak prilagoÄ?enih zaglavlja"
 
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:2
-msgid "The key specifies the list of custom headers that you can add to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by \"=\" and the values separated by \";\""
-msgstr "KljuÄ? navodi spisak prilagoÄ?enih zaglavlja koje moÅ¾ete dodati odlaznoj poruci. Format za navoÄ?enje zaglavlja i njegove vrednosti je: naziv prilagoÄ?enog zaglavlja, zatim â??=â?? i vrednosti odvojene sa â??;â??"
+msgid ""
+"The key specifies the list of custom headers that you can add to an outgoing "
+"message. The format for specifying a Header and Header value is: Name of the "
+"custom header followed by \"=\" and the values separated by \";\""
+msgstr ""
+"KljuÄ? navodi spisak prilagoÄ?enih zaglavlja koje moÅ¾ete dodati odlaznoj poruci. "
+"Format za navoÄ?enje zaglavlja i njegove vrednosti je: naziv prilagoÄ?enog "
+"zaglavlja, zatim â??=â?? i vrednosti odvojene sa â??;â??"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
 msgid "Security:"
@@ -16656,12 +17296,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
 msgid "_Custom Header"
 msgstr "_PrilagoÄ?eno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16669,12 +17309,12 @@ msgstr ""
 "Format za navoÄ?enje kljuÄ?a prilagoÄ?enog zaglavlja je:\n"
 "Vrednosti naziv kljuÄ?a prilagoÄ?enog zaglavlja su razdvojeni sa â??;â??."
 
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
 msgid "Key"
 msgstr "KljuÄ?"
 
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -16693,10 +17333,11 @@ msgstr "PrilagoÄ?eno zaglavlje e-poÅ¡te"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
-msgstr "Automatski pokreni ureÄ?ivaÄ? kada je pritisnut taster u sastavljaÄ?u poruke"
+msgstr ""
+"Automatski pokreni ureÄ?ivaÄ? kada je pritisnut taster u sastavljaÄ?u poruke"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatski pokreni pri ureÄ?ivanju nove poruke"
 
@@ -16708,11 +17349,11 @@ msgstr "Podrazumevani drugi ureÄ?ivaÄ?"
 msgid "The default command that must be used as the editor."
 msgstr "Podrazumevana naredba koja se koristi kao ureÄ?ivaÄ?."
 
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
 msgid "Command to be executed to launch the editor: "
 msgstr "Naredba za izvrÅ¡avanje radi pokretanja ureÄ?ivaÄ?a:"
 
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
 msgid ""
 "For Emacs use \"xemacs\"\n"
 "For VI use \"gvim -f\""
@@ -16720,8 +17361,8 @@ msgstr ""
 "Za Emaks koristite â??xemacsâ??\n"
 "Za VI koristite â??gvim -fâ??"
 
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
 msgid "Compose in External Editor"
 msgstr "Sastavlja u spoljnom ureÄ?ivaÄ?u"
 
@@ -16742,28 +17383,44 @@ msgid "Editor not launchable"
 msgstr "UreÄ?ivaÄ? se ne pokreÄ?e"
 
 #: ../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."
-msgstr "Evolucija nije mogla da napravi privremenu datoteku za Ä?uvanje poÅ¡te. PokuÅ¡ajte kasnije."
+msgid ""
+"Evolution is unable to create a temporary file to save your mail. Retry "
+"later."
+msgstr ""
+"Evolucija nije mogla da napravi privremenu datoteku za Ä?uvanje poÅ¡te. "
+"PokuÅ¡ajte kasnije."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
 msgid "External editor still running"
 msgstr "Spoljni ureÄ?ivaÄ? je joÅ¡ aktivan"
 
 #: ../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 "Pokrenut je spoljni ureÄ?ivaÄ?. Prozor sastavljaÄ?a poruke nije moguÄ?e zatvoriti dok je aktivan ureÄ?ivaÄ?."
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+"Pokrenut je spoljni ureÄ?ivaÄ?. Prozor sastavljaÄ?a poruke nije moguÄ?e zatvoriti "
+"dok je aktivan ureÄ?ivaÄ?."
 
 #: ../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."
-msgstr "UreÄ?ivaÄ? koje ste naveli u postavkama dodatka nije moguÄ?e pokrenuti. PokuÅ¡ajte da navedete drugi ureÄ?ivaÄ?."
+msgid ""
+"The external editor set in your plugin preferences cannot be launched. Try "
+"setting a different editor."
+msgstr ""
+"UreÄ?ivaÄ? koje ste naveli u postavkama dodatka nije moguÄ?e pokrenuti. "
+"PokuÅ¡ajte da navedete drugi ureÄ?ivaÄ?."
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
 msgstr "Podrazumevano umeÄ?e sliku kontakta"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
-msgid "Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens."
-msgstr "Da li da podrazumevano umeÄ?e sliku kontakta u poruke. Pre ovoga je potrebno postaviti sliku, inaÄ?e se niÅ¡ta neÄ?e desiti."
+msgid ""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
+msgstr ""
+"Da li da podrazumevano umeÄ?e sliku kontakta u poruke. Pre ovoga je potrebno "
+"postaviti sliku, inaÄ?e se niÅ¡ta neÄ?e desiti."
 
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
@@ -16781,7 +17438,7 @@ msgstr "_Umetni sliku kontakta podrazumevano"
 msgid "Load new _Face picture"
 msgstr "UÄ?itaj novu _sliku kontakta"
 
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
 msgid "Include _Face"
 msgstr "UkljuÄ?i _sliku"
 
@@ -16813,22 +17470,20 @@ msgstr "Datoteku nije moguÄ?e proÄ?itati"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Izabrana datoteka izgleda nije ispravnog formata .png. GreÅ¡ka: {0}"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>Server</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#, fuzzy
+#| msgid "_Server:"
+msgid "Server"
+msgstr "S_erver:"
 
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
-msgstr "Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
+msgstr ""
+"Unesite lozinku za korisnika %s radi pristupa listi prijavljenih kalendara."
 
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -16837,18 +17492,20 @@ msgstr ""
 "Nije moguÄ?e proÄ?itati podatke sa servera Google.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
 msgid "Unknown error."
 msgstr "Nepoznata greÅ¡ka."
 
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
 msgid "Cal_endar:"
 msgstr "Kal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#, fuzzy
+#| msgid "Retrieve _list"
+msgid "Retrieve _List"
 msgstr "Dovuci _listu"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16859,7 +17516,7 @@ msgstr "Dodaje Google kalendare u Evoluciju."
 msgid "Google Calendars"
 msgstr "Google kalendari"
 
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
 msgid "Checklist"
 msgstr "Spisak"
 
@@ -16891,12 +17548,12 @@ msgstr "Prihvati uz rezervu"
 msgid "Rese_nd Meeting..."
 msgstr "Ponovo _Å¡alji sastanak..."
 
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
 msgid "Create folder"
 msgstr "Napravi fasciklu"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
 #, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
@@ -16921,19 +17578,19 @@ msgstr ""
 "Kliknite â??Primeniâ?? za instalaciju deljene fascikle\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
 msgid "Install the shared folder"
 msgstr "Instaliraj deljenu fasciklu"
 
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
 msgid "Shared Folder Installation"
 msgstr "Instalacija deljene fascikle"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "Postavke za Ä?ubre"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
 #: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "Postavke poÅ¡te za Ä?ubre"
@@ -16946,11 +17603,6 @@ msgstr "E-poÅ¡ta:"
 msgid "Junk List:"
 msgstr "Spisak Ä?ubreta:"
 
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "_OnemoguÄ?i"
-
 #: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "_OmoguÄ?i"
@@ -16969,11 +17621,15 @@ msgstr "_Ukloni"
 msgid "Message Retract"
 msgstr "PovlaÄ?enje poruke"
 
-#: ../plugins/groupwise-features/mail-retract.c:86
-msgid "Retracting a message may remove it from the recipient's mailbox. Are you sure you want to do this?"
-msgstr "PovlaÄ?enje poruke je moÅ¾e ukloniti iz sanduÄ?eta primaoca. Å½elite li ovo da uradite? "
+#: ../plugins/groupwise-features/mail-retract.c:90
+msgid ""
+"Retracting a message may remove it from the recipient's mailbox. Are you "
+"sure you want to do this?"
+msgstr ""
+"PovlaÄ?enje poruke je moÅ¾e ukloniti iz sanduÄ?eta primaoca. Å½elite li ovo da "
+"uradite? "
 
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
 msgid "Message retracted successfully"
 msgstr "Poruka povuÄ?ena uspeÅ¡no"
 
@@ -17016,8 +17672,12 @@ msgid "Invalid user"
 msgstr "Neispravan korisnik"
 
 #: ../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 "Prijava na posrednika kao &quot;{0}&quot; nije bila uspeÅ¡na. Proverite adresu e-poÅ¡te i pokuÅ¡ajte ponovo."
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+"Prijava na posrednika kao &quot;{0}&quot; nije bila uspeÅ¡na. Proverite "
+"adresu e-poÅ¡te i pokuÅ¡ajte ponovo."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
@@ -17039,11 +17699,13 @@ msgstr "VeÄ? imate ovlaÅ¡Ä?enja za posrednika za ovog korisnika."
 #. 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.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
-msgstr "Morate navesti ispravno korisniÄ?ko ime za davanje prava pristupa posredniku."
+msgstr ""
+"Morate navesti ispravno korisniÄ?ko ime za davanje prava pristupa posredniku."
 
 #: ../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 "Ne moÅ¾ete podeliti ovu fasciklu sa navedenim korisnikom user &quot;{0}&quot;"
+msgstr ""
+"Ne moÅ¾ete podeliti ovu fasciklu sa navedenim korisnikom user &quot;{0}&quot;"
 
 #: ../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"
@@ -17071,11 +17733,16 @@ msgstr "Ovaj sastanak se ponavlja"
 
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
 msgid "This will create a new meeting using the existing meeting details."
-msgstr "Ovo Ä?e napraviti novi sastanak koriÅ¡Ä?enjem detalja postojeÄ?ih sastanaka. "
+msgstr ""
+"Ovo Ä?e napraviti novi sastanak koriÅ¡Ä?enjem detalja postojeÄ?ih sastanaka. "
 
 #: ../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 "Ovo Ä?e napraviti novi sastanak sa detaljima postojeÄ?ih sastanaka. Pravilo za ponavljanje morate uneti ponovo."
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+"Ovo Ä?e napraviti novi sastanak sa detaljima postojeÄ?ih sastanaka. Pravilo za "
+"ponavljanje morate uneti ponovo."
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
 #: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
@@ -17088,25 +17755,27 @@ msgid "Would you like to decline it?"
 msgstr "Odbijate?"
 
 #: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>Korisnici:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "_Prilagodi poruku za podseÄ?anje"
 
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "Con_tacts..."
 msgstr "Kon_takti..."
 
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
 msgid "Shared Folder Notification"
 msgstr "ObaveÅ¡tenje o deljenoj fascikli"
 
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
 msgid "The participants will receive the following notification.\n"
 msgstr "UÄ?esnici Ä?e primiti sledeÄ?e obaveÅ¡tenje.\n"
 
+#: ../plugins/groupwise-features/properties.ui.h:9
+#, fuzzy
+#| msgid "Users"
+msgid "Users:"
+msgstr "Korisnici"
+
 #: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "_Nije deljeno"
@@ -17166,50 +17835,61 @@ msgid "Proxy"
 msgstr "MreÅ¾ni posrednik"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>Ime naloga</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "Ime naloga"
 
 #: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "Prijava za mreÅ¾nog posrednika"
 
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite lozinku za %s (korisnik %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.c:692
+#: ../plugins/groupwise-features/proxy.c:689
 msgid "The Proxy tab will be available only when the account is online."
-msgstr "JeziÄ?ak za mreÅ¾nog posrednika Ä?e biti dostupan samo kada nalog bude na mreÅ¾i."
+msgstr ""
+"JeziÄ?ak za mreÅ¾nog posrednika Ä?e biti dostupan samo kada nalog bude na mreÅ¾i."
 
 #. 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 "JeziÄ?ak za mreÅ¾nog posrednika Ä?e biti dostupan samo kada nalog bude omoguÄ?en."
+msgstr ""
+"JeziÄ?ak za mreÅ¾nog posrednika Ä?e biti dostupan samo kada nalog bude omoguÄ?en."
+
+#. 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:700
+#, fuzzy
+#| msgid "Proxy"
+msgctxt "GW"
+msgid "Proxy"
+msgstr "MreÅ¾ni posrednik"
 
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
 msgid "Add User"
 msgstr "Dodaje korisnika"
 
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
 msgid "Advanced send options"
 msgstr "Napredne opcije slanja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
 msgid "Users"
 msgstr "Korisnici"
 
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
 msgid "Enter the users and set permissions"
 msgstr "Unesite korisnike i postavite ovlaÅ¡Ä?enja"
 
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
 msgid "Sharing"
 msgstr "Deljenje"
 
@@ -17217,67 +17897,59 @@ msgstr "Deljenje"
 msgid "Custom Notification"
 msgstr "PrilagoÄ?eno obaveÅ¡tenje"
 
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
 msgid "Add   "
 msgstr "Dodaj "
 
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Status poruke"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Naslov:"
 
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "Å alje:"
 
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Datum pravljenja:"
 
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
 msgid "Recipient: "
 msgstr "Primalac:"
 
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
 msgid "Delivered: "
 msgstr "IsporuÄ?eno:"
 
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
 msgid "Opened: "
 msgstr "Otvoreno:"
 
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
 msgid "Accepted: "
 msgstr "PrihvaÄ?eno:"
 
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
 msgid "Deleted: "
 msgstr "Obrisano:"
 
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
 msgid "Declined: "
 msgstr "Odbijeno:"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
 msgid "Completed: "
 msgstr "ZavrÅ¡eno:"
 
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
 msgid "Undelivered: "
 msgstr "NeisporuÄ?eno:"
 
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr "Dodaje podrÅ¡ku za Hula u Evoluciju."
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "PodrÅ¡ka za Hula"
-
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
 msgstr "UnutraÅ¡nja slika"
@@ -17286,12 +17958,12 @@ msgstr "UnutraÅ¡nja slika"
 msgid "View image attachments directly in mail messages."
 msgstr "Pregled priloga sa slikama direktno u porukama."
 
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "PrilagoÄ?ena zaglavlja"
 
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP zaglavlja"
@@ -17302,10 +17974,12 @@ msgstr "Osnovna i zaglavlja _Dopisnih lista (Podrazumevano)"
 
 #: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
-"Give the extra headers that you need to fetch in addition to the above standard headers. \n"
+"Give the extra headers that you need to fetch in addition to the above "
+"standard headers. \n"
 "You can ignore this if you choose \"All Headers\"."
 msgstr ""
-"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim zaglavljima. \n"
+"Pokazuje dodatna zaglavlja koja je potrebno preuzeti zajedno sa standardnim "
+"zaglavljima. \n"
 "Izborom â??Sva zaglavljaâ?? ovo moÅ¾ete ignorisati."
 
 #: ../plugins/imap-features/imap-headers.ui.h:6
@@ -17336,34 +18010,37 @@ msgstr "Fino podesite IMAP naloge."
 msgid "IMAP Features"
 msgstr "IMAP moguÄ?nosti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:486
-#, c-format
-msgid "Failed to load the calendar '%s'"
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
+#, fuzzy, c-format
+#| msgid "Failed to load the calendar '%s'"
+msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Nije moguÄ?e otvaranje kalendara â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Jedno zakazivanje u kalendaru â??%sâ?? je u isto vreme kad i ovaj sastanak"
 
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Zakazivanje je pronaÄ?eno u kalendaru â??%sâ??"
 
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
 msgid "Unable to find any calendars"
 msgstr "Nije moguÄ?e pronaÄ?i nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
 msgid "Unable to find this meeting in any calendar"
 msgstr "Nije moguÄ?e pronaÄ?i ovaj sastanak ni u jednom kalendaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
 msgid "Unable to find this task in any task list"
 msgstr "Nije moguÄ?e pronaÄ?i ovaj zadatak ni u jednom spisku zadataka"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleÅ¡ki ne sadrÅ¾i ovu beleÅ¡ku"
 
@@ -17470,7 +18147,9 @@ msgstr "PriloÅ¾en kalendar nije ispravan"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1588
 #: ../plugins/itip-formatter/itip-formatter.c:1599
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "Poruka prijavljuje kalendar, ali taj kalendar nije ispravan iKalendar."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1639
@@ -17482,90 +18161,97 @@ msgstr "Stavka u kalendaru nije ispravna"
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 #: ../plugins/itip-formatter/itip-formatter.c:1668
 #: ../plugins/itip-formatter/itip-formatter.c:1774
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "Poruka sadrÅ¾i kalendar, ali on ne sadrÅ¾i dogaÄ?aje, zadatke ili slobodno/zauzeto podatke."
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"Poruka sadrÅ¾i kalendar, ali on ne sadrÅ¾i dogaÄ?aje, zadatke ili slobodno/"
+"zauzeto podatke."
 
 #: ../plugins/itip-formatter/itip-formatter.c:1681
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrÅ¾i viÅ¡e stavki"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1682
-msgid "To process all of these items, the file should be saved and the calendar imported"
-msgstr "Radi obrade svih ovih stavki, potrebno je datoteku saÄ?uvati a kalendar uvesti"
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
+msgstr ""
+"Radi obrade svih ovih stavki, potrebno je datoteku saÄ?uvati a kalendar uvesti"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
 msgid "This meeting recurs"
 msgstr "Ovaj se sastanak ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
 msgid "This task recurs"
 msgstr "Ovaj se zadatak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
 msgid "This memo recurs"
 msgstr "Ova se beleÅ¡ka ponavlja"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
 msgid "_Delete message after acting"
 msgstr "_ObriÅ¡i poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
 msgid "Conflict Search"
 msgstr "Tabela pretrage za preklapanjima"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
 msgstr "Danas %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
 msgstr "Danas %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
 msgstr "Danas %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
 msgstr "Sutra %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %H:%M:%S"
 msgstr "Sutra %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
 msgstr "Sutra %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -17575,69 +18261,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -17647,350 +18333,417 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+#, fuzzy, c-format
+#| msgid "Please respond on behalf of <b>%s</b>"
+msgid "Please respond on behalf of %s"
 msgstr "Odgovorite u ime <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+#| msgid "Received on behalf of <b>%s</b>"
+msgid "Received on behalf of %s"
 msgstr "Primljeno u ime <b>%s</b>"
 
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has published the following meeting information:"
+msgid "%s through %s has published the following meeting information:"
 msgstr "<b>%s</b> preko %s objavljuje sledeÄ?i podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following meeting information:"
+msgid "%s has published the following meeting information:"
 msgstr "<b>%s</b> objavljuje sledeÄ?i podatak o sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:369
-#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
+#: ../plugins/itip-formatter/itip-view.c:381
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has delegated the following meeting to you:"
+msgid "%s has delegated the following meeting to you:"
 msgstr "<b>%s</b> Vam delegira sledeÄ?i sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:384
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s requests your presence at the following meeting:"
+msgid "%s through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> preko %s zahteva VaÅ¡e prisustvo na sledeÄ?em sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests your presence at the following meeting:"
+msgid "%s requests your presence at the following meeting:"
 msgstr "<b>%s</b> zahteva VaÅ¡e prisustvo na sledeÄ?em sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:380
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:392
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> preko %s Å¾eli da doda postojeÄ?em sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+msgid "%s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> Å¾eli da doda postojeÄ?em sastanku:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> preko %s Å¾eli da primi najnovije informacije za sledeÄ?i sastanak:"
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following meeting:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
+msgstr ""
+"<b>%s</b> preko %s Å¾eli da primi najnovije informacije za sledeÄ?i sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "meeting:"
+msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> Å¾eli da primi najnoviji podatak za sledeÄ?i sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:392
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:404
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgid "%s through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> preko %s Å¡alje sledeÄ?i odgovor za sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:394
-#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following meeting response:"
+msgid "%s has sent back the following meeting response:"
 msgstr "<b>%s</b> Å¡alje sledeÄ?i odgovor za sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:398
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+msgid "%s through %s has canceled the following meeting:"
 msgstr "<b>%s</b> preko %s otkazuje sledeÄ?i sastanak:"
 
-#: ../plugins/itip-formatter/itip-view.c:400
-#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following meeting."
+msgid "%s has canceled the following meeting."
 msgstr "<b>%s</b> otkazuje sledeÄ?i sastanak."
 
-#: ../plugins/itip-formatter/itip-view.c:404
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:416
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgid "%s through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> preko %s predlaÅ¾e sledeÄ?e promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:406
-#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following meeting changes."
+msgid "%s has proposed the following meeting changes."
 msgstr "<b>%s</b> predlaÅ¾e sledeÄ?e promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:410
-#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#: ../plugins/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+msgid "%s through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> preko %s odbija sledeÄ?e promene sastanka:"
 
-#: ../plugins/itip-formatter/itip-view.c:412
-#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following meeting changes."
+msgid "%s has declined the following meeting changes."
 msgstr "<b>%s</b> odbija sledeÄ?e promene sastanka."
 
-#: ../plugins/itip-formatter/itip-view.c:450
-#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:462
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following task:"
+msgid "%s through %s has published the following task:"
 msgstr "<b>%s</b> preko %s objavljuje sledeÄ?i zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:452
-#, c-format
-msgid "<b>%s</b> has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following task:"
+msgid "%s has published the following task:"
 msgstr "<b>%s</b> objavi sledeÄ?e zaduÅ¾enje:"
 
-#: ../plugins/itip-formatter/itip-view.c:457
-#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#: ../plugins/itip-formatter/itip-view.c:469
+#, fuzzy, c-format
+#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+msgid "%s requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> zahteva da %s preuzme sledeÄ?i zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:460
-#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:472
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has assigned you a task:"
+msgid "%s through %s has assigned you a task:"
 msgstr "<b>%s</b> preko %s Vam dodeljuje zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:462
-#, c-format
-msgid "<b>%s</b> has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has assigned you a task:"
+msgid "%s has assigned you a task:"
 msgstr "<b>%s</b> Vam dodeljuje zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:468
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:480
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+msgid "%s through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> preko %s Å¾eli da doda postojeÄ?em zadatku:"
 
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing task:"
+msgid "%s wishes to add to an existing task:"
 msgstr "<b>%s</b Å¾eli da doda postojeÄ?em zadatku:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
-msgid "<b>%s</b> through %s wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> preko %s Å¾eli da dobije najnovije informacije za sledeÄ?i dodeljeni zadatak:"
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s wishes to receive the latest information for the "
+#| "following assigned task:"
+msgid ""
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
+msgstr ""
+"<b>%s</b> preko %s Å¾eli da dobije najnovije informacije za sledeÄ?i dodeljeni "
+"zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:476
-#, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
-msgstr "<b>%s</b> Å¾eli da dobije najnovije informacije za sledeÄ?i dodeljeni zadatak:"
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> wishes to receive the latest information for the following "
+#| "assigned task:"
+msgid ""
+"%s wishes to receive the latest information for the following assigned task:"
+msgstr ""
+"<b>%s</b> Å¾eli da dobije najnovije informacije za sledeÄ?i dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:480
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:492
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has sent back the following assigned task response:"
+msgid "%s through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> preko %s vraÄ?a sledeÄ?i odgovor na dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has sent back the following assigned task response:"
+msgid "%s has sent back the following assigned task response:"
 msgstr "<b>%s</b> Å¡alje nazad sledeÄ?i odgovor na dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:486
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:498
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+msgid "%s through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> preko %s otkazuje sledeÄ?i dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following assigned task:"
+msgid "%s has canceled the following assigned task:"
 msgstr "<b>%s</b> otkazuje sledeÄ?i dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:492
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:504
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> preko %s predlaÅ¾e sledeÄ?e promene u dodeli zadatka:"
 
-#: ../plugins/itip-formatter/itip-view.c:494
-#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+msgid "%s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> predlaÅ¾e sledeÄ?e promene u dodeli zadatka:"
 
-#: ../plugins/itip-formatter/itip-view.c:498
-#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:510
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+msgid "%s through %s has declined the following assigned task:"
 msgstr "<b>%s</b> preko %s odbija sledeÄ?i dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:500
-#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has declined the following assigned task:"
+msgid "%s has declined the following assigned task:"
 msgstr "<b>%s</b> odbija sledeÄ?i dodeljeni zadatak:"
 
-#: ../plugins/itip-formatter/itip-view.c:537
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has published the following memo:"
+msgid "%s through %s has published the following memo:"
 msgstr "<b>%s</b> preko %s objavljuje sledeÄ?u beleÅ¡ku:"
 
-#: ../plugins/itip-formatter/itip-view.c:539
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has published the following memo:"
+msgid "%s has published the following memo:"
 msgstr "<b>%s</b> objavljuje sledeÄ?u beleÅ¡ku:"
 
-#: ../plugins/itip-formatter/itip-view.c:544
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:556
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+msgid "%s through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> preko %s Å¾eli da doda postojeÄ?oj beleÅ¡ci:"
 
-#: ../plugins/itip-formatter/itip-view.c:546
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+#| msgid "<b>%s</b> wishes to add to an existing memo:"
+msgid "%s wishes to add to an existing memo:"
 msgstr "<b>%s</b> Å¾eli da doda postojeÄ?oj beleÅ¡ci:"
 
-#: ../plugins/itip-formatter/itip-view.c:550
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:562
+#, fuzzy, c-format
+#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+msgid "%s through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> preko %s otkazuje sledeÄ?u deljenu beleÅ¡ku:"
 
-#: ../plugins/itip-formatter/itip-view.c:552
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+#| msgid "<b>%s</b> has canceled the following shared memo:"
+msgid "%s has canceled the following shared memo:"
 msgstr "<b>%s</b> otkazuje sledeÄ?e deljenu beleÅ¡ku:"
 
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
 msgid "Start day:"
 msgstr "PoÄ?etak dana:"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
 msgid "Start time:"
 msgstr "Vreme poÄ?etka:"
 
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
 msgid "End day:"
 msgstr "Kraj dana:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
 msgid "End time:"
 msgstr "Vreme zavrÅ¡etka:"
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Open Calendar"
 msgstr "_Otvori kalendar"
 
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
 #: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "Pri_hvati"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#, fuzzy
+#| msgid "Accept"
+msgid "A_ccept"
+msgstr "Prihvati"
 
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#, fuzzy
+#| msgid "_Accept all"
+msgid "A_ccept all"
 msgstr "P_rihvati sve"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
 msgid "_Send Information"
 msgstr "PoÅ¡alji podat_ke"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Update Attendee Status"
 msgstr "AÅ¾uriraj stanje uÄ?esni_ka"
 
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
 msgid "_Update"
 msgstr "_AÅ¾uriraj"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
 msgid "Send _reply to sender"
 msgstr "_Odgovori poÅ¡iljaocu"
 
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
 msgid "Send _updates to attendees"
 msgstr "PoÅ¡alji _aÅ¾urirane podatke uÄ?esnicima"
 
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
 msgid "Show time as _free"
 msgstr "PrikaÅ¾i vreme kao _slobodno"
 
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
 msgid "_Preserve my reminder"
 msgstr "_OÄ?uvaj moj podsetnik"
 
 #. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Tasks:"
 msgstr "Za_daci:"
 
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
 msgid "_Memos:"
 msgstr "_BeleÅ¡ke:"
 
@@ -18003,15 +18756,22 @@ msgid "Itip Formatter"
 msgstr "Itip formatiranje"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot;?"
-msgstr "&quot;{0}&quot; delegira sastanak. Å½elite li da dodate delegata &quot;{1}&quot; ?"
+#, fuzzy
+#| msgid ""
+#| "&quot;{0}&quot; has delegated the meeting. Do you want to add the "
+#| "delegate &quot;{1}&quot;?"
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
+msgstr ""
+"&quot;{0}&quot; delegira sastanak. Å½elite li da dodate delegata &quot;{1}"
+"&quot; ?"
 
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
 msgstr "Ovaj sastanak je delegiran"
 
-#: ../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?"
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "Ovaj odgovor nije poslao prisutan uÄ?esnik. Dodati ga u prisutne?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
@@ -18035,8 +18795,12 @@ msgid "Generates a D-Bus message when new mail messages arrive."
 msgstr "Stvara D-BUS poruku kada stigne nova poÅ¡ta."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "If \"true\", then beep, otherwise will play sound file when new messages arrive."
-msgstr "Svirne ako je postavljeno na â??trueâ?? (taÄ?no), a inaÄ?e puÅ¡ta zvuÄ?nu datoteku kada stigne nova poruka."
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Svirne ako je postavljeno na â??trueâ?? (taÄ?no), a inaÄ?e puÅ¡ta zvuÄ?nu datoteku "
+"kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Notify new messages for Inbox only."
@@ -18048,7 +18812,9 @@ msgstr "PuÅ¡ta zvuk kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Play themed sound when new messages arrive, if not in beep mode."
-msgstr "PuÅ¡ta zvuk teme kada stigne nova poruka, ukoliko nije ukljuÄ?eno obaveÅ¡tenje sirenom."
+msgstr ""
+"PuÅ¡ta zvuk teme kada stigne nova poruka, ukoliko nije ukljuÄ?eno obaveÅ¡tenje "
+"sirenom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
@@ -18056,7 +18822,8 @@ msgstr "IskaÄ?uÄ?a poruka sa ikonom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
-msgstr "Prikazuje ikonu za novu poÅ¡tu u obaveÅ¡tajnoj zoni kada stigne nova poruka."
+msgstr ""
+"Prikazuje ikonu za novu poÅ¡tu u obaveÅ¡tajnoj zoni kada stigne nova poruka."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
@@ -18064,7 +18831,9 @@ msgstr "Ime datoteke za puÅ¡tanje."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
-msgstr "ZvuÄ?na datoteka za puÅ¡tanje kada stigne nova poruka, ukoliko nije ukljuÄ?eno obaveÅ¡tenje sirenom."
+msgstr ""
+"ZvuÄ?na datoteka za puÅ¡tanje kada stigne nova poruka, ukoliko nije ukljuÄ?eno "
+"obaveÅ¡tenje sirenom."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
 msgid "Use sound theme"
@@ -18086,16 +18855,15 @@ msgstr "Da li da ikona trepÄ?e ili ne."
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "Da li da obavesti o novoj poruci samo za SanduÄ?e."
 
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:369
 msgid "Evolution's Mail Notification"
 msgstr "Evolucijino obaveÅ¡tenje o poÅ¡ti"
 
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:391
 msgid "Mail Notification Properties"
 msgstr "PodeÅ¡avanja obaveÅ¡tenja o poÅ¡ti"
 
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18112,69 +18880,75 @@ msgstr[1] ""
 msgstr[2] ""
 "Primili ste %d novih poruka\n"
 "u %s."
+msgstr[3] ""
+"Primili ste %d novu poruku\n"
+"u %s."
 
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../plugins/mail-notification/mail-notification.c:539
 #, c-format
 msgid "From: %s"
 msgstr "Od: %s"
 
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:552
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:562
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "Primili ste %d novu poruku."
 msgstr[1] "Primili ste %d nove poruke."
 msgstr[2] "Primili ste %d novih poruka."
+msgstr[3] "Primili ste novu poruku."
 
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:584
+#: ../plugins/mail-notification/mail-notification.c:591
 msgid "New email"
 msgstr "Nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:652
 msgid "Show icon in _notification area"
 msgstr "Prikazuje ikonu u _obaveÅ¡tajnoj zoni"
 
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:680
 msgid "B_link icon in notification area"
 msgstr "Tre_peri ikona u obaveÅ¡tajnoj zoni "
 
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:690
 msgid "Popup _message together with the icon"
 msgstr "PrikaÅ¾i _poruku zajedno sa ikonom"
 
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:877
 msgid "_Play sound when new messages arrive"
 msgstr "_Pusti zvuk kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:906
 msgid "_Beep"
 msgstr "_Svirni"
 
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:919
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:938
 msgid "Play _file:"
 msgstr "Pusti _zvuÄ?nu datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:949
 msgid "Select sound file"
 msgstr "Bira zvuÄ?nu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:1007
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _SanduÄ?e"
 
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1016
 msgid "Generate a _D-Bus message"
 msgstr "Stvara _D-Bus poruku"
 
@@ -18187,124 +18961,215 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "ObaveÅ¡tava Vas kada stigne nova poruka."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "SaÄ?injeno iz poruke koju Å¡alje %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
 #, c-format
-msgid "Selected calendar contains event '%s' already. Would you like to edit the old event?"
-msgstr "Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aj â??%sâ??. Å½elite li da uredite stari dogaÄ?aj?"
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+"Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aj â??%sâ??. Å½elite li da uredite stari "
+"dogaÄ?aj?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
 #, c-format
-msgid "Selected task list contains task '%s' already. Would you like to edit the old task?"
-msgstr "Izabrani spisak veÄ? sadrÅ¾i zadatak â??%sâ??. Å½elite li da uredite stari zadatak?"
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+"Izabrani spisak veÄ? sadrÅ¾i zadatak â??%sâ??. Å½elite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
 #, c-format
-msgid "Selected memo list contains memo '%s' already. Would you like to edit the old memo?"
-msgstr "Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ku â??%sâ??. Å½elite li da uredite staru beleÅ¡ku?"
-
-#: ../plugins/mail-to-task/mail-to-task.c:519
-msgid "Selected calendar contains some events for the given mails already. Would you like to create new events anyway?"
-msgstr "Izabrani kalendar veÄ? sadrÅ¾i neke dogaÄ?aje za date poruke. Å½elite li ipak da napravite nove?"
-
-#: ../plugins/mail-to-task/mail-to-task.c:522
-msgid "Selected task list contains some tasks for the given mails already. Would you like to create new tasks anyway?"
-msgstr "Izabrani spisak veÄ? sadrÅ¾i neke zadatke za date poruke. Å½elite li ipak da napravite nove?"
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+"Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ku â??%sâ??. Å½elite li da uredite staru beleÅ¡ku?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:525
-msgid "Selected memo list contains some memos for the given mails already. Would you like to create new memos anyway?"
-msgstr "Izabrani spisak veÄ? sadrÅ¾i neke beleÅ¡ke za date poruke. Å½elite li ipak da napravite nove?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+"Izabrani kalendar veÄ? sadrÅ¾i neke dogaÄ?aje za date poruke. Å½elite li ipak da "
+"napravite nove?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:543
-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] "Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aj za datu poruku. Å½elite li ipak da napravite novi?"
-msgstr[1] "Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aje za date poruke. Å½elite li ipak da napravite nove?"
-msgstr[2] "Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aja za date poruke. Å½elite li ipak da napravite nove?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
+msgid ""
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+"Izabrani spisak veÄ? sadrÅ¾i neke zadatke za date poruke. Å½elite li ipak da "
+"napravite nove?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:549
-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] "Izabrani spisak veÄ? sadrÅ¾i zadatak za datu poruku. Å½elite li ipak da napravite novi?"
-msgstr[1] "Izabrani spisak veÄ? sadrÅ¾i zadatke za date poruke. Å½elite li ipak da napravite nove?"
-msgstr[2] "Izabrani spisak veÄ? sadrÅ¾i zadataka za date poruke. Å½elite li ipak da napravite nove?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
+"Izabrani spisak veÄ? sadrÅ¾i neke beleÅ¡ke za date poruke. Å½elite li ipak da "
+"napravite nove?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:555
-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] "Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ku za datu poruku. Å½elite li ipak da napravite novu?"
-msgstr[1] "Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ke za date poruke. Å½elite li ipak da napravite nove?"
-msgstr[2] "Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ki za date poruke. Å½elite li ipak da napravite nove?"
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
+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] ""
+"Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aj za datu poruku. Å½elite li ipak da "
+"napravite novi?"
+msgstr[1] ""
+"Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aje za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[2] ""
+"Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aja za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[3] ""
+"Izabrani kalendar veÄ? sadrÅ¾i dogaÄ?aj za datu poruku. Å½elite li ipak da "
+"napravite novi?"
+
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
+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] ""
+"Izabrani spisak veÄ? sadrÅ¾i zadatak za datu poruku. Å½elite li ipak da "
+"napravite novi?"
+msgstr[1] ""
+"Izabrani spisak veÄ? sadrÅ¾i zadatke za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[2] ""
+"Izabrani spisak veÄ? sadrÅ¾i zadataka za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[3] ""
+"Izabrani spisak veÄ? sadrÅ¾i zadatak za datu poruku. Å½elite li ipak da "
+"napravite novi?"
+
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
+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] ""
+"Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ku za datu poruku. Å½elite li ipak da "
+"napravite novu?"
+msgstr[1] ""
+"Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ke za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[2] ""
+"Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ki za date poruke. Å½elite li ipak da "
+"napravite nove?"
+msgstr[3] ""
+"Izabrani spisak veÄ? sadrÅ¾i beleÅ¡ku za datu poruku. Å½elite li ipak da "
+"napravite novu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "[No Summary]"
 msgstr "[Bez saÅ¾etka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraÄ?en od servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Javila se greÅ¡ka u obradi: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Nije moguÄ?e otvoriti kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:732
-msgid "Selected source is read only, thus cannot create event there. Select other source, please."
-msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti dogaÄ?aj. Izaberite drugi izvor."
+#: ../plugins/mail-to-task/mail-to-task.c:743
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr ""
+"Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti dogaÄ?aj. "
+"Izaberite drugi izvor."
 
-#: ../plugins/mail-to-task/mail-to-task.c:735
-msgid "Selected source is read only, thus cannot create task there. Select other source, please."
-msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti zadatak. Izaberite drugi izvor."
+#: ../plugins/mail-to-task/mail-to-task.c:746
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+"Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti zadatak. "
+"Izaberite drugi izvor."
 
-#: ../plugins/mail-to-task/mail-to-task.c:738
-msgid "Selected source is read only, thus cannot create memo there. Select other source, please."
-msgstr "Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti beleÅ¡ku. Izaberite drugi izvor."
+#: ../plugins/mail-to-task/mail-to-task.c:749
+msgid ""
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr ""
+"Izabrani izvor je samo za Ä?itanje, stoga ne moÅ¾ete tu napraviti beleÅ¡ku. "
+"Izaberite drugi izvor."
 
 # mail:no-copy-folder-nostore secondary
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "Nije moguÄ?e dobiti spisak izvora. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
 msgid "Create an _Event"
 msgstr "Napravi _dogaÄ?aj"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
 msgid "Create a new event from the selected message"
 msgstr "Napravi novi dogaÄ?aj od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
 msgid "Create a Mem_o"
 msgstr "Napravi beleÅ¡k_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
 msgid "Create a new memo from the selected message"
 msgstr "Napravi novu beleÅ¡ku od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
 msgid "Create a new task from the selected message"
 msgstr "Napravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
 msgid "Create a new meeting from the selected message"
 msgstr "Napravi novi sastanak od izabrane poruke"
 
@@ -18312,55 +19177,55 @@ msgstr "Napravi novi sastanak od izabrane poruke"
 msgid "Convert a mail message to a task."
 msgstr "Pretvara poruku u zadatak."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
 msgid "Get an archive of the list this message belongs to"
 msgstr "Pribavi arhivu liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _koriÅ¡Ä?enju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Pribavi podatke o koriÅ¡Ä?enju liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Javite se vlasniku dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
 msgid "_Post Message to List"
 msgstr "_PoÅ¡alji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Sastavi poruku za dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Prijavi se na dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Odjavi se sa dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -18378,11 +19243,14 @@ msgstr "Radnja nije dostupna"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"Elektronska poruka Ä?e biti poslata na adresu â??{0}â??. MoÅ¾ete poruku da poÅ¡aljete automatski, ili je prvo pogledati i izmeniti.\n"
+"Elektronska poruka Ä?e biti poslata na adresu â??{0}â??. MoÅ¾ete poruku da "
+"poÅ¡aljete automatski, ili je prvo pogledati i izmeniti.\n"
 "\n"
 "Trebalo bi da dobijete odgovor sa dopisne liste ubrzo nakon slanja poruke."
 
@@ -18399,8 +19267,12 @@ msgid "Posting not allowed"
 msgstr "Slanje nije dozvoljeno"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-msgstr "Slanje na ovu dopisnu listu nije dozvoljeno. MoÅ¾da je ova lista samo za Ä?itanje. Obratite se vlasniku liste za detalje."
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+"Slanje na ovu dopisnu listu nije dozvoljeno. MoÅ¾da je ova lista samo za "
+"Ä?itanje. Obratite se vlasniku liste za detalje."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
@@ -18408,11 +19280,13 @@ msgstr "Poslati elektronsku poruku na dopisnu listu?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. The header for this action did not contain any action that could be processed.\n"
+"The action could not be performed. The header for this action did not "
+"contain any action that could be processed.\n"
 "\n"
 "Header: {0}"
 msgstr ""
-"Radnju nije moguÄ?e izvesti. Zaglavlje za ovu radnju nije sadrÅ¾alo obradivu radnju.\n"
+"Radnju nije moguÄ?e izvesti. Zaglavlje za ovu radnju nije sadrÅ¾alo obradivu "
+"radnju.\n"
 "\n"
 "Zaglavlje: {0}"
 
@@ -18427,7 +19301,9 @@ msgstr ""
 "Zaglavlje: {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "Ova poruka ne sadrÅ¾i potrebne podatke u zaglavlju za ovu radnju."
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
@@ -18443,19 +19319,23 @@ msgid "Also mark messages in subfolders?"
 msgstr "OznaÄ?iti takoÄ?e i poruke u podfasciklama?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
-msgid "Do you want to mark messages as read in the current folder only, or in the current folder as well as all subfolders?"
-msgstr "Å½elite li da oznaÄ?ite poruke kao proÄ?itane samo u trenutnoj fascikli, ili i one u podfasciklama? "
+msgid ""
+"Do you want to mark messages as read in the current folder only, or in the "
+"current folder as well as all subfolders?"
+msgstr ""
+"Å½elite li da oznaÄ?ite poruke kao proÄ?itane samo u trenutnoj fascikli, ili i "
+"one u podfasciklama? "
 
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
 msgid "Mark Me_ssages as Read"
 msgstr "OznaÄ?i po_ruke kao proÄ?itane"
 
@@ -18514,35 +19394,43 @@ msgstr "Prednost daje tekstu"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Pregleda poruke kao obiÄ?an tekst, Ä?ak i ako sadrÅ¾e HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Show HTML if present"
 msgstr "PrikaÅ¾i HTML ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
 msgid "Let Evolution choose the best part to show."
 msgstr "Neka Evolucija izabere najbolji deo za prikaz."
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
 msgid "Show plain text if present"
 msgstr "PrikaÅ¾i obiÄ?an tekst ako postoji"
 
-#: ../plugins/prefer-plain/prefer-plain.c:202
-msgid "Show plain text part, if present, otherwise let Evolution choose the best part to show."
-msgstr "PrikaÅ¾i deo sa obiÄ?nim tekstom, ako postoji, inaÄ?e neka Evolucija izabere najbolji deo za prikaz."
+#: ../plugins/prefer-plain/prefer-plain.c:199
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+"PrikaÅ¾i deo sa obiÄ?nim tekstom, ako postoji, inaÄ?e neka Evolucija izabere "
+"najbolji deo za prikaz."
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
 msgid "Only ever show plain text"
 msgstr "IskljuÄ?ivo prikazuj obiÄ?an tekst"
 
-#: ../plugins/prefer-plain/prefer-plain.c:203
-msgid "Always show plain text part and make attachments from other parts, if requested."
-msgstr "Uvek prikazuje deo sa obiÄ?nim tekstom, prilaÅ¾uÄ?i ostale delove u poruku, po izboru."
+#: ../plugins/prefer-plain/prefer-plain.c:200
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+"Uvek prikazuje deo sa obiÄ?nim tekstom, prilaÅ¾uÄ?i ostale delove u poruku, po "
+"izboru."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "PrikaÅ¾i po_tisnute HTML delove kao priloge"
 
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
 msgid "HTML _Mode"
 msgstr "HTML _reÅ¾im"
 
@@ -18566,32 +19454,35 @@ msgstr "Outlook PST uvoz"
 msgid "Outlook personal folders (.pst)"
 msgstr "LiÄ?ne fascikle Outlook (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
 msgid "_Mail"
 msgstr "_PoÅ¡ta"
 
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "OdrediÅ¡na fascikla:"
+
 #. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
 msgid "_Address Book"
 msgstr "_Adresar"
 
 #. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
 msgid "A_ppointments"
 msgstr "Za_kazano"
 
 #. Tasks
-#: ../plugins/pst-import/pst-importer.c:330
-#: ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zadaci"
 
 #. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
 msgid "_Journal entries"
 msgstr "Unosi u _dnevnik"
 
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
 msgid "Importing Outlook data"
 msgstr "UvoÅ¾enje Outlook podataka"
 
@@ -18749,55 +19640,55 @@ msgstr "iCal"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Nije moguÄ?e objaviti kalendar: pozadinski proces viÅ¡e ne postoji"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "New Location"
 msgstr "Nova lokacija"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
 msgid "Edit Location"
 msgstr "Uredi lokaciju"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
 #, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "Ubica spama nije pronaÄ?en, kod: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
 #, c-format
 msgid "Failed to create pipe: %s"
 msgstr "Nije uspelo pravljenje cevi: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
 #, c-format
 msgid "Error after fork: %s"
 msgstr "GreÅ¡ka po izdvajanju: %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
 msgstr "Zavisan proces Ubici spama nije odgovorio, ubijam..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
 msgstr "Ä?ekanje na zavisan proces Ubice spama ometeno, prekidam..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
 msgstr "Cev ka Ubici spama je pukla, oznaka greÅ¡ke: %d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
 #, c-format
 msgid "SpamAssassin is not available. Please install it first."
 msgstr "Ubica spama nije dostupan. Prvo ga instalirajte."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "Ovo Ä?e uÄ?initi Ubicu spama pouzdanijim, ali sporijim"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
 msgid "I_nclude remote tests"
 msgstr "U_kljuÄ?i mreÅ¾ne provere"
 
@@ -18914,75 +19805,26 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF oblik (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
 msgid "Select destination file"
 msgstr "Izaberite odrediÅ¡nu datoteku"
 
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
 msgid "Save the selected calendar to disk"
 msgstr "SaÄ?uvaj izabrani kalendar na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
 msgid "Save the selected memo list to disk"
 msgstr "SaÄ?uvaj izabranu beleÅ¡ku na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
 msgid "Save the selected task list to disk"
 msgstr "SaÄ?uvaj izabrani spisak zadataka na disk"
 
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "Vodi Vas kroz prvo podeÅ¡avanje naloga."
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "PomoÄ?nik podeÅ¡avanja"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "PomoÄ?nik podeÅ¡avanja Evolucije"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "Dobro doÅ¡li"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-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"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"Dobro doÅ¡li u Evoluciju. Nekoliko narednih ekrana Ä?e omoguÄ?iti da se Evolucija poveÅ¾e na naloge eletronske poÅ¡te i da uveze datoteke iz drugih programa. \n"
-"\n"
-"Kliknite â??Napredâ?? da nastavite. "
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "Izaberite podatke koje Å¾elite da uvezete:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "Od %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "UvoÅ¾enje datoteka"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "UvoÅ¾enje podataka."
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "SaÄ?ekajte"
-
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Sort mail message threads by subject."
 msgstr "Razvrstava poruke u raspravi prema naslovu."
@@ -18996,27 +19838,31 @@ msgid "Thread messages by subject"
 msgstr "Razvrstava poruke u raspravi prema naslovu"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
 #: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
-msgid "List of keyword/value pairs for the Templates plugin to substitute in a message body."
-msgstr "Spisak parova kljuÄ?na-reÄ?/vrednost koje prikljuÄ?ak Å ablona predmeta zamenjuje u telu poruke."
+msgid ""
+"List of keyword/value pairs for the Templates plugin to substitute in a "
+"message body."
+msgstr ""
+"Spisak parova kljuÄ?na-reÄ?/vrednost koje prikljuÄ?ak Å ablona predmeta zamenjuje u "
+"telu poruke."
 
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Drafts based template plugin"
 msgstr "PrikljuÄ?ak za obrazac nacrta"
 
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
 msgid "Save as _Template"
 msgstr "SaÄ?uvaj kao _Å¡ablon"
 
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
 msgid "Save as Template"
 msgstr "Ä?uva kao Å¡ablon"
 
@@ -19036,28 +19882,29 @@ msgstr "UgnjeÅ¾dene vKarte"
 msgid "Show vCards directly in mail messages."
 msgstr "Prikazuje vKarte neposredno u porukama."
 
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
 msgid "Show Full vCard"
 msgstr "PrikaÅ¾i punu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
 msgid "Show Compact vCard"
 msgstr "PrikaÅ¾i saÅ¾etu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
 msgid "There is one other contact."
 msgstr "Postoji joÅ¡ jedan kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Postoji joÅ¡ %d kontakt."
 msgstr[1] "Postoji joÅ¡ %d kontakta."
 msgstr[2] "Postoji joÅ¡ %d kontakta."
+msgstr[3] "Postoji joÅ¡ %d kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
 msgid "Save in Address Book"
 msgstr "SaÄ?uvaj u adresar"
 
@@ -19073,11 +19920,11 @@ msgstr "WebDAV kontakti"
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
 msgid "URL:"
 msgstr "Adresa :"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "_Izbegavaj IfMatch (potrebno na ApaÄ?u < 2.2.8)"
 
@@ -19118,13 +19965,15 @@ msgid "Default window width"
 msgstr "Podrazumevana Å¡irina prozora"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:10
-#| msgid "Enable search folders"
 msgid "Enable express mode"
 msgstr "UkljuÄ?i ekspresni reÅ¾im"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:11
-msgid "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr "OmoguÄ?uje postavke posrednika kada pristupa HTTP/siguran HTTP preko Interneta."
+msgid ""
+"Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
+msgstr ""
+"OmoguÄ?uje postavke posrednika kada pristupa HTTP/siguran HTTP preko "
+"Interneta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Flag that enables a much simplified user interface."
@@ -19151,8 +20000,16 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:18
-msgid "If true, then connections to the proxy server require authentication. The username is retrieved from the \"/apps/evolution/shell/network_config/authentication_user\" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file."
-msgstr "Ako je taÄ?no, povezivanje na posrednika zahteva autentifikaciju. KorisniÄ?ko ime se Ä?ita iz kljuÄ?a GConf â??/apps/evolution/shell/network_config/authentication_userâ??, a lozinka ili iz gnome-keyring, ili datoteke lozinki ~/.gnome2_private/Evolution."
+msgid ""
+"If true, then connections to the proxy server require authentication. The "
+"username is retrieved from the \"/apps/evolution/shell/network_config/"
+"authentication_user\" GConf key, and the password is retrieved from either "
+"gnome-keyring or the ~/.gnome2_private/Evolution password file."
+msgstr ""
+"Ako je taÄ?no, povezivanje na posrednika zahteva autentifikaciju. KorisniÄ?ko "
+"ime se Ä?ita iz kljuÄ?a GConf â??/apps/evolution/shell/network_config/"
+"authentication_userâ??, a lozinka ili iz gnome-keyring, ili datoteke lozinki "
+"~/.gnome2_private/Evolution."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19167,15 +20024,20 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Polazna fascikla za prozorÄ?ad GtkFileChooser."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:22
-msgid "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List View."
-msgstr "Polazni pregled za alatke trake priloga. â??0â?? je Pregled sa ikonama, â??1â?? je Pregled u spiskovima."
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+"Polazni pregled za alatke trake priloga. â??0â?? je Pregled sa ikonama, â??1â?? je "
+"Pregled u spiskovima."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
 msgstr "Poslednja nadograÄ?ena verzija podeÅ¡avanja"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:24
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "Spisak putanja fascikli za usklaÄ?ivanje na disku za rad van mreÅ¾e"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:25
@@ -19207,8 +20069,15 @@ msgid "Secure HTTP proxy port"
 msgstr "Port sigurnog posrednika za HTTP"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
-msgid "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing \"use system settings\", \"no proxy\", \"use manual proxy configuration\" and \"use proxy configuration provided in the autoconfig url\" respectively."
-msgstr "Izaberite naÄ?in podeÅ¡avanja posrednika. PodrÅ¾ane su vrednosti 0 â??koristi sistemske postavkeâ??, 1 â??bez posrednikaâ??, 2 â??koristi ruÄ?na podeÅ¡avanja posrednikaâ?? i 3 â??koristi podeÅ¡avanja posrednika na adresiâ??."
+msgid ""
+"Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
+"representing \"use system settings\", \"no proxy\", \"use manual proxy "
+"configuration\" and \"use proxy configuration provided in the autoconfig url"
+"\" respectively."
+msgstr ""
+"Izaberite naÄ?in podeÅ¡avanja posrednika. PodrÅ¾ane su vrednosti 0 â??koristi "
+"sistemske postavkeâ??, 1 â??bez posrednikaâ??, 2 â??koristi ruÄ?na podeÅ¡avanja "
+"posrednikaâ?? i 3 â??koristi podeÅ¡avanja posrednika na adresiâ??."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
@@ -19218,8 +20087,7 @@ msgstr "BoÄ?na traka je vidljiva"
 msgid "Skip development warning dialog"
 msgstr "PreskoÄ?i prozorÄ?e sa upozorenjem o razvoju"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
-#: ../shell/main.c:326
+#: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:331
 msgid "Start in offline mode"
 msgstr "PoÄ?ni rad van mreÅ¾e"
 
@@ -19228,8 +20096,12 @@ msgid "Statusbar is visible"
 msgstr "Traka statusa je vidljiva"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:37
-msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja (na primer â??2.6.0â??)."
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja (na "
+"primer â??2.6.0â??)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default X coordinate for the main window."
@@ -19252,8 +20124,12 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "Podrazumevana Å¡irina boÄ?ne trake, u pikselima."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")."
-msgstr "Poslednja nadograÄ?ena verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/nivoom podeÅ¡avanja (na primer â??2.6.0â??)."
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"Poslednja nadograÄ?ena verzija podeÅ¡avanja Evolucije, sa glavnim/sporednim/"
+"nivoom podeÅ¡avanja (na primer â??2.6.0â??)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
@@ -19268,24 +20144,50 @@ msgid "The machine name to proxy socks through."
 msgstr "Naziv maÅ¡ine za puÅ¡tanje socks posrednika."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/http_host\" that you proxy through."
-msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/http_hostâ?? koji posrednik puÅ¡ta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"http_host\" that you proxy through."
+msgstr ""
+"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/http_hostâ?? "
+"koji posrednik puÅ¡ta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/secure_host\" that you proxy through."
-msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/secure_hostâ?? koji posrednik puÅ¡ta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"secure_host\" that you proxy through."
+msgstr ""
+"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/secure_hostâ?? "
+"koji posrednik puÅ¡ta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
-msgid "The port on the machine defined by \"/apps/evolution/shell/network_config/socks_host\" that you proxy through."
-msgstr "Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/socks_hostâ?? koji posrednik puÅ¡ta."
+msgid ""
+"The port on the machine defined by \"/apps/evolution/shell/network_config/"
+"socks_host\" that you proxy through."
+msgstr ""
+"Port na maÅ¡ini odreÄ?en u â??/apps/evolution/shell/network_config/socks_hostâ?? "
+"koji posrednik puÅ¡ta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
-msgid "The style of the window buttons. Can be \"text\", \"icons\", \"both\", \"toolbar\". If \"toolbar\" is set, the style of the buttons is determined by the GNOME toolbar setting."
-msgstr "Stil dugmadi prozora. MoÅ¾e biti â??textâ?? (tekst), â??iconsâ?? (ikone), â??bothâ?? (oboje), â??toolbarâ?? (traka alata). Ako je postavljeno â??toolbarâ??, Gnomovo podeÅ¡avanje trake alata utvrÄ?uje stil."
+msgid ""
+"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
+"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
+"by the GNOME toolbar setting."
+msgstr ""
+"Stil dugmadi prozora. MoÅ¾e biti â??textâ?? (tekst), â??iconsâ?? (ikone), "
+"â??bothâ?? (oboje), â??toolbarâ?? (traka alata). Ako je postavljeno â??toolbarâ??, "
+"Gnomovo podeÅ¡avanje trake alata utvrÄ?uje stil."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:51
-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 (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
-msgstr "Ovaj kljuÄ? sadrÅ¾i spisak domaÄ?ina koji su direktno povezani, bez koriÅ¡Ä?enja posrednika (ukoliko je aktivan). Vrednosti mogu biti domaÄ?ini, domeni (upotrebom dÅ¾okera poput *.foo.com), IP adrese domaÄ?ina (IPv4 i IPv6) i mreÅ¾ne adrese sa maskom (neÅ¡to kao 192.168.0.0/24)."
+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 "
+"(using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and "
+"IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
+msgstr ""
+"Ovaj kljuÄ? sadrÅ¾i spisak domaÄ?ina koji su direktno povezani, bez koriÅ¡Ä?enja "
+"posrednika (ukoliko je aktivan). Vrednosti mogu biti domaÄ?ini, domeni "
+"(upotrebom dÅ¾okera poput *.foo.com), IP adrese domaÄ?ina (IPv4 i IPv6) i "
+"mreÅ¾ne adrese sa maskom (neÅ¡to kao 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Toolbar is visible"
@@ -19324,8 +20226,11 @@ msgid "Whether the toolbar should be visible."
 msgstr "Da li da traka alata bude vidljiva."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
-msgstr "Da li Ä?e prozorÄ?e sa upozorenjem u razvojnim verzijama Evolucije biti prikazano."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
+msgstr ""
+"Da li Ä?e prozorÄ?e sa upozorenjem u razvojnim verzijama Evolucije biti "
+"prikazano."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
@@ -19339,146 +20244,46 @@ msgstr "Stil dugmadi prozora"
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
-#: ../shell/e-shell-content.c:577
-#: ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
 msgid "Save Search"
 msgstr "SaÄ?uvaj pretragu"
 
-#: ../shell/e-shell-migrate.c:287
-#: ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:883
+#: ../shell/e-shell-searchbar.c:921
 msgid "Sho_w:"
 msgstr "Prika_Å¾i: "
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
 msgid "Sear_ch:"
 msgstr "P_retraÅ¾i:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
 msgid "i_n"
 msgstr " _u "
 
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "Stil trake alata"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr "Stil palete alata prebacivaÄ?a"
-
-#: ../shell/e-shell-switcher.c:465
-#: ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "Traka alata vidljiva"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "Da li je prebacivaÄ? vidljiv"
-
-#: ../shell/e-shell-utils.c:245
+#: ../shell/e-shell-utils.c:253
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:255
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
-#: ../shell/e-shell-utils.c:268
+#: ../shell/e-shell-utils.c:276
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
-#: ../shell/e-shell-view.c:675
-msgid "Switcher Action"
-msgstr "Radnja prebacivaÄ?a"
-
-#: ../shell/e-shell-view.c:676
-msgid "The switcher action for this shell view"
-msgstr "Radnja prebacivaÄ?a za ovaj pregled"
-
-#: ../shell/e-shell-view.c:691
-msgid "Page Number"
-msgstr "Broj stranice"
-
-#: ../shell/e-shell-view.c:692
-msgid "The notebook page number of the shell view"
-msgstr "Broj stranice knjiÅ¾ice pregleda"
-
-#: ../shell/e-shell-view.c:708
-msgid "Search Rule"
-msgstr "Pravilo pretrage"
-
-#: ../shell/e-shell-view.c:709
-msgid "Criteria for the current search results"
-msgstr "Uslov za trenutne rezultate pretrage"
-
-#: ../shell/e-shell-view.c:724
-msgid "The EShellBackend for this shell view"
-msgstr "Pozadinski EShellBackend za ovaj pregled"
-
-#: ../shell/e-shell-view.c:739
-msgid "Shell Content Widget"
-msgstr "VidÅ¾et sadrÅ¾aja"
-
-#: ../shell/e-shell-view.c:740
-msgid "The content widget appears in a shell window's right pane"
-msgstr "VidÅ¾et sadrÅ¾aja se pojavljuje u desnoj povrÅ¡i prozora"
-
-#: ../shell/e-shell-view.c:756
-msgid "Shell Sidebar Widget"
-msgstr "VidÅ¾et boÄ?ne trake"
-
-#: ../shell/e-shell-view.c:757
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr "VidÅ¾et sadrÅ¾aja se pojavljuje u levoj povrÅ¡i prozora"
-
-#: ../shell/e-shell-view.c:772
-msgid "Shell Taskbar Widget"
-msgstr "VidÅ¾et trake zadataka"
-
-#: ../shell/e-shell-view.c:773
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr "VidÅ¾et trake zadataka se pojavljuje na dnu prozora"
-
-#: ../shell/e-shell-view.c:788
-msgid "Shell Window"
-msgstr "Prozor Å¡koljke"
-
-#: ../shell/e-shell-view.c:789
-msgid "The window to which the shell view belongs"
-msgstr "Prozor kome pripada pregled"
-
-#: ../shell/e-shell-view.c:805
-msgid "The key file holding widget state data"
-msgstr "KljuÄ? koji sadrÅ¾i stanje vidÅ¾eta"
-
-#: ../shell/e-shell-view.c:820
-msgid "The title of the shell view"
-msgstr "Naslov pregleda"
-
-#: ../shell/e-shell-view.c:834
-msgid "Current View ID"
-msgstr "IB trenutnog pregleda"
-
-#: ../shell/e-shell-view.c:835
-msgid "The current GAL view ID"
-msgstr "IB trenutnog GAL pregleda"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
@@ -19494,407 +20299,302 @@ msgstr ""
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Bug Buddy is not installed."
 msgstr "BubaÅ¾dajin pomoÄ?nik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1238
 msgid "Bug Buddy could not be run."
 msgstr "BubaÅ¾dajin pomoÄ?nik ne moÅ¾e biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "Gnomov Pilot nije instaliran."
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "Gnomov Pilot ne moÅ¾e biti pokrenut."
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1419
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1424
+#: ../shell/e-shell-window-actions.c:1438
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1445
 msgid "_Contents"
 msgstr "_SadrÅ¾aj"
 
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1447
 msgid "Open the Evolution User Guide"
 msgstr "Otvori Evolucijino korisniÄ?ko uputstvo"
 
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1473
 msgid "Evolution _FAQ"
 msgstr "PomoÄ? za Evoluciju"
 
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1475
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Otvara veb stranicu sa Ä?esto postavljanim pitanjima"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1480
 msgid "_Forget Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1482
 msgid "Forget all remembered passwords"
 msgstr "Zaboravi sve zapamÄ?ene lozinke"
 
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1487
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1489
 msgid "Import data from other programs"
 msgstr "Uvezi podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1494
 msgid "New _Window"
 msgstr "Nov p_rozor"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1496
 msgid "Create a new window displaying this view"
 msgstr "Otvara nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1510
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1515
 msgid "_Quick Reference"
 msgstr "_Kratki podsetnik"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1517
 msgid "Show Evolution's shortcut keys"
 msgstr "PrikaÅ¾i preÄ?ice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1524
 msgid "Exit the program"
 msgstr "Izlazak iz programa"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1529
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1531
 msgid "Construct a more advanced search"
 msgstr "Obrazuj napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1538
 msgid "Clear the current search parameters"
 msgstr "OÄ?isti trenutne parametre pretrage"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1543
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi saÄ?uvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1545
 msgid "Manage your saved searches"
 msgstr "Upravlja VaÅ¡im saÄ?uvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1552
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1557
 msgid "_Find Now"
 msgstr "Pro_naÄ?i sada"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1559
 msgid "Execute the current search parameters"
 msgstr "IzvrÅ¡i trenutne parametre pretrage"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1564
 msgid "_Save Search..."
 msgstr "_SaÄ?uvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1566
 msgid "Save the current search parameters"
 msgstr "SaÄ?uvaj trenutne parametre pretrage"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1578
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1580
 msgid "Send queued items and retrieve new items"
 msgstr "Å alje pripremljene i dovlaÄ?i nove stavke"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1585
 msgid "Submit _Bug Report..."
 msgstr "PoÅ¡alji izveÅ¡taj o _greÅ¡ci..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1587
 msgid "Submit a bug report using Bug Buddy"
 msgstr "PoÅ¡alji izveÅ¡taj o greÅ¡ci BubaÅ¾dajinim pomoÄ?nikom"
 
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "_UsklaÄ?ivanje sa Gnomovim Pilotom..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "Podesi Gnomovog Pilota"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1592
 msgid "_Work Offline"
 msgstr "Ra_d van mreÅ¾e"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1594
 msgid "Put Evolution into offline mode"
 msgstr "Postavi Evoluciju u rad van mreÅ¾e"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1599
 msgid "_Work Online"
 msgstr "_Rad na mreÅ¾i"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1601
 msgid "Put Evolution into online mode"
 msgstr "Postavi Evoluciju u rad na mreÅ¾i"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1629
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1636
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1643
 msgid "_Search"
 msgstr "_PretraÅ¾i"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1650
 msgid "_Switcher Appearance"
 msgstr "Izgled _prebacivaÄ?a"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1664
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Show Side _Bar"
 msgstr "PrikaÅ¾i boÄ?nu _traku"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show the side bar"
 msgstr "PrikaÅ¾i boÄ?nu traku"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1701
 msgid "Show _Buttons"
 msgstr "PrikaÅ¾i _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show the switcher buttons"
 msgstr "PrikaÅ¾i dugmad prebacivaÄ?a"
 
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1709
 msgid "Show _Status Bar"
 msgstr "PrikaÅ¾i traku _statusa"
 
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show the status bar"
 msgstr "PrikaÅ¾i traku statusa"
 
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Show _Tool Bar"
 msgstr "PrikaÅ¾i traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1719
 msgid "Show the tool bar"
 msgstr "PrikaÅ¾i traku alata"
 
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1741
 msgid "_Icons Only"
 msgstr "Samo _ikone"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Display window buttons with icons only"
 msgstr "Prikazuje dugmad prozora samo sa ikonama"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1748
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1750
 msgid "Display window buttons with text only"
 msgstr "Prikazuje dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1755
 msgid "Icons _and Text"
 msgstr "Ikone _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1757
 msgid "Display window buttons with icons and text"
 msgstr "Prikazuje dugmad prozora sa ikonama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1762
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1764
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr "Prikazuje dugmad prozora koriÅ¡Ä?enjem postavke treake alata radne povrÅ¡ine"
+msgstr ""
+"Prikazuje dugmad prozora koriÅ¡Ä?enjem postavke treake alata radne povrÅ¡ine"
 
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1772
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1774
 msgid "Create or edit views"
 msgstr "Pravi ili menja preglede"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1779
 msgid "Save Custom View..."
 msgstr "SaÄ?uvaj prilagoÄ?en pregled..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1781
 msgid "Save current custom view"
 msgstr "Ä?uva trenutni korisniÄ?ki pregled"
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1788
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1798
 msgid "Custom View"
 msgstr "PrilagoÄ?en pregled"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1800
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je korisnik podesio"
 
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1810
 msgid "Change the page settings for your current printer"
 msgstr "Izmeni postavke stranice za trenutni Å¡tampaÄ?"
 
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2183
 #, c-format
 msgid "Switch to %s"
 msgstr "PreÄ?i na %s"
 
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2396
 msgid "Execute these search parameters"
 msgstr "IzvrÅ¡i ove parametre pretrage"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:567
+#: ../shell/e-shell-window-private.c:576
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolucija"
 
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
 msgid "New"
 msgstr "Novo"
 
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr "Aktivan pregled"
-
-#: ../shell/e-shell-window.c:617
-msgid "Name of the active shell view"
-msgstr "Ime aktivnog pregleda"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr "EFocusTracker prozora"
-
-#: ../shell/e-shell-window.c:646
-#: ../shell/e-shell.c:803
-msgid "Geometry"
-msgstr "Geometrija"
-
-#: ../shell/e-shell-window.c:647
-#: ../shell/e-shell.c:804
-msgid "Initial window geometry string"
-msgstr "PoÄ?etni niz geometrije prozora"
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "Sigurni reÅ¾im"
-
-#: ../shell/e-shell-window.c:663
-msgid "Whether the shell window is in safe mode"
-msgstr "Da li je prozor u sigurnom reÅ¾imu"
-
-#: ../shell/e-shell-window.c:694
-msgid "Sidebar Visible"
-msgstr "BoÄ?na traka vidljiva"
-
-#: ../shell/e-shell-window.c:695
-msgid "Whether the shell window's side bar is visible"
-msgstr "Da li je boÄ?na traka prozora vidljiva"
-
-#: ../shell/e-shell-window.c:709
-msgid "Switcher Visible"
-msgstr "PrebacivaÄ? vidljiv"
-
-#: ../shell/e-shell-window.c:710
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "Da li su dugmad prebacivaÄ?a vidljiva"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "Traka statusa vidljiva"
-
-#: ../shell/e-shell-window.c:726
-msgid "Whether the shell window's task bar is visible"
-msgstr "Da li je traka statusa vidljiva"
-
-#: ../shell/e-shell-window.c:741
-msgid "Whether the shell window's tool bar is visible"
-msgstr "Da li je traka alata vidljiva"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "Upravnik radnog okruÅ¾enja"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr "GtkUIManager prozora"
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
 msgid "Preparing to go offline..."
 msgstr "Priprema za rad van mreÅ¾e..."
 
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
 msgid "Preparing to go online..."
 msgstr "Priprema za rad na mreÅ¾i..."
 
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
 msgid "Preparing to quit..."
 msgstr "Priprema za kraj..."
 
-#: ../shell/e-shell.c:819
-msgid "Module Directory"
-msgstr "Direktorijum modula"
-
-#: ../shell/e-shell.c:820
-msgid "The directory from which to load EModules"
-msgstr "Direktorijum za uÄ?itavanje EModules"
-
-#: ../shell/e-shell.c:835
-msgid "Network Available"
-msgstr "MreÅ¾a dostupna"
-
-#: ../shell/e-shell.c:836
-msgid "Whether the network is available"
-msgstr "Da li je mreÅ¾a dostupna"
-
-#: ../shell/e-shell.c:851
-#: ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "Na mreÅ¾i"
-
-#: ../shell/e-shell.c:852
-msgid "Whether the shell is online"
-msgstr "Da li je Å¡koljka na mreÅ¾i"
-
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:180
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19929,7 +20629,7 @@ msgstr ""
 "Nadamo se da Ä?ete uÅ¾ivati u plodovima naÅ¡eg napornog rada, i \n"
 "Å¾eljno iÅ¡Ä?ekujemo VaÅ¡ doprinos!\n"
 
-#: ../shell/main.c:192
+#: ../shell/main.c:204
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19937,61 +20637,56 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:199
+#: ../shell/main.c:211
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reÄ?i"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:327
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: ../shell/main.c:324
+#: ../shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:333
 msgid "Start in online mode"
 msgstr "PoÄ?ni rad na mreÅ¾i"
 
-#: ../shell/main.c:330
-#| msgid "Start in online mode"
+#: ../shell/main.c:335
 msgid "Start in \"express\" mode"
 msgstr "PoÄ?ni u â??ekspresnomâ?? reÅ¾imu"
 
-#: ../shell/main.c:333
+#: ../shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "Primoraj ponovan prenos podataka iz Evolucije 1.4"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:341
 msgid "Send the debugging output of all components to a file."
 msgstr "PoÅ¡alji izlaz o greÅ¡kama iz svih delova u datoteku."
 
-#: ../shell/main.c:342
+#: ../shell/main.c:343
 msgid "Disable loading of any plugins."
 msgstr "OnemoguÄ?ava uÄ?itavanje svih dodataka."
 
-#: ../shell/main.c:344
+#: ../shell/main.c:345
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "OnemoguÄ?ava okno za pregled poÅ¡te, kontakata i zadataka."
 
-#: ../shell/main.c:348
+#: ../shell/main.c:349
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Uvezi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
-#: ../shell/main.c:350
+#: ../shell/main.c:351
 msgid "Request a running Evolution process to quit"
 msgstr "Zahtevaj kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:465
+#: ../shell/main.c:475 ../shell/main.c:483
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolucija rukovodilac liÄ?nim podatacima i klijent e-poÅ¡te"
 
-#: ../shell/main.c:491
+#: ../shell/main.c:545
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20004,87 +20699,59 @@ msgstr ""
 msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "Sigurno Å¾elite da sve zapamÄ?ene lozinke budu zaboravljene?"
 
+# shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "Nastavi"
+#, fuzzy
+#| msgid "Delete old data from version {0}?"
+msgid "Cannot upgrade directly from version {0}"
+msgstr "Obrisati stare podatke iz verzije {0}?"
 
-# shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "Obrisati stare podatke iz verzije {0}?"
+#, fuzzy
+#| msgid "Continue"
+msgid "Continue Anyway"
+msgstr "Nastavi"
 
 #: ../shell/shell.error.xml.h:4
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "Zaboravljanje lozinki Ä?e oÄ?istiti sve zapamÄ?ene lozinke. Ponovo Ä?ete biti upitani kada sledeÄ?i put budu bile potrebne."
-
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "Nedovoljno mesta na disku za nadogradnju."
-
-# shell:upgrade-remove-1-4-confirm primary
-#: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "Zaista obrisati stare podatke?"
-
-#: ../shell/shell.error.xml.h:8
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
 msgstr ""
-"Ceo sadrÅ¾aj fascikle &quot;evolution&quot; Ä?e biti trajno obrisan.\n"
-"\n"
-"Savetujemo da proverite da li postoje poÅ¡ta, kontakti i kalendar, i da li ova verzija Evolucije ispravno radi pre brisanja starih podataka.\n"
-"\n"
-"Posle brisanja, ne moÅ¾ete da se vratite na prethodnu verziju Evolucije bez ruÄ?ne intervencije.\n"
 
-#: ../shell/shell.error.xml.h:14
+#: ../shell/shell.error.xml.h:5
 msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
 msgstr ""
-"Prethodna verzija Evolucije smeÅ¡tala je podatke na drugu lokaciju.\n"
-"\n"
-"Ukoliko odluÄ?ite da uklonite ove podatke, ceo sadrÅ¾aj direktorijuma &quot;evolution&quot; biÄ?e trajno uklonjen. Ukoliko se odluÄ?ite da zadrÅ¾ite ove podatke, moraÄ?ete ruÄ?no da uklonite sadrÅ¾aj iz &quot;evolution&quot; kada Vam odgovara.\n"
+"Zaboravljanje lozinki Ä?e oÄ?istiti sve zapamÄ?ene lozinke. Ponovo Ä?ete biti "
+"upitani kada sledeÄ?i put budu bile potrebne."
 
-#: ../shell/shell.error.xml.h:18
+#: ../shell/shell.error.xml.h:7
+#, fuzzy
+#| msgid "Quit"
+msgid "Quit Now"
+msgstr "IzaÄ?i"
+
+#: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
 msgstr "Neuspela nadogradnja sa prethodne verzije:"
 
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you can continue."
-msgstr ""
-"Nadogradnja podataka i postavki Ä?e zahtevati do {0} prostora na disku, ali imate na raspolaganju samo {1}.\n"
-"\n"
-"MoraÄ?ete da oslobodite viÅ¡e mesta u liÄ?noj fascikli pre nego Å¡to nastavite."
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
 msgid "_Forget"
 msgstr "Za_boravi"
 
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "_ZadrÅ¾i podatke"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "_Podseti me kasnije"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
 msgid ""
 "{0}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{0}\n"
 "\n"
-"Ukoliko odluÄ?ite da nastavite, moÅ¾da neÄ?ete moÄ?i da pristupite nekim starim podacima.\n"
+"Ukoliko odluÄ?ite da nastavite, moÅ¾da neÄ?ete moÄ?i da pristupite nekim starim "
+"podacima.\n"
 
 #: ../shell/test/e-test-shell-backend.c:60
 msgctxt "New"
@@ -20167,7 +20834,7 @@ msgstr "Opcije sesije upravljanja:"
 msgid "Show session management options"
 msgstr "Prikazuje opcije upravljanja sesijom"
 
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20179,74 +20846,96 @@ msgstr ""
 "Uredite postavke poverenja:"
 
 #: ../smime/gui/cert-trust-dialog.c:144
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "PoÅ¡to verujete izdavaocu ovog sertifikata, onda verujete i u autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"PoÅ¡to verujete izdavaocu ovog sertifikata, onda verujete i u autentiÄ?nost "
+"ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
 
 #: ../smime/gui/cert-trust-dialog.c:148
-msgid "Because you do not trust the certificate authority that issued this certificate, then you do not trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "PoÅ¡to ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+"PoÅ¡to ne verujete izdavaocu ovog sertifikata, onda ne verujete ni u "
+"autentiÄ?nost ovog sertifikata osim ako ovde ne naznaÄ?ite drugaÄ?ije"
 
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
 msgid "Select a certificate to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#, fuzzy
+#| msgid "Imported Certificate"
+msgid "Failed to import user's certificate"
+msgstr "UveÅ¾en sertifikat"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:292
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
 #: ../smime/lib/e-cert.c:566
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
 msgid "Expires"
 msgstr "IstiÄ?e"
 
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
 msgid "All email certificate files"
 msgstr "Sve datoteke sertifikata poÅ¡te"
 
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to import contact's certificate"
+msgstr "Neuspelo brisanje kontakta"
+
+#: ../smime/gui/certificate-manager.c:583
 msgid "E-Mail Address"
 msgstr "Elektronska adresa"
 
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA sertifikata"
 
-#: ../smime/gui/certificate-manager.c:1050
-msgid "Certificates"
-msgstr "Sertifikati"
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr ""
 
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "PregledaÄ? sertifikata: %s"
 
 #: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+#| msgid "Enter the password for `%s'"
+msgid "Enter the password for '%s'"
 msgstr "Unesite lozinku za â??%sâ??"
 
 #. we're setting the password initially
@@ -20277,7 +20966,7 @@ msgstr ""
 "Izdao:\n"
 "  Naslov: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
 msgid "Select certificate"
 msgstr "Izaberite sertifikat"
 
@@ -20290,179 +20979,173 @@ msgid "Authorities"
 msgstr "Izdavaoci"
 
 #: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "Rezerva"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
+#, fuzzy
+#| msgid "Backup All"
+msgid "Backup _All"
 msgstr "Rezerva svega"
 
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, politiku i procedure (ako su dostupni)."
+#: ../smime/gui/smime-ui.ui.h:4
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"Pre verovanja ovom izdavaocu sertifikata, prvo pregledajte njegov sertifikat, "
+"politiku i procedure (ako su dostupni)."
 
-#: ../smime/gui/smime-ui.ui.h:6
-#: ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
 msgid "Certificate"
 msgstr "Sertifikat"
 
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
 msgstr "Poverenje izdavaocu sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
 msgstr "Polja sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
 msgstr "Hijerarhija sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
 msgstr "Detalji sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
 msgstr "Tabela sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
 msgstr "ZajedniÄ?ko ime (CN)"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Sertifikati kontakta"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne veruj u autentiÄ?nost ovog sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "UreÄ?ivanje"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
 msgstr "PodeÅ¡avanja poverenja u sertifikate e-poÅ¡te"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat primaoca e-poruke"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
 msgstr "Sertifikat potpisnika e-poruke"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
 msgstr "IstiÄ?e"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Field Value"
 msgstr "Vrednost polja"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Fingerprints"
 msgstr "Otisci"
 
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "Uvezi"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Issued By"
 msgstr "Izdato od"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
 msgstr "Izdat"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
 msgstr "Izdato za"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
 msgstr "MD5 otisak"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
 msgstr "Organizacija (O)"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Organizational Unit (OU)"
 msgstr "Organizaciona jedinica (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../smime/gui/smime-ui.ui.h:32
-#: ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
 msgstr "Sertifikat SSL klijenta"
 
-#: ../smime/gui/smime-ui.ui.h:33
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
 msgstr "Sertifikat SSL servera"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
 msgstr "Ovaj sertifikat je proveren za naredne potrebe:"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
 msgstr "Veruj u autentiÄ?nost ovog sertifikata"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje e-adresa."
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje programera."
 
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+#| msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify websites."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje veb stranica."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
 msgstr "Ispravnost"
 
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "Pregled"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Imate sertifikate ovih organizacija koji vas odreÄ?uju:"
 
-#: ../smime/gui/smime-ui.ui.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+#: ../smime/gui/smime-ui.ui.h:40
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "DrÅ¾ite sertifikate koji odreÄ?uju ove izdavaoce sertifikata:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
 msgstr "DrÅ¾ite sertifikate koji odreÄ?uju ove osobe:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
 msgstr "VaÅ¡i sertifikati"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+#| msgid "Backup"
+msgid "_Backup"
+msgstr "Rezerva"
+
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "_Edit CA Trust"
 msgstr "_Uredi poverenje u CA"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
 msgstr "Sertifikat veÄ? postoji"
 
-#: ../smime/lib/e-cert.c:228
-#: ../smime/lib/e-cert.c:238
+#: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
@@ -20503,129 +21186,149 @@ msgstr "PKCS #1 MD5 sa RSA Å¡ifrovanjem"
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA Å¡ifrovanjem"
 
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 sa RSA Å¡ifrovanjem"
+
+#: ../smime/lib/e-cert.c:642
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 sa RSA Å¡ifrovanjem"
+
+#: ../smime/lib/e-cert.c:645
+#, fuzzy
+#| msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 sa RSA Å¡ifrovanjem"
+
+#: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Å¡ifrovanje"
 
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
 msgstr "Upotreba kljuÄ?a sertifikata"
 
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
 msgstr "Netscape tip sertifikata"
 
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
 msgstr "OdreÄ?ivaÄ? kljuÄ?a izdavaoca sertifikata"
 
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "OdreÄ?ivaÄ? predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
 msgid "Algorithm Identifier"
 msgstr "OdreÄ?ivaÄ? algoritma"
 
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom kljuÄ?u subjekta"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog kljuÄ?a subjekta"
 
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
 msgid "Subject's Public Key"
 msgstr "Javni kljuÄ? subjekta"
 
-#: ../smime/lib/e-cert.c:806
-#: ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
 msgstr "GreÅ¡ka: nije moguÄ?a obrada proÅ¡irenja"
 
-#: ../smime/lib/e-cert.c:827
-#: ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
 msgstr "SSL izdavaÄ? sertifikata"
 
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
 msgstr "IzdavaÄ? sertifikata e-poÅ¡te"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
 msgid "Key Encipherment"
 msgstr "ZamuÄ?ivanje kljuÄ?a"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
 msgid "Data Encipherment"
 msgstr "ZamuÄ?ivanje podataka"
 
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
 msgid "Key Agreement"
 msgstr "Saglasnost kljuÄ?a"
 
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
 msgstr "Potpisnik sertifikata"
 
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
 msgid "Critical"
 msgstr "KritiÄ?no"
 
-#: ../smime/lib/e-cert.c:937
-#: ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
 msgid "Not Critical"
 msgstr "Nije kritiÄ?no"
 
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
 msgid "Extensions"
 msgstr "ProÅ¡irenja"
 
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085
-#: ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa sertifikata"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
 msgid "Issuer"
 msgstr "Izdavalac"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavaÄ?a"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
@@ -20649,8 +21352,7 @@ msgstr "Prema _preduzeÄ?u"
 msgid "_Address Cards"
 msgstr "_Karte adresara"
 
-#: ../views/addressbook/galview.xml.h:3
-#: ../views/calendar/galview.xml.h:3
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
 msgstr "Pregled _spiska"
 
@@ -20717,11 +21419,11 @@ msgstr "Sa _statusom"
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
 msgid "UTC"
 msgstr "UTC"
 
@@ -20739,7 +21441,8 @@ msgstr "Meni za podeÅ¡avanje vremenske zone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Koristite levi taster miÅ¡a da uveÄ?ate mapu i izaberete vremensku zonu.\n"
@@ -20749,19 +21452,14 @@ msgstr ""
 msgid "_Selection"
 msgstr "_Izabor"
 
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "Zbirka"
-
-#: ../widgets/menus/gal-define-views-dialog.c:327
+#: ../widgets/menus/gal-define-views-dialog.c:346
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Odredi preglede za %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:335
-#: ../widgets/menus/gal-define-views-dialog.c:337
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
 msgid "Define Views"
 msgstr "Odredi preglede"
 
@@ -20774,12 +21472,7 @@ msgstr "Odredi preglede za â??%sâ??"
 msgid "Table"
 msgstr "Tabela"
 
-# bug(slobo): instanca, primerak, pogledaj...
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "Struktura"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
 msgid "Save Current View"
 msgstr "SaÄ?uvaj trenutni pregled"
 
@@ -20791,11 +21484,7 @@ msgstr "_Napravi novi pregled"
 msgid "_Replace existing view"
 msgstr "_Zameni postojeÄ?i pregled"
 
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "Proizvodnja"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
 msgid "Define New View"
 msgstr "Odredi novi pregled"
 
@@ -20815,22 +21504,10 @@ msgstr "Tip pregleda:"
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "Ime naloga"
-
 #: ../widgets/misc/e-account-tree-view.c:255
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "Radnja"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr "Radnja GtkRadioAction"
-
 #: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
@@ -20848,20 +21525,21 @@ msgstr "MIME tip:"
 msgid "_Suggest automatic display of attachment"
 msgstr "_PredloÅ¾i automatski prikaz priloga"
 
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
 msgid "Could not set as background"
 msgstr "Nije moguÄ?e postaviti kao pozadinu"
 
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:87
 msgid "Could not send attachment"
 msgid_plural "Could not send attachments"
-msgstr[0] "Ne mogu da otvorim vezu."
-msgstr[1] "Nije moguÄ?e poslati priloge"
-msgstr[2] "Nije moguÄ?e poslati priloga"
+msgstr[0] "Ne mogu da poÅ¡aljem prilog"
+msgstr[1] "Ne mogu da poÅ¡aljem priloge"
+msgstr[2] "Ne mogu da poÅ¡aljem priloge"
+msgstr[3] "Ne mogu da poÅ¡aljem prilog"
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:129
 msgid "_Send To..."
@@ -20871,13 +21549,13 @@ msgstr "_PoÅ¡alji za..."
 msgid "Send the selected attachments somewhere"
 msgstr "Å alje izabrane priloge negde"
 
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
 msgid "Loading"
 msgstr "UÄ?itavanje"
 
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
 msgid "Saving"
 msgstr "Ä?uvanje"
 
@@ -20886,13 +21564,10 @@ msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:613
 msgid "Show Attachment _Bar"
 msgstr "PrikaÅ¾i liniju p_riloga"
 
-#: ../widgets/misc/e-attachment-paned.c:631
-msgid "Show _Attachment Bar"
-msgstr "PrikaÅ¾i lini_ju priloga"
-
 #: ../widgets/misc/e-attachment-store.c:538
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
@@ -20906,37 +21581,49 @@ msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "SaÄ?uvaj prilog"
 msgstr[1] "SaÄ?uvaj priloge"
-msgstr[2] "SaÄ?uvaj priloga"
+msgstr[2] "SaÄ?uvaj priloge"
+msgstr[3] "SaÄ?uvaj prilog"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779
-#: ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:346
 msgid "S_ave All"
 msgstr "SaÄ?_uvaj sve"
 
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:372
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:396
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:403
+#, fuzzy
+#| msgid "S_ave All"
+msgid "Hid_e All"
+msgstr "SaÄ?_uvaj sve"
+
+#: ../widgets/misc/e-attachment-view.c:410
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:417
+#, fuzzy
+#| msgid "_View Inline"
+msgid "Vie_w All Inline"
+msgstr "Pre_gledaj unutar"
+
+#: ../widgets/misc/e-attachment-view.c:734
 #, c-format
 msgid "Open with \"%s\""
 msgstr "Otvori sa â??%sâ??"
 
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:737
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u %s"
@@ -20945,62 +21632,60 @@ msgstr "Otvori ovaj prilog u %s"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:1021
 msgid "Attached message"
 msgstr "PriloÅ¾ena poruka"
 
-#: ../widgets/misc/e-attachment.c:1820
-#: ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
 msgid "A load operation is already in progress"
 msgstr "Operacija uÄ?itavanja veÄ? je u toku"
 
-#: ../widgets/misc/e-attachment.c:1828
-#: ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
 msgid "A save operation is already in progress"
 msgstr "Operacija Ä?uvanja veÄ? je u toku"
 
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1949
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Nije moguÄ?e uÄ?itati â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Nije moguÄ?e uÄ?itati prilog"
 
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Nije moguÄ?e otvoriti â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Nije moguÄ?e otvoriti prilog"
 
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
 msgid "Attachment contents not loaded"
 msgstr "SadrÅ¾aj priloga nije uÄ?itan"
 
 # * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Nije moguÄ?e saÄ?uvati â??%sâ??"
 
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Nije moguÄ?e saÄ?uvati prilog"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
 msgid "Ctrl-click to open a link"
 msgstr "DrÅ¾ite levi klik i Ctrl da otvorite vezu"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
 msgid "%B %Y"
 msgstr "%B %Y."
 
@@ -21008,70 +21693,6 @@ msgstr "%B %Y."
 msgid "Month Calendar"
 msgstr "MeseÄ?ni kalendar"
 
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472
-#: ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "Boja ispunjavanja"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
-#: ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407
-#: ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK boja ispunjavanja"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
-#: ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "IstaÄ?kaj"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "H1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "Najmanja Å¡irina"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "Najmanja Å¡irina"
-
-#: ../widgets/misc/e-canvas-vbox.c:101
-#: ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "Razmak"
-
 #: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "Kodna strana"
@@ -21084,27 +21705,27 @@ msgstr "Izaberite kodnu stranu za koriÅ¡Ä?enje"
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
 msgid "Click this button to show a calendar"
 msgstr "Pritisnite na ovo dugme za prikaz kalendara"
 
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
 msgstr "Okvir za izbor vremena"
 
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
 msgid "_Today"
 msgstr "_Danas"
 
@@ -21115,7 +21736,7 @@ msgstr "_Danas"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
 msgid "_None"
 msgstr "NiÅ¡t_a"
 
@@ -21126,169 +21747,155 @@ msgstr "NiÅ¡t_a"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703
-#: ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
 msgctxt "date"
 msgid "None"
 msgstr "NiÅ¡ta"
 
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#: ../widgets/misc/e-import-assistant.c:238
-msgid "Choose the file that you want to import into Evolution, and select what type of file it is from the list."
-msgstr "Izaberite datoteku koju Å¾elite da uvezete u Evoluciju i izaberite kojeg je tipa ta datoteka iz liste."
+#: ../widgets/misc/e-import-assistant.c:246
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Izaberite datoteku koju Å¾elite da uvezete u Evoluciju i izaberite kojeg je "
+"tipa ta datoteka iz liste."
 
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:263
 msgid "F_ilename:"
 msgstr "_Ime datoteke:"
 
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:273
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:287
+#: ../widgets/misc/e-import-assistant.c:462
 msgid "File _type:"
 msgstr "_Tip datoteke:"
 
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:330
+#: ../widgets/misc/e-import-assistant.c:913
 msgid "Choose the destination for this import"
 msgstr "Izaberite odrediÅ¡te za ovaj uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:355
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite tip uvoznika:"
 
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:363
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podeÅ¡avanja iz _starijih programa"
 
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:371
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:439
+#: ../widgets/misc/e-import-assistant.c:523
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolucija je za uvoz proverila podeÅ¡avanja sledeÄ?ih programa: Pine, Netscape, "
+"Elm, iCalendar. Nema podeÅ¡avanja koja bi se mogla uvesti. Ukoliko Å¾elite da "
+"pokuÅ¡ate ponovo, kliknite na dugme â??Nazadâ??."
+
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:770
+#, fuzzy
+#| msgid "Cancel"
+msgid "_Cancel Import"
+msgstr "OtkaÅ¾i"
+
+#: ../widgets/misc/e-import-assistant.c:912
+#, fuzzy
+#| msgid "Preview the message to be printed"
+msgid "Preview data to be imported"
+msgstr "Pregledaj poruku pred Å¡tampu"
+
+#: ../widgets/misc/e-import-assistant.c:918
+#: ../widgets/misc/e-import-assistant.c:931
+#: ../widgets/misc/e-import-assistant.c:1281
+#: ../widgets/misc/e-import-assistant.c:1347
+#: ../widgets/misc/e-import-assistant.c:1356
+msgid "Import Data"
+msgstr "Uvezi podatke"
+
+#: ../widgets/misc/e-import-assistant.c:926
 msgid "Select what type of file you want to import from the list."
 msgstr "Izaberite sa spiska koje vrste datoteka Å¾elite da uvezete."
 
-#: ../widgets/misc/e-import-assistant.c:516
-msgid "Evolution checked for settings to import from the following applications: Pine, Netscape, Elm, iCalendar. No importable settings found. If you would like to try again, please click the \"Back\" button."
-msgstr "Evolucija je za uvoz proverila podeÅ¡avanja sledeÄ?ih programa: Pine, Netscape, Elm, iCalendar. Nema podeÅ¡avanja koja bi se mogla uvesti. Ukoliko Å¾elite da pokuÅ¡ate ponovo, kliknite na dugme â??Nazadâ??."
-
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#: ../widgets/misc/e-import-assistant.c:1271
+#: ../widgets/misc/e-import-assistant.c:1305
 msgid "Evolution Import Assistant"
 msgstr "PomoÄ?nik Evolucije za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1288
+#: ../widgets/misc/e-import-assistant.c:1335
 msgid "Import Location"
 msgstr "Uvezi lokaciju"
 
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1299
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing external files into Evolution."
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
 msgstr ""
 "Dobro doÅ¡li u PomoÄ?nika Evolucije za uvoz.\n"
-"Ovaj pomoÄ?nik Ä?e vas provesti kroz postupak uvoza spoljnih datoteka u Evoluciju."
+"Ovaj pomoÄ?nik Ä?e vas provesti kroz postupak uvoza spoljnih datoteka u "
+"Evoluciju."
 
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1313
 msgid "Importer Type"
 msgstr "Tip uvoznika"
 
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1321
 msgid "Select Information to Import"
 msgstr "Izaberite informaciju za uvoz"
 
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1328
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1342
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite na â??Primeniâ?? da zapoÄ?nete uvoz datoteke u Evoluciju. "
 
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "Uvezi podatke"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
 msgid "World Map"
 msgstr "Karta sveta"
 
-#: ../widgets/misc/e-map.c:631
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should instead select the timezone from the drop-down combination box below."
-msgstr "Alat za izbor vremenske zone pomoÄ?u miÅ¡a. Tastaturom se izbor vremenske zone vrÅ¡i iz donjeg okvira."
+#: ../widgets/misc/e-map.c:626
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Alat za izbor vremenske zone pomoÄ?u miÅ¡a. Tastaturom se izbor vremenske zone "
+"vrÅ¡i iz donjeg okvira."
 
 #: ../widgets/misc/e-online-button.c:27
 msgid "Evolution is currently online.  Click this button to work offline."
-msgstr "Evolucija je trenutno na mreÅ¾i. Kliknite na ovo dugme za rad van mreÅ¾e."
+msgstr ""
+"Evolucija je trenutno na mreÅ¾i. Kliknite na ovo dugme za rad van mreÅ¾e."
 
 #: ../widgets/misc/e-online-button.c:30
 msgid "Evolution is currently offline.  Click this button to work online."
-msgstr "Evolucija trenutno nije na mreÅ¾i. Kliknite na ovo dugme da se poveÅ¾ete."
+msgstr ""
+"Evolucija trenutno nije na mreÅ¾i. Kliknite na ovo dugme da se poveÅ¾ete."
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolucija trenutno nije na mreÅ¾i jer nije dostupna."
 
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "Stanje dugmeta je na mreÅ¾i"
-
-#: ../widgets/misc/e-paned.c:306
-msgid "Horizontal Position"
-msgstr "Horizontalna pozicija"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr "Pozicija povrÅ¡i kada je okrenuta horizontalno"
-
-#: ../widgets/misc/e-paned.c:318
-msgid "Vertical Position"
-msgstr "Vertikalna pozicija"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr "Pozicija povrÅ¡i kada je okrenuta vertikalno"
-
-#: ../widgets/misc/e-paned.c:330
-msgid "Proportion"
-msgstr "Odnos"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr "Odnos veliÄ?ine druge povrÅ¡i"
-
-#: ../widgets/misc/e-paned.c:342
-msgid "Fixed Resize"
-msgstr "Fiksirana izmena veliÄ?ine"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr "Ne dira drugu povrÅ¡ prilikom promene veliÄ?ine"
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "Uskladi sa:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "Uskladi liÄ?ne zapise:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "Uskladi kategorije:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:276
 msgid "Evolution Preferences"
 msgstr "PodeÅ¡avanja Evolucije"
 
@@ -21298,69 +21905,46 @@ msgstr "PodeÅ¡avanja Evolucije"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
 msgid "Fin_d:"
 msgstr "Pro_naÄ?i:"
 
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
 msgid "Clear the search"
 msgstr "OÄ?isti pretragu"
 
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
 msgid "Find the previous occurrence of the phrase"
 msgstr "NaÄ?i prethodno pojavljivanje fraze"
 
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
 msgid "_Next"
 msgstr "_SledeÄ?e"
 
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
 msgid "Find the next occurrence of the phrase"
 msgstr "NaÄ?i sledeÄ?e pojavljivanje fraze"
 
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
 msgid "Mat_ch case"
 msgstr "Pa_zi na veliÄ?inu slova"
 
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
 msgid "Reached bottom of page, continued from top"
 msgstr "Stranica pregledana do dna, nastavljeno od vrha"
 
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
 msgid "Reached top of page, continued from bottom"
 msgstr "Stranica pregledana do vrha, nastavljeno od dna"
 
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "Red kursora"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "Kolona kursora"
-
-# bug(slobo): moÅ¾da razvrstavaÄ?
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "Razvrstavanje"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "ReÅ¾im izbora"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "ReÅ¾im kursora"
-
 #: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "Kada je obri_sano:"
@@ -21433,43 +22017,48 @@ msgstr "Po zavrÅ¡_etku:"
 msgid "When decli_ned:"
 msgstr "Kada je odbi_jeno:"
 
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "Wi_thin"
 msgstr "Un_utar"
 
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
-msgstr "_Posle:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#| msgid "_After:"
+msgid "_After"
+msgstr "_Posle"
 
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_All information"
 msgstr "_Svi podaci"
 
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Classification:"
 msgstr "_Klasifikacija:"
 
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Delay message delivery"
 msgstr "_OdloÅ¾i isporuku poruke"
 
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Delivered"
 msgstr "_IsporuÄ?eno"
 
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_Set expiration date"
 msgstr "_Postavi rok"
 
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
-msgstr "_Do:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#| msgid "_Until:"
+msgid "_Until"
+msgstr "_Do"
 
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
 msgid "_When convenient"
 msgstr "_Kada je zgodno"
 
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
 msgid "_When opened:"
 msgstr "_Kada je otvoreno:"
 
@@ -21526,43 +22115,41 @@ msgstr "Datoteka skripte mora biti izvrÅ¡na."
 msgid "Click here to go to URL"
 msgstr "Kliknite ovde da posetite adresu"
 
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
 msgid "_Copy Link Location"
 msgstr "_UmnoÅ¾i mesto veze"
 
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
 msgid "Copy the link to the clipboard"
 msgstr "UmnoÅ¾ava vezu u spisak iseÄ?aka"
 
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u Ä?itaÄ?u"
 
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
 msgid "Open the link in a web browser"
 msgstr "Otvori vezu u pregledaÄ?u veba"
 
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
 msgid "_Copy Email Address"
 msgstr "_UmnoÅ¾i elektronsku adresu"
 
-#: ../widgets/misc/e-web-view.c:397
-#: ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../widgets/misc/e-web-view.c:752
-#: ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
 msgid "Click to hide/unhide addresses"
 msgstr "Pritisnite da sakrijete/otkrijete adrese"
 
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
 #, c-format
 msgid "Click to open %s"
 msgstr "Pritisnite da otvorite %s"
@@ -21581,7 +22168,7 @@ msgstr "Kalendar: od %s do %s"
 msgid "evolution calendar item"
 msgstr "stavka kalendara evolucije"
 
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
 msgid "popup list"
 msgstr "iskaÄ?uÄ?a lista"
 
@@ -21604,7 +22191,7 @@ msgstr "NiÅ¡ta"
 msgid "OK"
 msgstr "U redu"
 
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
@@ -21613,55 +22200,17 @@ msgstr "Vreme mora biti u formatu: %s"
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost postotka mora biti izmeÄ?u 0 i 100"
 
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "Izabrana kolona"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "Fokusirana kolona"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "Neizabrana kolona"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "Precrtana kolona"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "PodvuÄ?ena kolona"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "Podebljana kolona"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "Kolona u boji"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "Kolona boja u pozadini"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
 msgid "click to add"
 msgstr "kliknite da dodate"
 
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "Stanje"
-
-#: ../widgets/table/e-table-config.c:381
-#: ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(RastuÄ?e)"
 
-#: ../widgets/table/e-table-config.c:381
-#: ../widgets/table/e-table-config.c:423
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(OpadajuÄ?e)"
 
@@ -21673,12 +22222,12 @@ msgstr "Nije razvrstano"
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
 #: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "PrikaÅ¾i polja"
 
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
 msgid "Available Fields"
 msgstr "Dostupna polja"
 
@@ -21687,7 +22236,7 @@ msgid "A_vailable Fields:"
 msgstr "Do_stupna polja:"
 
 #: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Ascending"
 msgstr "RastuÄ?e"
 
@@ -21700,7 +22249,7 @@ msgid "Clear _All"
 msgstr "OÄ?isti _sve"
 
 #: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
 msgid "Descending"
 msgstr "OpadajuÄ?e"
 
@@ -21760,7 +22309,7 @@ msgstr "_PrikaÅ¾i ova polja po redu:"
 msgid "_Sort..."
 msgstr "_Razvrstaj..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
 msgid "Add a Column"
 msgstr "Dodaj kolonu"
 
@@ -21772,267 +22321,117 @@ msgstr ""
 "Za dodavanje kolone u tabelu, prevucite\n"
 "je na mesto gde Å¾elite da se pojavi."
 
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual  group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+#| msgid "%s : %s (%d item)"
+#| msgid_plural "%s : %s (%d items)"
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
 msgstr[0] "%s : %s (%d stavka)"
 msgstr[1] "%s : %s (%d stavke)"
 msgstr[2] "%s : %s (%d stavki)"
 
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d stavka)"
 msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
+msgstr[3] "%s (%d stavka)"
 
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842
-#: ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "Redovi naizmeniÄ?nih boja"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849
-#: ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373
-#: ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "PoloÅ¾ene linije za crtanje"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856
-#: ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379
-#: ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "Uspravne linije za crtanje"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863
-#: ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385
-#: ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "SrediÅ¡te crtanja"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870
-#: ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "ReÅ¾im kursora"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835
-#: ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "Model za izbor"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877
-#: ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339
-#: ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "NajveÄ?a duÅ¾ina"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911
-#: ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346
-#: ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "UjednaÄ?ena visina redova"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "Zamrznuto"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuÄ?e"
 
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuÄ?e"
 
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
 msgid "_Unsort"
 msgstr "_Ne razvrstavaj"
 
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
 msgid "Group By This _Field"
 msgstr "GrupiÅ¡i po ovome _polju"
 
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
 msgid "Group By _Box"
 msgstr "GrupiÅ¡i po _okviru"
 
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
 msgid "Add a C_olumn..."
 msgstr "Dodaj ko_lonu..."
 
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
 msgid "Format Column_s..."
 msgstr "Oblikuj kolo_ne..."
 
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pregled..."
 
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
 msgid "_Sort By"
 msgstr "_PoreÄ?aj po"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
 msgid "_Custom"
 msgstr "_PrilagoÄ?eno"
 
-#: ../widgets/table/e-table-item.c:2821
-#: ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "Zaglavlje tabele"
-
-#: ../widgets/table/e-table-item.c:2828
-#: ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "Model tabele"
-
-#: ../widgets/table/e-table-item.c:2904
-#: ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "Red kursora"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "Detalji razvrstavanja"
-
-#: ../widgets/table/e-table.c:3353
-#: ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "Uvek pretraÅ¾i"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "Koristite klik da dodate"
-
-#: ../widgets/table/e-table.c:3374
-msgid "Vertical Row Spacing"
-msgstr "Vertikalni razmak redova"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr "Vertikalan prostor izmeÄ?u redova. Dodaje se na vrh i dno reda"
-
-#: ../widgets/table/e-tree.c:3392
-#: ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree prilagoÄ?ivaÄ? tabele"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "Starinski izgled"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "Iscrtava linije i +/- graniÄ?nike."
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "VeliÄ?ina stabla"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "VeliÄ?ina strelice stabla"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "iskaÄ?uÄ?e"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
 msgid "popup a child"
 msgstr "iskaÄ?uÄ?e izvedeno"
 
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "ureÄ?ivanje"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
 msgid "begin editing this cell"
 msgstr "poÄ?ni ureÄ?ivanjem ove Ä?elije"
 
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "biranje"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
 msgid "toggle the cell"
 msgstr "biranje Ä?elije"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "razgranava"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
 msgid "expands the row in the ETree containing this cell"
 msgstr "razgranava red u ETree gde se Ä?elija nalazi"
 
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "skuplja"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
 msgid "collapses the row in the ETree containing this cell"
 msgstr "skuplja red u ETree gde se Ä?elija nalazi"
 
@@ -22048,141 +22447,10 @@ msgstr "klik"
 msgid "sort"
 msgstr "razvrstavanje"
 
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
 msgid "Input Methods"
 msgstr "Metodi unosa"
-
-#: ../widgets/text/e-text.c:3315
-#: ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "ObraÄ?ivaÄ? dogaÄ?aja"
-
-#: ../widgets/text/e-text.c:3322
-#: ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "Tekst"
-
-#: ../widgets/text/e-text.c:3329
-#: ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "Podebljano"
-
-#: ../widgets/text/e-text.c:3336
-#: ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "Precrtano"
-
-#: ../widgets/text/e-text.c:3343
-#: ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "Veza"
-
-#: ../widgets/text/e-text.c:3350
-#: ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "Obostrano"
-
-#: ../widgets/text/e-text.c:3357
-#: ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "Iseci Å¡irinu"
-
-#: ../widgets/text/e-text.c:3364
-#: ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "Iseci visinu"
-
-#: ../widgets/text/e-text.c:3371
-#: ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "Iseci"
-
-#: ../widgets/text/e-text.c:3378
-#: ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "Ispuni pravougaonik iseÄ?ka"
-
-#: ../widgets/text/e-text.c:3385
-#: ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "X pomeranje"
-
-#: ../widgets/text/e-text.c:3392
-#: ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "Y pomeranje"
-
-#: ../widgets/text/e-text.c:3427
-#: ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "Å irina teksta"
-
-#: ../widgets/text/e-text.c:3434
-#: ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "Visina teksta"
-
-#: ../widgets/text/e-text.c:3448
-#: ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "Koristi tri taÄ?ke"
-
-#: ../widgets/text/e-text.c:3455
-#: ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "Tri taÄ?ke"
-
-#: ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "Prelom reda"
-
-#: ../widgets/text/e-text.c:3469
-#: ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "Znaci za prelom"
-
-#: ../widgets/text/e-text.c:3476
-#: ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "NajviÅ¡e linija"
-
-#: ../widgets/text/e-text.c:3497
-#: ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "Iscrtaj ivice"
-
-#: ../widgets/text/e-text.c:3504
-#: ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "Dozvoli nove linije"
-
-#: ../widgets/text/e-text.c:3511
-#: ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "Iscrtaj pozadinu"
-
-#: ../widgets/text/e-text.c:3518
-#: ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "Iscrtaj dugme"
-
-#: ../widgets/text/e-text.c:3525
-#: ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "Pozicija kursora"
-
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533
-#: ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "Kontekst metoda unosa"
-
-#: ../widgets/text/e-text.c:3541
-#: ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "Upravljaj iskaÄ?uÄ?im prozorom"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]