[evolution/wip/gsettings] Updated Serbian translation



commit 5128d50371b9a97d6ac8ee5301e8da66be8b8c7a
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Tue Aug 23 16:00:40 2011 +0200

    Updated Serbian translation

 po/sr.po       | 9205 +++++++++++++++++++++++++++-----------------------------
 po/sr latin po | 9039 +++++++++++++++++++++++++++----------------------------
 2 files changed, 8807 insertions(+), 9437 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index f387bd6..c3cc8d5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,27 +1,27 @@
 # Serbian translation of evolution
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution package.
-#
 # Maintainer: ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <jung one ekof bg ac yu>
 # Reviewed on 2005-08-22 by ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>
 # ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>, 2010.
-#
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
 #: ../shell/main.c:569
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-06-24 14:25+0000\n"
-"PO-Revision-Date: 2010-09-22 15:01+0200\n"
-"Last-Translator: ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>\n"
+"POT-Creation-Date: 2011-08-23 13:03+0000\n"
+"PO-Revision-Date: 2011-08-08 08:09+0200\n"
+"Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail 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=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"
+"Language: sr\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"
+"X-Project-Style: gnome\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -41,22 +41,34 @@ msgstr ""
 "ÐÑÑÐÐ ÐÐÑÐÑÐÐ?"
 
 #: ../addressbook/addressbook.error.xml.h:4
-msgid "Address '{0}' already exists."
-msgstr "ÐÐÑÐÑÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ."
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"ÐÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐ â{0}â ÑÐ ÐÐÑ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐÐÑÐÑ. ÐÐ ÐÐ ÐÐÐÐ "
+"ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÐ?"
 
 #: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "ÐÐÐÐÑ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐ"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Address '{0}' already exists."
+msgstr "ÐÐÑÐÑÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ."
+
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 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; "
@@ -66,89 +78,101 @@ msgstr ""
 "ÐÑÐÑÐÐÐ. ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐ Ñ ÐÐÐÐÐÐÐÐÐ; ÐÐÐÐÐ ÑÑ "
 "ÐÐÐÐÐÐ ÑÐÐÐÐ ÑÐÑÑÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐ LDAP ÑÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑ."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 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
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÑ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÑÐÑÐÑ â{0}â?"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "ÐÐ _ÐÑÐÑÐ"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ {0} Ñ {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ LDAP ÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÑ."
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1272
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÐÑÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
-msgstr "ÐÑÐÐÑÐÑÐ GroupWise ÐÐÑÐÑÐÑÐ:"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐÑÐÑÐÑÐ:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
-msgstr "LDAP ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "ÐÐÐÑÐÐ â{0}â ÑÐ ÐÐÑ ÐÐ ÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÑÐÐÐÑÐ."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÑÐÐÐÑÐ."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
-msgstr "ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÐÐÑÐ ÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑÑ."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐÑÐÑ ÑÐ ÐÐÐÑÐÐÐÐÐÐÐ ÐÑÐÑÑÐÐ ÐÐ ÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
-"ÐÐÐÐÐ ÐÐÑÑ ÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ Ð "
-"ÑÐÑÑÐÐÑÐ?"
+"ÐÐÐÐÐ ÐÐÑÑ ÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑ ÐÑÐÐÐÐÐÑÐ "
+"ÐÐÐÐÑÐÐÑ Ð ÐÐ ÑÐ ÑÐÑÑÐÐÑÐ?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 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
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "ÐÐÐÑ ÐÐÑÐÑÐÑ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÑÐÐÑÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "This address book server does not have any suggested search bases."
 msgstr "ÐÐÑÐÐÑ ÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ."
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -157,31 +181,31 @@ msgstr ""
 "ÑÐ ÐÑÐÐÐ ÐÐÐÐÑÑÑÐÐÐ."
 
 # ÐÐÐÐ ÐÐÑÐÑÑÐ ;-)
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "ÐÐÐÑ ÐÐÑÐÑÐÑ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
-msgstr "ÐÐÐÑ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ LDAPv3 ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÑ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐ3 ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
-msgstr "ÐÐÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "ÐÑÐÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÑÐ."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ {0}."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 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?"
@@ -189,54 +213,62 @@ msgstr ""
 "ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑ ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ ÐÐÐ ÑÐ ÐÐ ÐÐ "
 "ÐÐÐÐ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐ ÑÐÐÐ?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:38
 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
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÑ ÐÐÑ ÐÐÐ ÐÐÐ ÐÐÑÑÐ. ÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ "
+"ÐÑ ÐÐÐÐÑÐ?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:41
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "ÐÐÐÑÐÐÑÐ ÐÐ {0} ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_ÐÐÐÐÑÐ"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_ÐÐ ÑÑÐÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "Ð_ÑÐÐÐÐÐ ÐÐÐÐÑÐÐÑ"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐ ÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "_ÐÐÐÐÑÑÐÑÐ:"
@@ -247,7 +279,7 @@ msgstr "_ÐÐÐÐÑÑÐÑÐ:"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 #: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
@@ -259,7 +291,7 @@ msgid "Blog:"
 msgstr "ÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ..."
@@ -274,18 +306,18 @@ msgid "Contact"
 msgstr "ÐÐÐÑÐÐÑ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:663
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2862
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:358
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/eab-contact-display.c:911
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "Ð-ÐÐÑÑÐ"
@@ -300,15 +332,15 @@ msgstr "ÐÑÐÐ _ÐÐÐ..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:75
-#: ../addressbook/gui/widgets/eab-contact-display.c:1195
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1306
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "ÐÑÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
-msgstr "ÐÐÑÐÐ ÑÑÑÐÐÐ:"
+msgstr "ÐÐÑÐÑÐÐ ÑÑÑÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
@@ -336,14 +368,13 @@ msgid "Nic_kname:"
 msgstr "ÐÐ_ÐÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:408
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "ÐÑÑÐÐ"
@@ -370,9 +401,9 @@ msgstr "ÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:74
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:1192
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:1303
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "ÐÐÑÐÐ"
@@ -399,7 +430,7 @@ msgstr "_ÐÐÐÐ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_ÐÐÐÐÐÐÐÑ:"
@@ -467,7 +498,7 @@ msgstr "_ÐÐÐÐÐ ÑÐÐÐÐÐÐÑ:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Wants to receive HTML mail"
-msgstr "_ÐÐÐÐ ÐÐ ÐÑÐÐÐ HTML ÐÐÑÑÑ"
+msgstr "_ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐ ÐÐÑÑÑ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
@@ -479,73 +510,73 @@ msgid "_Zip/Postal Code:"
 msgstr "ÐÐÑ_ÑÐÐÑÐÐ ÐÑÐÑ:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "AIM"
-msgstr "AIM"
+msgstr "ÐÐÐ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Jabber"
 msgstr "ÐÐÐÐÑ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Yahoo"
-msgstr "Yahoo"
+msgstr "ÐÐÑÑ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+msgstr "ÐÐÐÑ-ÐÐÐÑ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "MSN"
-msgstr "MSN"
+msgstr "ÐÐÐ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "ICQ"
-msgstr "ICQ"
+msgstr "ÐÐÐÑ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "GroupWise"
-msgstr "GroupWise"
+msgstr "ÐÑÐÑÐÐÐÑÐ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Skype"
 msgstr "ÐÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:219
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÑÐÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:658
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2856
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ - %s"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÐ ÐÐÐÑÐÐÑÐ â %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "_ÐÐÐ ÑÐÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -553,43 +584,43 @@ msgstr ""
 "ÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÑÑ ÐÐÑÑ ÐÑÐÑÐÐÐÐ:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "â%sâ ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑ"
+msgstr "â%sâ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3623
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%sâ%sâ ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑ"
+msgstr "%sâ%sâ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3635
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ%sâ ÑÐ ÐÑÐÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑ."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "ÐÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "_ÐÑÐÐÐ ÐÐÑÐÑÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "_ÐÐÐ Ð ÐÑÐÐÐÐÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "Ð-_ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ"
 
@@ -659,7 +690,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:726
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
@@ -676,37 +707,37 @@ msgid "_List name:"
 msgstr "ÐÐÐ _ÐÐÑÑÐ:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "ÐÐÐÐ_ÐÑÐ..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_ÐÐÑÑÐÑÑÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÐÑÑ ÐÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑ Ñ ÐÐÑÑ ÐÐÑÑÑ:"
+msgstr "_ÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÐÑÑ ÐÐÐ ÐÑÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑ Ñ ÐÐÑÑ ÐÐÑÑÑ:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:851
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1416
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1430
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1444
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÐÑÐÑÑ ÐÐÑÑÐ"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1582
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
 msgid "_Members"
 msgstr "_ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
-msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÑ:"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑ:"
 
 #. Translators: Heading of the contact which has same name or email address in this folder already.
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
@@ -719,16 +750,12 @@ msgid "Duplicate Contact Detected"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-#, fuzzy
-#| msgid ""
-#| "The name or email of this contact already exists in this folder.  Would "
-#| "you like to add it anyway?"
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr ""
-"ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  "
-"ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ?"
+"ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  ÐÐ ÐÐ "
+"ÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÐ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -744,14 +771,14 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "ÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ\n"
-"Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ?"
+"Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ.  ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐ  ÐÐ ÐÐÐÐÑÐ?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "_ÐÑÐÐÐÑÐ"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑ"
 
@@ -759,9 +786,9 @@ msgstr "ÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑ"
 #: ../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:1059
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "ÐÐÑÐ ÐÐÑÐ ÑÐÐÑÐÐ"
 
@@ -775,11 +802,11 @@ msgstr "Ð-ÐÐÑÑÐ ÐÐÑÐÑÐ ÑÐ"
 msgid "Name contains"
 msgstr "ÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "ÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -788,13 +815,13 @@ msgstr[1] "%d ÐÐÐÑÐÐÑÐ"
 msgstr[2] "%d ÐÐÐÑÐÐÐÑÐ"
 msgstr[3] "%d ÐÐÐÑÐÐÑ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:768
 msgid "Search Interrupted"
-msgstr "ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÐÑÑÐ"
+msgstr "ÐÑÐÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
@@ -815,44 +842,41 @@ msgstr "ÐÐÐÑÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÑ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÑ (%s) ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 msgid "Are you sure you want to delete these contacts?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÐÐÑÐ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 msgid "Are you sure you want to delete this contact?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1338
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÑÐÐÑ (%s) ?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
-#, fuzzy, c-format
-#| msgid ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -860,10 +884,10 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐÑ ÐÑÐÐÐÑÐ.\n"
+"ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐ ÐÑÐÐÐÑ.\n"
 "ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ?"
 msgstr[1] ""
-"ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐÑ ÐÑÐÐÐÑÐ.\n"
+"ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐ ÐÑÐÐÐÑÐ.\n"
 "ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ?"
 msgstr[2] ""
 "ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐÑ ÐÑÐÐÐÑÐ.\n"
@@ -872,16 +896,16 @@ msgstr[3] ""
 "ÐÑÐÐÑÐÑÐ %d ÐÐÐÑÐÐÑÐ ÑÐ ÑÐÐÐÑÐ ÐÑÐÐÑÐÑÐ %d ÐÐÐÐÑ ÐÑÐÐÐÑÐ.\n"
 "ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1495
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "_ÐÐ ÐÑÐÐÐÐÑÑ"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "ÐÑÐÐÐÐÐ _ÑÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
@@ -910,7 +934,7 @@ msgid "Car Phone"
 msgstr "ÐÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../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
@@ -918,7 +942,7 @@ msgid "Categories"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Company"
 msgstr "ÐÑÐÐÑÐÐÑÐ"
 
@@ -960,29 +984,29 @@ msgstr "ÐÑÑÐÐ ÑÐÐÐÑÐÐ 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
-msgstr "ISDN ÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÐÑÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Manager"
 msgstr "ÐÑÐÐÐÐÐÐÐÐÑ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Mobile Phone"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Nickname"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:733
 msgid "Note"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
@@ -1017,7 +1041,7 @@ msgid "Role"
 msgstr "ÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Spouse"
 msgstr "ÐÑÐÑÑÐÐÐÐ"
 
@@ -1029,7 +1053,7 @@ msgstr "ÐÑÐÑÑÐÐÐÐ"
 #. different and established translation for this in your language.
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
-msgstr "TTYTDD"
+msgstr "ÐÐÐÐÐÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
@@ -1045,7 +1069,7 @@ msgstr "ÐÐÐÐÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
-msgstr "ÐÐÐ ÑÑÑÐÐÐ"
+msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
@@ -1069,7 +1093,7 @@ msgstr ""
 "\n"
 "ÐÐÑÑÐÐÐÑÐ ÐÐÐÑÐÐÑ\n"
 "\n"
-"ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÑÐÐÑÐ."
+"ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑ ÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
@@ -1155,7 +1179,7 @@ msgstr "ÐÑÐÐÑÐ"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
-msgstr "ÐÐÐÑÐÐÑ ÐÐÑÑÐ: "
+msgstr "ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
@@ -1165,63 +1189,62 @@ msgstr "ÐÐÐÑÐÐÑ: "
 msgid "evolution minicard"
 msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÑ _ÐÐÑÐÑÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:430
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:186
-#: ../widgets/misc/e-web-view.c:435
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:188
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "ÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑ ÐÐÑÐÑÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:210
-#, fuzzy
-#| msgid "Open"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
 msgid "Open map"
-msgstr "ÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:465
-#: ../addressbook/gui/widgets/eab-contact-display.c:878
-msgid "List Members"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐ"
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
+msgid "List Members:"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Department"
 msgstr "_ÐÐÐÑÐÑÐ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Profession"
 msgstr "_ÐÐÐÐÐÐÑÐ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 msgid "Position"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Video Chat"
 msgstr "_ÐÐÐÐÐ ÑÐÐÐÐÐÐÑ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "ÐÐÐÐÐÐÐÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1229,25 +1252,25 @@ msgstr "ÐÐÐÐÐÐÐÑ"
 msgid "Free/Busy"
 msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Fax"
 msgstr "ÐÐÐÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Address"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Home Page"
 msgstr "_ÐÐÑÐÐ ÑÑÑÐÐÐ:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Web Log"
 msgstr "_ÐÐÐ ÐÐÐ:"
 
@@ -1258,33 +1281,37 @@ msgstr "_ÐÐÐ ÐÐÐ:"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:138
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-backend.c:122
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-backend.c:122
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:896
+#: ../addressbook/gui/widgets/eab-contact-display.c:971
+msgid "List Members"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐ"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:989
 msgid "Job Title"
 msgstr "ÐÐÐÑÐ ÐÐ ÐÐÑÐÑ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:933
+#: ../addressbook/gui/widgets/eab-contact-display.c:1026
 msgid "Home page"
 msgstr "ÐÐÑÐÐ ÑÑÑÐÐÐÑÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:942
+#: ../addressbook/gui/widgets/eab-contact-display.c:1035
 msgid "Blog"
 msgstr "ÐÐÐÐ"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1135
-#: ../widgets/misc/e-web-view.c:954
+#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ %s"
@@ -1305,7 +1332,7 @@ msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ.  ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÑÑÐÑÐ %s ÐÐÑÑÐÑÐ Ð ÐÐ "
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ.  ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÑÑÐÑÐ %s Ð ÐÐ ÐÐ "
 "ÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÑÑÑÐÐ."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
@@ -1313,17 +1340,17 @@ 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:162
 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:170
 msgid "Detailed error message:"
@@ -1336,8 +1363,8 @@ msgid ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 msgstr ""
-"ÐÑÐÑ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐ ÐÐÑÐ ÑÐ ÑÐÑÐÐÑ \n"
-"ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ.\n"
+"ÐÑÐÑ ÐÐÑÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÑÑ ÑÐÐÑÑ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐ ÐÐÑÐ ÑÐ ÑÐÑÐÐÑ \n"
+"ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ.\n"
 "ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ ÑÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÑÐ ÐÐÑÐÐÐÑÐÑÐ\n"
 "ÐÑÐÑÐ ÑÐÐÑÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐÐ."
 
@@ -1349,7 +1376,7 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "ÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐ ÑÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐÐ\n"
-"ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ. ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ\n"
+"ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ. ÐÑÐÑÐÐÐÐÑÐ ÐÐÐÐÐÑÑÑÐ\n"
 "ÑÐÐÑ ÐÐÐ ÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÐÐÐ ÑÐÑÐÐÑÐ\n"
 "ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÐÑ."
 
@@ -1385,19 +1412,19 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ"
 msgid "list"
 msgstr "ÐÐÑÑÐ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:524
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:526
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:529
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑÐ Ñ"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:531
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ"
 
@@ -1405,46 +1432,46 @@ msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ"
 msgid "Card View"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-csv-importer.c:741
 #: ../addressbook/importers/evolution-ldif-importer.c:539
 #: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "ÐÐÐÐÐÑÐ..."
+msgstr "ÐÐÐÐÐÐ..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÑÑÐÑÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
-msgstr "ÐÐÐÐÐÐ CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
-msgstr "ÐÐÐÐÑÑÐÑÐ CSV ÐÐÐ Tab (.csv, .tab)"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÐ ÐÐÐ (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
-msgstr "ÐÐÐÐÑÑÐÑÐÐ CSV Ð Tab ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÐ Ð ÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (.ldif)"
+msgstr "ÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ LDIF ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐÐÐÐÐ"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:648
 msgid "vCard (.vcf, .gcrd)"
@@ -1452,44 +1479,42 @@ msgstr "ÐÐÐÑÑÐ (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
-msgstr "ÐÐÐÐÑÑÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐÐÑÑÐ"
+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:714
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
-msgstr "%d. ÑÑÑÐÐÐÑÐ"
+msgstr "%d ÑÑÑÐÐÐÑÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
-msgstr "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, fuzzy, c-format
-#| msgid "Couldn't get list of address books"
+#, c-format
 msgid "Couldn't get list of address books: %s"
-msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑÑ ÐÐÑÐÑÐÑÐ: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/event-page.c:2893
 #: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2313
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:695 ../mail/mail-ops.c:658
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
+#: ../smime/gui/certificate-manager.c:312
 msgid "Unknown error"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s'"
+#, c-format
 msgid "Failed to open client '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐ â%sâ: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
@@ -1501,11 +1526,11 @@ msgstr "ÐÐÐÐÐÐÐ-ÐÐÐÐÐÐÐÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
-msgstr "ÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ ÐÐÐ csv ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ ÐÐÐ ÑÑÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
@@ -1513,7 +1538,7 @@ msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
-msgstr "ÐÐÐÐÐÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
@@ -1521,7 +1546,7 @@ msgid ""
 "100."
 msgstr ""
 "ÐÑÐÑ ÐÐÑÑÐ Ñ ÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ, ÐÐÐÑÐÐÑÐÐÐÐÐÐ "
-"ÐÐÐÐÑÐÐÐ 100."
+"ÐÐÐÐÑÐÐÐ ÑÐ 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
@@ -1531,12 +1556,12 @@ msgstr "ÐÐÐÐ"
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
-"ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÑÑ --help ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÑÐ "
+"ÐÑÐÑÐÐ Ñ ÐÑÐÑÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐ, ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÑÑ â--helpâ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÑÐ "
 "ÐÐÑÐÑÑÐ."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
-msgstr "ÐÐÐÑÐÐÐÐ ÑÐÐÐ csv ÐÐÐ vcard ÐÐÐÐÐ."
+msgstr "ÐÐÐÑÐÐÐÐ ÑÐÐÐ ÑÑÐ ÐÐÐ ÐÐÐÑÐ ÐÐÐÐÐ."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
@@ -1565,80 +1590,80 @@ msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr ""
-"ÐÐÐÐÐÐÐÑ â{0}â ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ Ð ÐÐÑÐ ÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ "
+"ÐÐÐÐÐÐÐÑ â{0}â ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ Ð ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐ. ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ "
 "ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ."
 
 #: ../calendar/calendar.error.xml.h:5
-#, 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
-#, 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."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:8
 msgid "All information in this memo will be deleted and can not be restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:9
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ "
+"ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+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 ""
-"ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑ ÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+"ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:12
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÑÐÑÑÐÐÐÑ ÑÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÐÑÐ ÑÐÐÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐÐÐÑÑÐ ÑÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐÐÐÑÑÐ ÐÐÑÐ ÑÐÐÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 # calendar:prompt-delete-named-task secondary
 # calendar:prompt-delete-task secondary
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÐÑ ÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÑÐÑÐÐÐ Ð ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÑÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ â{0}â ÐÐÐÐÑÐÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ â{0}â?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
@@ -1646,7 +1671,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÑ â{0}â ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÑ â{0}â?"
 
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:19
@@ -1676,7 +1701,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐ
 #: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÑ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÐÐÑÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:25
 #: ../calendar/gui/dialogs/delete-comp.c:190
@@ -1685,40 +1710,36 @@ msgid "Are you sure you want to delete this task?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, 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 "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÑÐÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÑ ÐÐÐ ÑÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:28
-#, 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 "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÑÐÐÐÑÐÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÑÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÐÑ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐÑ â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
-msgstr "ÐÐÑÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "ÐÐÑÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
@@ -1726,11 +1747,11 @@ msgstr "ÐÐ ÑÐÑ_Ð"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ?"
+msgstr "ÐÑÐÑÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÐ?"
+msgstr "ÐÑÐÑÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
@@ -1744,7 +1765,7 @@ msgstr ""
 "ÐÐÐÐÐÐÐÑÐ Ð-ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐ ÑÐÐÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÐÐÑ "
 "ÐÐÐÐÑÐÐ."
 
-# bug: what's RSVP?
+# bug: what's RSVP? - ÑÑÐÐÑÑÑÐÐ: RÃpondre s'il vous plait - ÐÐÐÐÐ ÐÐÑ ÐÐÐÐÐÐÑÐÑÐ.
 #: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
@@ -1767,10 +1788,8 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:46
-#, fuzzy
-#| msgid "Error saving {0} to {1}: {2}"
 msgid "Error on {0}: {1}"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÑÑ {0} Ñ {1}: {2}"
+msgstr "ÐÑÐÑÐÐ {0}Ð: {1}"
 
 #: ../calendar/calendar.error.xml.h:47
 msgid ""
@@ -1802,7 +1821,7 @@ msgid ""
 "calendars up to date."
 msgstr ""
 "ÐÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÐÐ ÐÑÑÐÐÐÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐ ÐÐÐÐÐÐÐÑ ÐÑÐÐ "
-"Ñ ÑÐÐÑ."
+"ÐÑÐÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
@@ -1810,15 +1829,15 @@ msgid ""
 "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 ""
@@ -1874,7 +1893,7 @@ msgstr "ÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐ
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐÑÑ?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
@@ -1882,11 +1901,11 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÑÐ
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÑÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÑÐ?"
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
@@ -1899,19 +1918,19 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÐÐÐ ÑÑÐÑÐÐÑÐÐÐ Ð
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÐ?"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÑÑÐÑÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid ""
@@ -1919,41 +1938,41 @@ msgid ""
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr ""
-"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ GroupWise ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
+"ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ ÑÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ "
 "ÑÐÐÑ ÐÐÐÐÑÑÐÑÐ. ÐÐÑÐÐÑÐ ÑÐ ÐÐ ÑÐÑÐÐÑ ÐÑÐÐ ÐÐÐÐÐÑÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:76
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÐÐÐÐÑÐ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ, ÐÐÐ ÐÐÐÐÐÐ ÑÐÑ ÐÐÑÑ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:79
 msgid "You have made changes to this memo, but not yet saved them."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÑÐ ÐÐÑ ÐÐÐÐÑÐÑ, ÐÐÐ ÐÑÐÐÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÐ ÑÑÐ ÐÐÑ ÐÐÐÐÑÐÑ, ÐÐÐ ÑÐÑ ÐÐÑÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../calendar/calendar.error.xml.h:83
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
@@ -1961,10 +1980,10 @@ msgstr "_ÐÐÑÑÐÐÑ"
 
 #: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
-msgstr "ÐÐÑÑÐÐÑ ÐÑÐ_ÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑ ÐÐ_ÐÐÐÐ"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_ÐÐÑÐÑÐ"
@@ -1994,15 +2013,13 @@ msgstr[3] "ÑÐÑ"
 #. (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/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#, fuzzy
-#| msgid "day"
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
-msgstr[0] "ÐÐÐ"
-msgstr[1] "ÐÐÐ"
-msgstr[2] "ÐÐÐ"
-msgstr[3] "ÐÐÐ"
+msgstr[0] "ÐÐÐÐ"
+msgstr[1] "ÐÐÐÐ"
+msgstr[2] "ÐÐÐÐ"
+msgstr[3] "ÐÐÐÐ"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
@@ -2018,8 +2035,8 @@ msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐ"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
 #: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "ÐÐÐÐÑÐÑÐ:"
@@ -2041,11 +2058,9 @@ msgstr "ÐÑÐ_ÐÐÑÐ"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:379
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#, fuzzy
-#| msgid "days"
 msgid "days"
 msgstr "ÐÐÐÐ"
 
@@ -2071,49 +2086,50 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 msgid "minutes"
 msgstr "ÐÐÐÑÑÐ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÑÐÐÐÑÐÐ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÐ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 msgid "No location information available."
 msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑÐ."
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
 #, fuzzy, c-format
-#| msgid "You have %d alarms"
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "ÐÑÐÑ ÐÐÑÑÐÐÑÐÐÐÑ ÐÐÐÑÐÐ: %d"
-msgstr[1] "ÐÑÐÑ ÐÐÑÑÐÐÑÐÐÐÑ ÐÐÐÑÐÐ: %d"
-msgstr[2] "ÐÑÐÑ ÐÐÑÑÐÐÑÐÐÐÑ ÐÐÐÑÐÐ: %d"
-msgstr[3] "ÐÑÐÑ ÐÐÑÑÐÐÑÐÐÐÑ ÐÐÐÑÐÐ: %d"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "ÐÐÐÑÐ %d ÐÐÐÑÐ"
+msgstr[1] "ÐÐÐÑÐ %d ÐÐÐÑÐÐ"
+msgstr[2] "ÐÐÐÑÐ %d ÐÐÐÑÐÐ"
+msgstr[3] "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐ"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÐ ÑÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐÐÐÐ\n"
-"ÑÐ ÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÑÐÐ Ð-ÐÐÑÑÐ, ÐÐÐ ÑÐ ÐÐÐÑ\n"
-"ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÑÐ\n"
+"ÐÐÐÐÑÑÐÑÐ ÑÐÑ ÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐÐÐÐ\n"
+"ÑÐ ÐÐÐÐÐÑÑÐÑÐÐÐ ÐÑÑÐÐ Ð-ÐÐÑÑÐ, ÐÐÐ ÐÐÐÑ ÐÐÐÑÐÑÐÐÐ\n"
+"ÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÑÐ\n"
 "ÑÐÐÑÑÐ ÑÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÑÑÐ."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2123,14 +2139,14 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ. ÐÐÐÑ ÐÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐ "
+"ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ. ÐÐÐÑ ÐÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐ "
 "ÐÐÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÑÐÐ:\n"
 "\n"
 "        %s\n"
 "\n"
-"ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÑÐÐÑÐÐ?"
+"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÑÐÐÑÐÐ?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÑÐÐÑÐÐ."
 
@@ -2147,7 +2163,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d ÑÐÑ"
 msgstr[1] "%d ÑÐÑÐ"
 msgstr[2] "%d ÑÐÑÐ"
-msgstr[3] "%d ÑÐÑ"
+msgstr[3] "ÐÐÐÐÐ ÑÐÑ"
 
 #. 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:402
@@ -2158,7 +2174,7 @@ msgid_plural "%d minutes"
 msgstr[0] "%d ÐÐÐÑÑ"
 msgstr[1] "%d ÐÐÐÑÑÐ"
 msgstr[2] "%d ÐÐÐÑÑÐ"
-msgstr[3] "%d ÐÐÐÑÑ"
+msgstr[3] "ÐÐÐÐÐ ÐÐÐÑÑ"
 
 #. 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"
@@ -2171,7 +2187,7 @@ msgid_plural "%d seconds"
 msgstr[0] "%d ÑÐÐÑÐÐÐ"
 msgstr[1] "%d ÑÐÐÑÐÐÐ"
 msgstr[2] "%d ÑÐÐÑÐÐÐ"
-msgstr[3] "%d ÑÐÐÑÐÐÐ"
+msgstr[3] "ÐÐÐÐÐ ÑÐÐÑÐÐÐ"
 
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
@@ -2203,7 +2219,7 @@ msgstr "ÐÑÐÐÐÐÐ"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
-msgstr "_ÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐ"
 
 #: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
@@ -2215,7 +2231,7 @@ msgid "Classification"
 msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:759 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
@@ -2247,7 +2263,7 @@ msgstr "ÐÐÑÑÐÑÐ"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "ÐÐÑÑÐ"
 
@@ -2257,14 +2273,14 @@ msgid "Organizer"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:757 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "ÐÐÑÐÐ"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:748 ../calendar/gui/e-cal-model.c:755
-#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "ÐÐÐÐÐ"
 
@@ -2280,7 +2296,7 @@ msgstr "ÐÑÐÑÑÐÐÐÑÑ"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "ÐÐÐÐÑÐÐ"
 
@@ -2310,8 +2326,10 @@ msgid "is not"
 msgstr "ÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "ÐÐÐÐÑ ÑÐÑ"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2334,37 +2352,43 @@ msgid "Send an email"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÑÐÑ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "ÐÐÐÐÑ ÐÐÐÑÐ"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "ÐÐÐÑÐ"
+msgid "Custom _message"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ _ÐÐÑÑÐÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom _message"
-msgstr "ÐÑÐÐÐÐÐÑÐÐÐ _ÐÐÑÑÐÐ"
+#, fuzzy
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
+msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐ"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "ÐÐ_ÑÑÐÐ:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "ÐÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
@@ -2379,7 +2403,9 @@ msgid "_Program:"
 msgstr "_ÐÑÐÐÑÐÐ:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
+#, fuzzy
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
 msgstr "ÐÐ_ÐÐÐÐ ÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
@@ -2402,7 +2428,7 @@ msgstr "ÐÐÐ(Ð)"
 msgid "end of appointment"
 msgstr "ÐÑÐÑ ÑÐÑÑÐÐÐÐ"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "extra times every"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÑ ÐÐ ÑÐÐÐÐÑ"
@@ -2429,87 +2455,90 @@ msgid "A_dd"
 msgstr "_ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "ÐÐÐÑÐÐ"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "ÐÐÐ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:511
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "_ÐÐÐ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_ÐÐÐ:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_ÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_ÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "_ÐÐÐÐÐÐÐÐ ÑÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "ÐÐÑ_Ð:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1012
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2946
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "ÐÐÑÑÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
-msgstr "ÐÐ_ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
-msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -2526,372 +2555,366 @@ msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÑÐÑÐÐÐ."
 #: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  ÐÐÑÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐÐÐ. ÐÐÐÐÐÐÑÐÑÐ ÐÑ Ð ÐÐÑÐÐÑÐÑÐ ÑÑÐÑÐÐÐÑ?"
+msgstr ""
+"%s  ÐÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐ. ÐÐ ÐÐÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÐ Ð ÐÐ ÐÐÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  ÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ, ÐÐÑÐÐÑÐÑÐ ÑÑÐÑÐÐÐÑ?"
+msgstr "%s  ÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐ, ÐÐ ÐÐÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
-msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑ ÑÐ ÐÑÐÐÐÑÐÐ."
+msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑ ÑÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
-msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐÐÑÐÐ."
+msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐ."
 
 #: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
-msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÑÐÐÐ."
 
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  ÐÐÑÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐÐÐ. ÐÐÐÐÐÐÑÐÑÐ ÐÑ Ð ÐÑÐÐÐÐÑÐ ÑÑÐÑÐÐÐÑ?"
+msgstr "%s  ÐÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÐÐÐ. ÐÐ ÐÐÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÐ Ð ÐÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  ÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ, ÐÑÐÐÐÐÑÐ ÑÑÐÑÐÐÐÑ?"
+msgstr "%s  ÐÐÑÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐ, ÐÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐÐÐÑ?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÑÐ: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:588
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:714
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:721
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
-msgstr "ÐÐÑÑÐÐÐÐ - %s"
+msgstr "ÐÐÑÑÐÐÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:723
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ - %s"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:729
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:731
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
-msgstr "ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:736
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
-msgstr "ÐÐÐÐÑÐÐ - %s"
+msgstr "ÐÐÐÐÑÐÐ â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "ÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:873
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "ÐÐÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐÐÑ ÑÑÐÐÐÑ?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-msgid "Click here to close the current window"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÑÐÐÐÑ"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "Close the current window"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1077 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
-msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
-#: ../shell/e-shell-window-actions.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-msgid "Click here to view help available"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÐÑ ÐÐÐÐÑ"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "View help"
+msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
-msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-msgid "Click here to save the current window"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑÑÐ ÐÑÐÐÐÑ"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+msgid "Save current changes"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
-msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÑÐÐÑÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "ÐÐÐÐ_ÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_ÐÑÐÑÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "ÐÐÑÐ_ÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "_ÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1175
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_ÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_ÐÑÐÐÐÐ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1194
-msgid "Click here to attach a file"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "ÐÐ_ÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "ÐÑÐÐÐÐÑÐÐ _ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "Ð_ÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "ÐÐÐÐ_ÑÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
-msgstr "_ÐÐÐÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1253
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
-msgstr "_RSVP"
+msgstr "_ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ RSVP ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
-msgstr "_ÐÑÐÑÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
-msgstr "_ÐÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ _ÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐÐ ÑÐÐ ÐÑÐÑÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1295
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "ÐÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2017
+#: ../calendar/gui/dialogs/comp-editor.c:2053
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2353
-#: ../calendar/gui/dialogs/comp-editor.c:2516
-#: ../calendar/gui/dialogs/comp-editor.c:3494
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑ ÑÑÐÐÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÐ ÐÑÐÐ ÐÐÑÑÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3458
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "ÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3526
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÐÐÑÐ!"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐ!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "ÐÐÑÐÐÐÑÑÐ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
-#, fuzzy
-#| msgid "Cannot create a new event"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 msgid "Cannot create object"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑ"
 
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_ÐÐÑÐÑÐ ÐÐÑ ÑÑÐÐÐÑ ÐÐ ÑÐÐÑ ÐÑÑÐÐÐÑ ÐÐÑÑÐÐÑÐÐÑ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ?"
+msgstr ""
+"ÐÐ ÐÐ ÐÐ _ÐÐÐÑÐÑÐÐ ÐÐÑ ÑÑÐÐÐÑ ÐÐ ÑÐÐÑ ÐÑÑÐÐÐÑ ÐÐÑÑÐÐÑÐÐÑ ÑÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐ?"
 
 #: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
-msgstr ""
+msgstr "_ÐÐÑÑÐ ÐÐÐÐÐÑÐÑ"
 
 #. 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"
+#, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
 #. 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"
+#, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-#, fuzzy, c-format
-#| msgid "The memo could not be deleted due to an error"
+#, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
 #. 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"
+#, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
 #: ../calendar/gui/dialogs/delete-error.c:75
 msgid "The event could not be deleted because permission was denied"
-msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÐÑ ÐÑÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÐÑ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/delete-error.c:78
 msgid "The task could not be deleted because permission was denied"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÐÑ ÐÑÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÐÑ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/delete-error.c:81
 msgid "The memo could not be deleted because permission was denied"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÑ ÐÑÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÑ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
 #: ../calendar/gui/dialogs/delete-error.c:84
 msgid "The item could not be deleted because permission was denied"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÑ ÐÑÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÐÑ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
 #. 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"
+#, c-format
 msgid "The event could not be deleted due to an error: %s"
-msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐ: %s"
 
 #. 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"
+#, c-format
 msgid "The task could not be deleted due to an error: %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÑÐÐ: %s"
 
 #. 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"
+#, c-format
 msgid "The memo could not be deleted due to an error: %s"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐ: %s"
 
 #. 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"
+#, c-format
 msgid "The item could not be deleted due to an error: %s"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÑÑÐÐÐ ÐÑÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ ÐÑÐÑÐÐ: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -2906,12 +2929,16 @@ msgid "Enter Delegate"
 msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "ÐÐÐ_ÑÐÐ"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ"
+#, fuzzy
+#| msgid "Set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "ÐÐÑÑÐÐÐ ÐÐÐ ÐÑÐÑÑÑÐ ÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2919,7 +2946,7 @@ msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ _ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
@@ -2937,7 +2964,7 @@ msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐ"
 #: ../calendar/gui/dialogs/event-editor.c:242
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
-msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
@@ -2955,21 +2982,19 @@ msgstr "Ð_ÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ:"
 msgid "Query free / busy information for the attendees"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐ ÑÑÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "ÐÑÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-editor.c:582
-#, fuzzy
-#| msgid "Print this message"
 msgid "Print this event"
-msgstr "ÐÑÐÐÐÐÑ ÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑ ÐÐÑÑÐÑ"
 
 #: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
@@ -2986,11 +3011,13 @@ msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐ
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
+#, fuzzy
+#| msgid "This event has alarms"
+msgid "This event has reminders"
 msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐÐ ÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑ:"
@@ -3005,7 +3032,7 @@ msgstr "ÐÐÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÐÐÑÑÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:1430
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
@@ -3023,12 +3050,12 @@ msgstr "ÐÑÐÐÐ ÐÐÐÑÑÐÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÑÐÑ."
 
 #: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ."
 
@@ -3041,10 +3068,9 @@ msgid "Atte_ndees"
 msgstr "ÐÑ_ÐÑÐÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-page.c:2891
-#, fuzzy, c-format
-#| msgid "Unable to open the calendar '%s'."
+#, c-format
 msgid "Unable to open the calendar '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ â%sâ : %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3054,7 +3080,7 @@ msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ â%sâ."
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2939
 #: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "ÐÐÐÑÑÐÑÐ Ñ ÐÐÐ %s"
@@ -3095,47 +3121,53 @@ 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.
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "ÐÑ_ÐÑÐÐÑÐ..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÑÐ:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "ÐÐÐÑ ÐÐÐÐÑÐÑÐ"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "ÐÑÐÐÐÐÑÐÐ _ÐÐÐÐ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_ÐÐÐÑÐ"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_ÐÐÐÑ:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "_ÐÐÐÐÑÐÑÐ:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "ÐÐÐÑÐÑÐÐÐ!"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_ÐÐÐÐÑÐÐ:"
@@ -3145,42 +3177,32 @@ msgstr "_ÐÐÐÐÑÐÐ:"
 msgid "_Time:"
 msgstr "_ÐÑÐÐÐ:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#, fuzzy
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 ÐÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#, fuzzy
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 ÑÐÑ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#, fuzzy
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "15 ÐÐÐÑÑÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#, fuzzy
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "ÐÐ"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#, fuzzy
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "ÐÐ"
@@ -3234,7 +3256,7 @@ msgid "Select Date"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐ"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Select _Today"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÐÑÑÐ ÐÐÐ"
 
@@ -3242,15 +3264,13 @@ msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÐÑÑÐ ÐÐÐ"
 msgid "September"
 msgstr "ÐÐÐÑÐÐÐÐÑ"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/memo-editor.c:156
-#, fuzzy
-#| msgid "Print the list of memos"
 msgid "Print this memo"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/memo-page.c:393
 msgid "Memo's start date is in the past"
@@ -3265,15 +3285,14 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "ÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐÑÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/memo-page.c:924
-#, fuzzy, c-format
-#| msgid "Unable to open memos in '%s'."
+#, c-format
 msgid "Unable to open memos in '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ : %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2478
-#: ../mail/em-format-html.c:2543 ../mail/em-format-html.c:2567
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "ÐÑÐÐÐ"
 
@@ -3294,8 +3313,10 @@ msgstr "_ÐÑÐÐÐ:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_ÐÑÑÐÐ:"
+#, fuzzy
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "_ÐÑÐÐÐÐÐ:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3333,76 +3354,76 @@ msgstr "ÐÐÐÑ Ð ÐÑÐÑÑÐ ÑÐÐÑÐ"
 msgid "All Instances"
 msgstr "ÐÐÐ ÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "ÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÑÑÐÐÐ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
-msgstr "ÐÑÐÐÐ ÐÐÐÑÑÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐ ÐÑÐÑÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÑÐ"
+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:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
-msgstr "ÐÐ"
+msgstr "Ñ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [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:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
-msgstr "ÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐ"
 
 #. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
 #. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
 #. * (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:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
-msgstr "ÐÑÑÐÐÑ"
+msgstr "ÐÑÑÐÐÐ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (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:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
-msgstr "ÑÑÐÑÐÑ"
+msgstr "ÑÑÐÑÐÐ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 #. * (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:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
-msgstr "ÑÐÑÐÑÑÐÑ"
+msgstr "ÑÐÑÐÑÑÐÐ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
-msgstr "ÐÐÑÐ"
+msgstr "ÐÐÑÐÐ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
-msgstr "ÐÐÑÐÐÐÑÐÑ"
+msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "ÐÑÑÐÐ ÐÐÑÑÐ"
 
@@ -3410,7 +3431,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:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "ÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ"
 
@@ -3418,7 +3439,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:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "ÐÐ ÑÐÐÐÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐÐ"
 
@@ -3426,73 +3447,73 @@ 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:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "ÐÐ ÐÐÐÐÐÑÐÑ ÐÑÐÐÐ ÐÐ ÑÑÐÐÐÑÐÑ ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "ÐÐÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "ÐÑÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "ÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "ÐÐÑÐÑÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "ÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "ÐÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 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:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "ÐÐÑÐÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2140
 msgid "Add exception"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2181
 msgid "Could not get a selection to modify."
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐÑÐÑÐ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Modify exception"
-msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2231
 msgid "Could not get a selection to delete."
-msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÑÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐ ÐÐÐÐÑ ÑÐÐÐ ÐÑÐÑÐÑÐ."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2365
 msgid "Date/Time"
 msgstr "ÐÐÑÑÐ/ÐÑÐÐÐ"
 
@@ -3514,62 +3535,50 @@ 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/recurrence-page.ui.h:8
-#, fuzzy
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 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/recurrence-page.ui.h:10
-#, fuzzy
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 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/recurrence-page.ui.h:12
-#, fuzzy
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 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/recurrence-page.ui.h:14
-#, fuzzy
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 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/recurrence-page.ui.h:16
-#, fuzzy
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 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/recurrence-page.ui.h:18
-#, fuzzy
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 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/recurrence-page.ui.h:20
-#, fuzzy
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "ÐÐÐÐÐÐ(Ð)"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
+#, fuzzy
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐ ÑÐ ÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
@@ -3587,11 +3596,11 @@ msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../calendar/gui/e-cal-component-preview.c:300
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3600,61 +3609,61 @@ msgstr "ÐÑÐÐÐÐÐÐ"
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
-msgstr "ÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 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:321
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
-msgstr "ÐÐÐÐ"
+msgstr "ÐÐÐÐÐ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1518 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
-msgstr "ÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐ"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
@@ -3678,10 +3687,10 @@ msgstr "ÐÑÐÑÑÑ"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
-msgstr "ÐÐÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
@@ -3702,26 +3711,24 @@ msgstr "ÐÐÑ_ÐÑÐ ÑÑÐÑÑÑÐ"
 
 #: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÑ ÐÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÑÑÐÑÑÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐ ÑÑÐÑÑÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
-msgstr "ÐÐÐ_ÑÑÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐ"
+msgstr "ÐÐÐ_ÑÑÐÐÑÑÐ ÑÐÐÑÐ"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
-#, fuzzy
-#| msgid "Print the list of tasks"
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
@@ -3737,22 +3744,21 @@ msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÐÐÑÐ, ÐÐÑÑÐ ÑÐ
 
 #: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐÑÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÑÐ, ÐÐÑÐ ÑÑÐ ÐÐÑÑÐ ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "ÐÑÐÐÐÐ_ÐÐÑÐÑ:"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
-msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÑÐÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
+msgstr "ÐÑÐÑÑÐ ÑÐÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
-#, fuzzy, c-format
-#| msgid "Unable to open tasks in '%s'."
+#: ../calendar/gui/dialogs/task-page.c:1737
+#, c-format
 msgid "Unable to open tasks in '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ â%sâ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ : %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3795,49 +3801,49 @@ msgstr "ÐÐÐÑÑÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐ"
 #: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr "%s %s ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐ"
+msgstr "%s %s ÐÑÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
-msgstr "%s %s ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐ"
+msgstr "%s %s ÐÐÐÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
-msgstr "%s ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "%s ÐÐ ÐÐÑÐÑÐÑ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
-msgstr "%s %s ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐ"
+msgstr "%s %s ÐÑÐ ÐÑÐÑÐ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
-msgstr "%s %s ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ"
+msgstr "%s %s ÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr "%s ÐÐ ÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑ"
+msgstr "%s ÐÐ ÐÑÐÑÑ ÑÐÑÑÐÐÐÐ"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
 #: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
-msgstr "%s ÐÐ %s"
+msgstr "%s Ñ %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
@@ -3846,49 +3852,49 @@ 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:669
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "ÐÐÐÐÑÐÐ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÐ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
-msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÑÐÑÐÐ:"
+msgstr "ÐÑÐÑÑÐ ÑÐÐ:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:290
 #: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "ÐÑÐÑÑÑ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "ÐÐÐÐÐÑÑ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "ÐÐÐÑ:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "ÐÐÐÑÐÐÑÐÐÐ"
 
@@ -3900,7 +3906,7 @@ msgstr "ÐÐÑÑÐ ÐÐÐÑÑÐÑÐÐ"
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
-msgstr "ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
@@ -3908,12 +3914,12 @@ msgid "Start Date"
 msgstr "ÐÐÑÑÐ ÐÐÑÐÑÐÐ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "ÐÐÑÐÐÑÐ"
 
@@ -3938,51 +3944,51 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "ÐÐ"
 
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/e-cal-model.c:1520
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../calendar/gui/e-cal-model.c:1522
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../calendar/gui/e-cal-model.c:2629
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
-msgstr "ÐÑÐÐÑÐÑÐ %s"
+msgstr "ÐÑÐÐÑÐÐ â%sâ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% ÐÐÐÑÑÐÐÐ"
+msgstr "% ÑÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
@@ -3994,11 +4000,11 @@ msgstr "ÐÐÑÑÐ ÐÐÐÑÑÐÑÐÐ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
-msgstr "ÐÐÑÑÐ ÐÐ ÐÐÐÑÑÐÑÐÐ"
+msgstr "ÐÑÐÑÑÐ ÑÐÐ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "ÐÐÐÐÐÑÑ"
 
@@ -4033,24 +4039,24 @@ msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐ"
 #: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
 #: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
-msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1086
 msgid "Updating objects"
-msgstr "ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÐÑÐÐ ÐÐÑÐÐÐÑ"
 
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2596
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2602
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
@@ -4064,7 +4070,7 @@ msgstr "ÐÐ ÑÐÐÐÑÐÐÐ"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "ÐÐÐÐÐÐÑÐÐÐ"
 
@@ -4075,8 +4081,8 @@ 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:1926 ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ: %s <%s>"
@@ -4084,14 +4090,14 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐÑ: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "ÐÐÑÑÐ: %s"
@@ -4149,16 +4155,16 @@ msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÑ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:178
-#: ../modules/calendar/e-calendar-preferences.c:227
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
 #: ../calendar/gui/e-day-view-time-item.c:876
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:254
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "ÐÐÐÐÐÑÐ..."
 
@@ -4192,7 +4198,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1016
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4208,7 +4214,7 @@ msgstr "%a %d %b"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -4217,20 +4223,20 @@ msgstr "%d. %b"
 #: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
 #: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
-msgstr "am"
+msgstr "ÐÑÐ"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
 #: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
 #: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
-msgstr "pm"
+msgstr "ÐÐÐ"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
 #: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
-msgstr "%d. ÐÐÐÐÑÐ"
+msgstr "%d ÐÐÐÐÑÐ"
 
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
@@ -4317,21 +4323,21 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "Ð ÑÐÐÑ"
 
-#: ../calendar/gui/e-meeting-store.c:1834
-#, fuzzy, c-format
-#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#: ../calendar/gui/e-meeting-store.c:1841
+#, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ <b>%s</b> ÐÐ ÑÐÑÐÐÑÑ <b>%s</b>"
+msgstr ""
+"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÐÐ âÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑâ ÐÐ ÑÐÑÐÐÑÑ â%sâ ÐÐÐ "
+"ÐÐÑÐÑÐÐÐ â%sâ"
 
-#: ../calendar/gui/e-meeting-store.c:1844
-#, fuzzy, c-format
-#| msgid "Failed to create thread: %s"
+#: ../calendar/gui/e-meeting-store.c:1851
+#, c-format
 msgid "Failure reason: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ: %s"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐÐÑÐ: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1849
+#: ../calendar/gui/e-meeting-store.c:1856
 #: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:448
 #: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -4454,53 +4460,53 @@ msgstr "ÐÐÐÐÐ"
 msgid "Member"
 msgstr "ÐÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:418
-#: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
 #: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* ÐÐÐ ÑÐÐÐÑÐÐ *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:586 ../calendar/gui/e-task-table.c:806
 msgid "Start: "
 msgstr "ÐÐÑÐÑÐÐ:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:605 ../calendar/gui/e-task-table.c:824
 msgid "Due: "
-msgstr "ÐÐ: "
+msgstr "ÐÐÐ: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "ÐÐÑÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 
 # Don't use any other specifiers.
 # strftime format %d = day of month, %b = abbreviated
@@ -4510,47 +4516,46 @@ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑ"
 #. %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:543
-#, fuzzy, c-format
-#| msgid "%d %b"
+#: ../calendar/gui/e-task-table.c:546
+#, c-format
 msgid "%d%%"
-msgstr "%d. %b"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
-#: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../calendar/importers/icalendar-importer.c:1003
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
 #: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:951
 msgid "Cut selected tasks to the clipboard"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:957
 msgid "Copy selected tasks to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:963
 msgid "Paste tasks from the clipboard"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:969
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:975
 msgid "Select all visible tasks"
 msgstr "ÐÐÑÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ"
 
 # month name. You can change the order but don't
 # change the specifiers or add anything.
@@ -4562,8 +4567,10 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "ÐÐÐ ÐÐÐÑÐÐ."
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "ÐÐÐ ÐÐÐÐÐÑÐÑÐ."
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4588,7 +4595,7 @@ msgstr "ÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
-msgstr "ÐÑÐÐÑÐ ÑÐÐÑÑ"
+msgstr "ÐÐÐÑÑÐÑÐÑ"
 
 #: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
@@ -4656,21 +4663,21 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÐ
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1012
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1025
-#: ../modules/calendar/e-cal-shell-view-private.c:1028
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -4678,10 +4685,10 @@ msgstr "%a %d %b %Y."
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1056
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -4711,44 +4718,44 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑ"
 msgid "calendar view for one or more weeks"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÑ ÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ"
 
-#: ../calendar/gui/gnome-cal.c:2215
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "ÐÑÐÑÐÑÐ"
 
-#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ ÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐ."
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐÐ"
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÑÑ"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÑ"
 
-#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÑÑÐ"
 
-#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÑÑ"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ"
@@ -4757,7 +4764,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:803
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ Ñ ÑÐÐÐÑÐÐÐ"
@@ -4769,7 +4776,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:810 ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "ÐÐÐÐÑÐÐÐ"
@@ -4778,7 +4785,7 @@ msgstr "ÐÐÐÐÑÐÐÐ"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "ÐÐÐÐÐÐÑÐÐÐ"
@@ -4786,7 +4793,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:830
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "ÐÑÐÐÐÐÐÐ"
@@ -4794,7 +4801,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:837
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "ÐÑÐÐÐÐ"
@@ -4802,7 +4809,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:844
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "ÐÑÐÐÐÐ"
@@ -4810,29 +4817,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:851
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "ÐÑÐÑÐÐ-ÐÑÐÐÐÐÐ"
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "ÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ (%s ÐÐ %s)"
+msgstr "ÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ (%s ÐÐ %s)"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:969
 msgid "Unable to book a resource, the new event collides with some other."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑ, ÐÐÐÐ ÐÐÐÐÑÐÑ ÑÐ ÐÐÑÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÑ, ÐÐÐÐ ÐÐÐÐÑÐÑ ÑÐ ÑÑÐÐÐÑÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÐÐ."
 
-#: ../calendar/gui/itip-utils.c:966
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑ, ÐÑÐÑÐÐ:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÑ, ÐÑÐÑÐÐ:"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÑÐÐÐ ÐÐÐÐÑÐÑÐ."
 
@@ -4991,78 +4998,78 @@ msgstr "ÐÑ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
-msgstr " ÐÐ "
+msgstr " ÐÐ "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
-msgstr " (ÐÐÐÑÑÐÐÐ "
+msgstr " (ÐÐÐÑÑÐÐÐ ÑÐ "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
-msgstr "ÐÐÐÑÑÐÐÐ "
+msgstr "ÐÐÐÑÑÐÐÐ ÑÐ "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
-msgstr " (ÐÐ "
+msgstr " (ÐÐÐ "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
-msgstr "ÐÐ "
+msgstr "ÐÐÐ "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "ÐÐÐÐÑÐÐ: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "ÐÑÐÑÑÑÐÐ:"
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "ÐÑÐÑÑÑ: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "ÐÐÐÐÐÑÑ: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "ÐÐÑÑÐÑÐÐ ÐÐÐÑÑÐÐÐÐ: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "ÐÐÑÐÑÐ: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "ÐÐÑÐÐÐÑÐÑÐ: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "ÐÐÐÑÐÐÑÐ: "
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
-msgstr "% ÐÐÐÑÑÐÐÐ"
+msgstr "% ÑÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
@@ -5084,190 +5091,184 @@ msgstr "ÑÐ ÐÐÑÐ ÐÐ"
 msgid "Appointments and Meetings"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2085
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ (.ics)"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "ÐÐÐÑÐÑÐÐÐ!"
 
-#: ../calendar/importers/icalendar-importer.c:716
-#, fuzzy
-#| msgid "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÐ (.vcf)"
+msgstr "ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
-msgstr "ÐÐÐÐÐÐÐÑÑÐÐ ÐÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "ÐÐÐÐÑÐÑ"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "ÐÐÐÐÑÐÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ÐÐÐ ÐÐÐÐÐÑÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1089
-#, fuzzy
-#| msgid "This and Prior Instances"
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "ÐÐÐÑ Ð ÐÑÐÑÑÐÐÐÐ ÑÐÐÑÐ"
+msgstr "ÑÐ ÐÑÐÐÐÑÐÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1126
+#, fuzzy
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ÐÐÐ ÐÐÐÑÐÐ"
+msgid "has reminders"
+msgstr "ÐÑÐ_ÐÐÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1099
-#, fuzzy
-#| msgid "%s attachment"
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
-msgstr "%s ÐÑÐÐÐÐ"
+msgstr "ÐÐÐ ÐÑÐÐÐÐÐ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "ÐÐÐÐÐ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "ÐÐÑÐÐ"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "ÐÐÐÐÑÑÑÐÐÐÑÐ"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1165
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "ÐÐÑÑÐ"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../calendar/importers/icalendar-importer.c:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "ÐÐÑÐÑÐÐ"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
-#, fuzzy
-#| msgid "Due"
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "ÐÐÐ"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "ÐÑÐÑ"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1206
 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:1198
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ÐÐÐÑÑÐÐÐ"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "ÐÐÑÐÑÐ"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "ÐÑÐÐÐÐÐÐÑÐÑ"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "ÐÑÐÑÐÐÑÐ"
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "ÐÐÐÑ"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1419
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "ÐÐÐ"
@@ -5424,7 +5425,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÑÐÐÐ"
 
 #: ../calendar/zones.h:57
 msgid "Africa/Lome"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐ"
 
 #: ../calendar/zones.h:58
 msgid "Africa/Luanda"
@@ -5456,7 +5457,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÑ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÐ"
 
 #: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
@@ -5464,7 +5465,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÐÐÑÐÐÐÑÐ"
 
 #: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÑÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÑÑÐÐÐ"
 
 #: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
@@ -5480,7 +5481,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÑÐÐÑÐÑ"
 
 #: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÑÐÑ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÑÐÑ"
 
 #: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
@@ -5504,7 +5505,7 @@ msgstr "ÐÑÑÐÐÐ/ÐÑÐÐÑ"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐ/ÐÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -5532,7 +5533,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÑÑÐÐ"
 
 #: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÑÑÐÐ"
 
 #: ../calendar/zones.h:85
 msgid "America/Barbados"
@@ -5556,7 +5557,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÑÐ"
 
 #: ../calendar/zones.h:90
 msgid "America/Boise"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐ"
 
 #: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
@@ -5592,7 +5593,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐ"
 
 #: ../calendar/zones.h:99
 msgid "America/Chihuahua"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÑÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÐÑÐ"
 
 #: ../calendar/zones.h:100
 msgid "America/Cordoba"
@@ -5604,7 +5605,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÐÑÑÐÑÐÐÐ"
 
 #: ../calendar/zones.h:102
 msgid "America/Cuiaba"
-msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÑÑÐÐÐ"
 
 #: ../calendar/zones.h:103
 msgid "America/Curacao"
@@ -5672,7 +5673,7 @@ msgstr "ÐÐÐÑÐÐÐ/ÐÑÐÐÐÐÐ"
 
 #: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
-msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐ/ÐÐÐÐÐÐÑÐÐ"
 
 #: ../calendar/zones.h:120
 msgid "America/Guatemala"
@@ -6617,7 +6618,7 @@ msgstr "ÐÐÑÐÐÐ/ÐÐÐÑÐÐ"
 
 #: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "ÐÐÑÐÐÐ/ÐÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐÐ/ÐÐÐÐÑÐÐÑÐ"
 
 #: ../calendar/zones.h:356
 msgid "Europe/Zurich"
@@ -6665,7 +6666,7 @@ msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÐÑ"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÐ/ÐÐÑÐÐÐÐ"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -6827,11 +6828,6 @@ msgstr "ÐÐÑÐÑÐÐ/ÐÐÐ"
 msgid "Save as..."
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐ..."
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
-msgid "Attach a file"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ"
-
 #: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
@@ -6839,7 +6835,7 @@ msgstr "_ÐÐÑÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
 #: ../composer/e-composer-actions.c:303
 msgid "New _Message"
@@ -6849,13 +6845,13 @@ msgstr "ÐÐÐÐ _ÐÐÑÑÐÐ"
 msgid "Open New Message window"
 msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ"
 
 #: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
 #: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
@@ -6863,7 +6859,7 @@ msgstr "ÐÐÑÑÐÐÑ _ÐÐÐ..."
 
 #: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ"
 
 #: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
@@ -6883,7 +6879,7 @@ msgstr "ÐÐÑÑÐÐÑ ÐÐÐ _ÐÐÑÑÑ"
 
 #: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
-msgstr "ÐÑÐÐ ÐÐÐ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐ ÐÐÑÑÑ"
 
 #: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
@@ -6891,31 +6887,31 @@ msgstr "ÐÐÑ_ÐÑÐ"
 
 #: ../composer/e-composer-actions.c:373
 msgid "Send this message"
-msgstr "ÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
 
 #: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
-msgstr "PGP _ÑÐÑÑÑÑ"
+msgstr "ÐÐÐ _ÑÐÑÑÑÑ"
 
 #: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
-msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ PGP-Ð"
+msgstr "ÐÐÑÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ ÐÐÐ-Ð"
 
 #: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
-msgstr "PGP _ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐ _ÐÐÑÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
-msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ PGP ÐÑÑÑÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ ÐÐÐ ÐÑÑÑÐ"
 
 #: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
-msgstr ""
+msgstr "ÐÐÐÐÑÐÑÐ _ÑÐÐÐÐ"
 
 #: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÑ ÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÑÐÑÐ Ñ ÐÐÑÑ ÐÐÑÑÐÑ"
 
 #: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
@@ -6935,39 +6931,39 @@ msgstr "ÐÑÐÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐ
 
 #: ../composer/e-composer-actions.c:421
 msgid "S/MIME En_crypt"
-msgstr "S/MIME _ÑÐÑÑÑÑ"
+msgstr "Ð/ÐÐÐÐ _ÑÐÑÑÑÑ"
 
 #: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ S/MIME ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÑÑ Ð/ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
-msgstr "S/MIME _ÐÐÑÐÐÑÐ"
+msgstr "Ð/ÐÐÐÐ _ÐÐÑÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ S/MIME ÑÐÑÑÐÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÑ ÐÐÑÑÐÑ Ð/ÐÐÐÐ ÑÐÐÑÐÑÐÐ"
 
 #: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
-msgstr "_Bcc ÐÐÑÐ"
+msgstr "_ÐÑÑ ÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ BCC ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÑÑ ÐÑÐÐÐÐÐÐÐ"
 
 #: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
-msgstr "_Cc ÐÐÑÐ"
+msgstr "_ÐÑ ÐÐÑÐ"
 
 #: ../composer/e-composer-actions.c:447
 msgid "Toggles whether the CC field is displayed"
-msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ CC ÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐ"
 
 #: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
-msgstr "ÐÐÐÐ_ÐÐÑ-ÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ_ÐÐÑ-ÐÐ"
 
 #: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
@@ -6983,17 +6979,17 @@ msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÑ (cc) ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (cc) ÐÐÑÑÐÐ"
 
 #: ../composer/e-composer-header-table.c:45
 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:1020
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "Ð_ÐÑÐ:"
 
@@ -7001,31 +6997,31 @@ 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:1029
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_ÐÐÐÐÐÐÑ-ÐÐ:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_ÐÑÐÐÐ:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
-msgstr "_ÐÐÐÐÑÐ (Cc):"
+msgstr "_ÐÑ:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
-msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (Bcc):"
+msgstr "_ÐÑÑ:"
 
-#: ../composer/e-composer-header-table.c:1048
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
-msgstr "Ð_ÐÐÑÐ ÐÐ:"
+msgstr "ÐÐÑÐÐÐ _ÐÐ:"
 
-#: ../composer/e-composer-header-table.c:1052
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "ÐÐ_ÑÐÐÐ:"
 
-#: ../composer/e-composer-header-table.c:1061
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "ÐÐÑÐ_ÐÑ:"
 
@@ -7055,39 +7051,34 @@ msgstr "ÐÑÐÑÑÐÐÑÑÐ Ð ÐÐÐÐÑÑÑÐ ÑÐÐÑÑ"
 
 #: ../composer/e-composer-private.c:372
 msgid "Save draft"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÑÑÑ"
 
-#: ../composer/e-msg-composer.c:791
+#: ../composer/e-msg-composer.c:808
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ "
+"ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐ "
 "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../composer/e-msg-composer.c:800
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ "
-"ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
+"ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ: ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑÐ "
+"ÐÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../composer/e-msg-composer.c:1695 ../composer/e-msg-composer.c:2079
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../composer/e-msg-composer.c:4159
-#, fuzzy
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:4213
 msgid "The composer contains a non-text message body, which cannot be edited."
-msgstr ""
-"<b>(ÐÐÑÑÐÐÑÐÑ Ñ ÑÐÐÑ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÐÑÑ, ÑÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.)<b>"
+msgstr "ÐÐÑÑÐÐÑÐÑ Ñ ÑÐÐÑ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐ ÑÐÐÑÑ, ÑÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../composer/e-msg-composer.c:4864
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
@@ -7104,32 +7095,26 @@ msgid "All accounts have been removed."
 msgstr "ÐÐÐ ÐÐÐÐÐÐ ÑÑ ÑÐÐÐÑÐÐÐ."
 
 #: ../composer/mail-composer.error.xml.h:3
-#, fuzzy
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐ %s: %s."
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÑÐÐÐÐ ÑÑÐÐÑÐ Ñ ÐÐÑÐÑ ÑÐÑÑÐÐÐÐ ÐÐÑÑÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÑÐÐÐÐ ÑÑÐÐÑÐ Ñ ÐÐÑÐÑ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:5
-#, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÑÐÐÐÐ ÑÐÐÑÐ. ÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
 
 #: ../composer/mail-composer.error.xml.h:6
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÐÑÐÐÐÑÐÐÑ â{0}â, ÐÐÑÑ ÑÐÑÑÐÐÑÐÑÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÐÑÐÐÐÑÐÐÑ â{0}â, ÐÐÑÑ ÑÐÑÑÐÐÑÐÑÐ?"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "ÐÐÐÐ &quot;{0}&quot;, ÐÐÐÐÐ ÐÑÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÑ."
+msgstr "ÐÐÐÐ â{0}â, ÐÐÐÐÐ ÐÑÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÑ."
 
 # mail-composer:no-sig-file secondary
 # mail:no-create-tmp-path secondary
@@ -7138,7 +7123,7 @@ msgstr "ÐÐÐÐ &quot;{0}&quot;, ÐÐÐÐÐ ÐÑÐÐ ÐÐÑÑÐÐÐÐ ÐÑÑÐ
 # system:no-load-file secondary
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
-msgstr "ÐÐÐÐ &quot;{1}&quot;."
+msgstr "ÐÐÐÐ â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid ""
@@ -7146,6 +7131,9 @@ msgid ""
 "Outbox folder. When you are back online you can send the message by clicking "
 "the Send/Receive button in Evolution's toolbar."
 msgstr ""
+"ÐÐÑÐ ÑÑÐ ÑÐÐÐÑÐ ÐÐÐ ÐÑÐÐÐ, ÐÐÑÑÐÐ ÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÑÐÑ ÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÐ "
+"ÐÐ ÑÐÐÑÐ. ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐ ÐÑÐÐÑ ÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐ "
+"ÐÐÑÐÑÐ/ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid ""
@@ -7153,37 +7141,37 @@ msgid ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
-"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÑÐÑÐ ÑÑÐÑÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÑÐÐ ÐÐÐ "
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÑÑÐÑÐÐ ÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ, ÐÑÐÐ ÐÐÐ "
 "ÐÐÐÑÑÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÐ ÐÐÑÑÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ "
 "ÐÐÑÑÐÑ ÐÐÑÐÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑ."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ &quot;{0}&quot;."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐ {0}."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ Ñ ÑÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑÐÑÐÐÑ &quot;{0}&quot;."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ Ñ ÑÐÐÐÑÑÐÐÑÑÑÑ ÐÐÑÐÑÐÐÑ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÑÑÐÐÐ ÐÐÑÑÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÐÑÑÐÐÐ ÐÐÑÑÐÐ?"
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "ÐÑÐÑÐÐÐÐÑÐ Ñ ÑÐÐÑ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ?"
+msgstr "ÐÑÐÑÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ?"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÑ ÑÐÐÐÑÑÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ &quot;{1}&quot;."
+msgstr "ÐÑÐÑÐÐ Ñ ÑÑÐÐÑÑ ÑÐÐÐÑÑÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐ â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
@@ -7194,89 +7182,76 @@ msgstr ""
 "ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÑÑÐ ÑÑÐÐÐ."
 
 #: ../composer/mail-composer.error.xml.h:19
-#, fuzzy
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to Outbox."
-msgstr "ÐÑÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
+msgstr "ÐÑÐÐÐ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:20
-#, 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}â ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ Ð ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐ Ñ ÐÐÑÑÑÐ."
+msgstr "ÐÐÑÐÑÐÐÐ â{0}â ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ Ð ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐ Ñ ÐÐÑÑÑÐ."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-#, fuzzy
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
-msgstr "ÐÐÑ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ &quot;{0}&quot;."
+msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÐÑÐ â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
-msgstr ""
+msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÐÑÐ â{0}â. ÐÐÑÑÐÐ ÐÐÑÐÐÑÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr ""
+msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐ ÐÐÑÐÑÐ â{0}â. ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:24
-#, fuzzy
-#| msgid "You cannot attach the file `{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â ÐÐÐÑ ÐÐÑÑÑÐ."
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â ÐÐÐÑ ÐÐÑÑÑÐ."
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÑÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ."
 
 #: ../composer/mail-composer.error.xml.h:26
-#, fuzzy
-#| msgid "An error occurred during processing: %s"
 msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
+msgstr "ÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÐ ÐÐ ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÐÑÑ-ÐÐÑÐÐÐ."
 
 #. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
-msgstr "_ÐÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐ _ÑÑÐÑÐÐÐÑÐ"
 
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
-msgstr "ÐÐ ÑÐÐÑÐ_ÐÐÑ"
+msgstr "Ð_Ð ÑÐÐÑÐÐÐÑ"
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
-msgstr "ÐÐÐ_ÑÐ"
+msgstr "_ÐÐÐÑÐ"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑ _ÐÐÑÑÑ"
 
 #: ../composer/mail-composer.error.xml.h:33
-#, fuzzy
-#| msgid "_Save as mbox..."
 msgid "_Save to Outbox"
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ mbox..."
+msgstr "ÐÐÑÑÐÐÑ _Ñ âÐÐ ÑÐÐÑÐâ"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
-msgstr ""
+msgstr "_ÐÐÐÑÑÐÑ ÐÐÐÑ"
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
-msgstr "ÐÐ ÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../capplet/anjal-settings-main.c:154
 msgid "socket"
-msgstr "ÑÐÐÐÑ"
+msgstr "ÐÑÐÐÑÑÑÐÐ"
 
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
-msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐ."
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐ."
 
 #: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
@@ -7291,283 +7266,265 @@ msgid "Please enter your password."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÑ."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
-msgstr "CalDAV"
+msgstr "ÐÐÐÐÐÐ"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
-msgstr "Google"
+msgstr "ÐÑÐÐ"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "ÐÐÑÐÐ ÐÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "ÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:489
-#, fuzzy
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
-msgstr "ÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:497
-#, fuzzy
-#| msgid "Receiving mail"
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "ÐÐÐ ÑÐÑÐÐÑÐ: "
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:548
-#, fuzzy
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
-msgstr "ÐÐÑÑÑÑÐ"
+msgstr "ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 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:592
+#: ../capplet/settings/mail-account-view.c:609
 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:594
+#: ../capplet/settings/mail-account-view.c:611
 msgid "You can specify more options to configure the account."
 msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:596
+#: ../capplet/settings/mail-account-view.c:613
 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:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "ÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 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:613
-#: ../mail/em-account-editor.c:2180 ../mail/em-account-editor.c:2301
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2233 ../mail/em-account-editor.c:2366
 msgid "Identity"
 msgstr "ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
-msgstr "ÐÐÐÑÐÐ - ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
-msgstr "ÐÐÐÑÐÐ - ÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
-msgstr "ÐÐÐÐÐ - ÐÐÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÐÑÐÑÐÑ"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
-msgstr "ÐÐÐÑÐÐ - ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
-msgstr "ÐÐÐÐÐ - ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
-msgstr "ÐÐÐÑÐÐ - ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
-msgstr "ÐÐÐÑÐÐ - ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐ â ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
-msgstr "ÐÐÐÐÐ - ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3140
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3226
 msgid "Defaults"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
-msgstr "ÐÐÐÐÐ - ÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "ÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
-msgstr "ÐÐÐÐÐ - ÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐ â ÐÐÐÑÐ"
 
-#: ../capplet/settings/mail-account-view.c:740
-#, fuzzy
-#| msgid "Add WebDAV contacts to Evolution."
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
-msgstr "ÐÐÐÐÑÐ WebDAV ÐÐÐÑÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:741
-#, fuzzy
-#| msgid "Add Google Calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
-msgstr "ÐÐÐÐÑÐ Google ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
-msgstr "ÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ IMAP ÐÑÐÑÑÑÐ."
+msgstr "ÐÐÐÐÐ ÑÐÑÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÑÑÐ."
 
-#: ../capplet/settings/mail-account-view.c:754
-#, fuzzy
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:780
-#, fuzzy
-#| msgid "Add weather calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:801
 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:793
-#, fuzzy
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:807
-#, fuzzy
-#| msgid "Choose calendar file"
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÑ ÐÐÐÐÐÐÐÑÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "ÐÐÐÐÐÐÐ:"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1145
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 # On This Computer is always first and VFolders is always last
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
-#: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:744 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166
+#: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:102
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "ÐÐ ÐÐÐÐ ÑÐÑÑÐÐÑÑ"
 
 #: ../capplet/settings/mail-settings-view.c:145
-#, fuzzy, c-format
-#| msgid "Modify"
+#, c-format
 msgid "Modify %s..."
-msgstr "ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐ %s..."
 
 #: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
-msgstr "ÐÐÐÐÑ ÐÐÐÐ ÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
@@ -7579,7 +7536,7 @@ msgstr "ÐÐÑÑÐÐÐÐ"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
-msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
@@ -7593,18 +7550,18 @@ msgstr "ÐÐÐÐÑÑÐÑÐ"
 
 #: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
-msgstr "ÐÐÑÑÐ Ð ÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐ â ÐÐÑÑÐ Ð ÐÐÐÐÐÐÐÑ"
 
 # bug(slobo): tooltip ÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐ Ð âÐÐÑÐÑÐÑÐ Ð-ÐÐÑÑÐÑ ÐÑÐÑÐÑÐÑÐÐÐ Ð ÐÐÑÐÐ
 # ÐÐÐÐÐ ÑÑÑÐÐÑÐÐÐÑ ÐÑÐÐÐÐÐÐÐ
 # msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÐÐÑ ÐÑÐÐÑÐÐÐ"
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
-msgstr "ÐÐÐÐÑ Groupware"
+msgstr "ÐÐÐÐÑ ÐÑÑÐÐ"
 
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÑÑÐÐ, ÐÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐÑÑÐ ÐÐÑÐÐ ÐÐÑÑÐÐ, ÐÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Configure email accounts"
@@ -7630,20 +7587,19 @@ msgstr "%s (ÐÐÐÑÑÐÐÐ)"
 #: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
-msgstr ""
+msgstr "%s (ÑÐÐÐÐ)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
 #: ../e-util/e-activity.c:237
-#, fuzzy, c-format
-#| msgid "%s (cancelled)"
+#, c-format
 msgid "%s (cancelling)"
-msgstr "%s (ÐÑÐÐÐÐÐÐ)"
+msgstr "%s (ÐÑÐÐÐÑÑÐÐ)"
 
 #: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: ../e-util/e-activity.c:244
 #, c-format
@@ -7652,39 +7608,39 @@ msgstr "%s (%d%% ÐÐÐÑÑÐÐÐ)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
-msgstr "ÐÑÐÐÑÐÐ"
+msgstr "ÐÑÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:54
 msgid "Baltic"
-msgstr "ÐÐÐÑÐÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐÐ"
 
 #: ../e-util/e-charset.c:55
 msgid "Central European"
-msgstr "ÐÐÐÑÑÐÐÐÐÐÐÑÐÐÑÐÐ"
+msgstr "ÐÐÐÑÑÐÐÐÐÐÐÑÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:56
 msgid "Chinese"
-msgstr "ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:57
 msgid "Cyrillic"
-msgstr "ÐÐÑÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:58
 msgid "Greek"
-msgstr "ÐÑÑÐÐ"
+msgstr "ÐÑÑÐÐ"
 
 #: ../e-util/e-charset.c:59
 msgid "Hebrew"
-msgstr "ÐÐÐÑÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÑÐÐ"
 
 #: ../e-util/e-charset.c:60
 msgid "Japanese"
-msgstr "ÐÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:61
 msgid "Korean"
-msgstr "ÐÐÑÐÑÑÐÐ"
+msgstr "ÐÐÑÐÑÑÐÐ"
 
 #: ../e-util/e-charset.c:62
 msgid "Thai"
@@ -7692,7 +7648,7 @@ msgstr "ÐÐÑÐÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "ÐÑÑÑÐÐ"
+msgstr "ÐÑÑÑÐÐ"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -7700,36 +7656,36 @@ msgstr "ÐÐÐÐÐÐ"
 
 #: ../e-util/e-charset.c:65
 msgid "Western European"
-msgstr "ÐÐÐÐÐÐÐÐÐÑÐÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐÐÑÐÐÑÐÐ"
 
 #: ../e-util/e-charset.c:66
 msgid "Western European, New"
-msgstr "ÐÐÐÐÐÐÐÐÐÑÐÐÑÐÐ, ÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÐÐÑÐÐÑÐÐ, ÐÐÐÐ"
 
 #. 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 "ÐÑÐÐÐÑÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐÐ"
 
 #. 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 "ÐÐÑÐÐÐÐÑÑÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÑÑÐÐÑÐÐÐ"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
 #: ../e-util/e-charset.c:101
 msgid "Ukrainian"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ"
 
 #. Translators: Character set "Hebrew, Visual"
 #: ../e-util/e-charset.c:105
 msgid "Visual"
-msgstr "ÐÐÐÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÐ"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7748,76 +7704,62 @@ msgstr "ÐÑÑÐ"
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:220
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Mon"
-msgstr "ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑÐÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:226
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Tue"
-msgstr "_ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:232
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Wed"
-msgstr "_ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:238
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Thu"
-msgstr "_ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:244
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Fri"
-msgstr "ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑÐÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:250
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Sat"
-msgstr "ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑÐ %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:256
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Sun"
-msgstr "ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑÐ %a"
 
 #: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
 #: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
-msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ"
+msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ"
 
 #: ../e-util/e-datetime-format.c:554
 msgid "Format:"
@@ -7831,14 +7773,14 @@ msgstr "(ÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÐ)"
 #: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
-msgstr "ÐÐÐÑÐÐÐÑÐ â%sâ"
+msgstr "ÐÐÐÑÑÑÐÐ â%sâ"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
 #: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "ÐÐÐÑÐÐÐÑÐ â%sâ Ñ %s"
+msgstr "ÐÐÐÑÑÑÐÐ â%sâ Ñ %s"
 
 #: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:380
@@ -7848,16 +7790,16 @@ msgstr "ÐÐÐÐÑÐ"
 
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÐÐ ÐÑÐÐÐ ÑÑÐÐÐÐÑÐ"
 
 #: ../e-util/e-print.c:168
 msgid "The printing system reported the following details about the error:"
-msgstr "ÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐ Ð ÐÑÐÑÐÐ:"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐÐÑÐ ÐÐÑÐÑÐ Ð ÐÑÐÑÑÐ:"
 
 #: ../e-util/e-print.c:174
 msgid ""
 "The printing system did not report any additional details about the error."
-msgstr "ÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ Ð ÐÑÐÑÐÐ."
+msgstr "ÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐ Ð ÐÑÐÑÑÐ."
 
 #: ../e-util/e-signature.c:707
 msgid "Autogenerated"
@@ -7874,11 +7816,11 @@ msgstr "ÐÐÐÐ â{1}â."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÑ â{0}â."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÐÑÐÑÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ â{0}â."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -7888,125 +7830,123 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÑÐ?"
 msgid "File exists \"{0}\"."
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ â{0}â."
 
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "_ÐÑÐÐÐÑÐ"
 
 #: ../e-util/e-util.c:117
 msgid "Could not open the link."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÑ."
 
 #: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ."
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
-msgstr "GConf ÐÑÐÑÐÐ: %s"
+msgstr "ÐÐÐÐÑ ÐÑÐÑÐÐ: %s"
 
-#: ../e-util/gconf-bridge.c:1329
+#: ../e-util/gconf-bridge.c:1343
 msgid "All further errors shown only on terminal."
 msgstr "ÐÐÐ ÐÑÐÑÐÐ ÑÐ ÑÐÑÐÑÑÐ ÐÑÐÐÐÐÑÑÑ ÑÐÐÐ Ñ ÑÐÑÐÐÐÐÐÑ."
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1054
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "ÐÐÑÐ"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1055
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "ÐÐÐÐÐÐÑ"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2479 ../mail/em-format-html.c:2547
-#: ../mail/em-format-html.c:2570 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
-msgstr "ÐÐÐÐÑÐ (Cc)"
+msgstr "ÐÑ"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2551
-#: ../mail/em-format-html.c:2573 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
-msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ (Bcc)"
+msgstr "ÐÑÑ"
 
-#: ../em-format/em-format-quote.c:428 ../em-format/em-format.c:1059
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "ÐÐÑÐÐÐ"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:439 ../mail/em-format-html.c:2667
-#: ../modules/mail/em-mailer-prefs.c:1124
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "ÐÐÑÐÑÐÐÐÑ"
 
-#: ../em-format/em-format-quote.c:520 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ --------"
 
 #: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "ÐÐÑÑÐ"
 
-#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
-msgstr "ÐÑÑÐÐ ÐÐ ÐÐÑÑÐ"
+msgstr "ÐÑÑÐÐ ÐÐÑÑÐ"
 
-#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "ÐÐÑÐ"
 
-#: ../em-format/em-format.c:1465
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s ÐÑÐÐÐÐ"
 
-#: ../em-format/em-format.c:1576
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ S/MIME ÐÐÑÑÐÐ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ Ð/ÐÐÐÐ ÐÐÑÑÐÑ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../em-format/em-format.c:1768 ../em-format/em-format.c:1994
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ MIME ÐÐÑÑÐÐ. ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÑ. ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ."
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÑÐÐ ÑÐÑÑÐ ÐÐ multipart/encrypted"
+msgstr "ÐÐÐÐÐÑÐÐÐÐ ÑÐÐ ÑÐÑÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐ/ÑÐÑÑÐÐÐÐ (multipart/encrypted)"
 
-#: ../em-format/em-format.c:1799
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP/MIME ÐÐÑÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ/ÐÐÐÐ ÐÐÑÑÐÑ"
 
-#: ../em-format/em-format.c:1800
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP/MIME ÐÐÑÑÐÐ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ/ÐÐÐÐ ÐÐÑÑÐÑ: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../em-format/em-format.c:2019
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:2032 ../em-format/em-format.c:2214
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2199
-#: ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../em-format/em-format.c:2307
-#, fuzzy
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ PGP ÐÐÑÑÐÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÑ:"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
@@ -8114,8 +8054,8 @@ msgstr[3] "ÐÑÐ %d ÐÐÑÐÑ"
 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[1] "%d ÐÐÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑÐ"
+msgstr[2] "%d ÐÐÑÐÑÐ Ñ ÐÑÐÑÑÐÐÑÑ"
 msgstr[3] "%d ÐÐÑÐÑ Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
 #: ../filter/e-filter-datespec.c:78
@@ -8206,7 +8146,9 @@ msgid "No reply or parent"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÑÐÑÐ"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
 msgstr "Ð_ÐÑÑÑÐ ÐÐÑÐ"
 
 #: ../filter/e-filter-rule.c:784
@@ -8232,15 +8174,15 @@ msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "ÐÐÑ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ &quot;{0}&quot;."
+msgstr "ÐÐÑ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ â{0}â."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÐÑÐÐÐ ÐÐÑÐÐÐ &quot;{1}&quot;."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÑÐÐ ÐÐÑÐÐ â{1}â."
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "ÐÐÑÐÑÐÐÐ &quot;{0}&quot; ÐÐ ÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ."
+msgstr "ÐÐÑÐÑÐÐÐ â{0}â ÐÐ ÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -8251,13 +8193,13 @@ msgid "Missing file name."
 msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÐ."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐ."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
-msgstr "ÐÐÐ &quot;{0}&quot; ÑÐ ÐÐÑ ÑÐÐÑÑÐÐÑÐÐÐ."
+msgstr "ÐÐÐ â{0}âÑÐ ÐÐÑ ÑÐÐÑÑÐÐÑÐÐÐ."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -8346,8 +8288,138 @@ msgstr "ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐ"
 msgid "years"
 msgstr "ÐÐÐÐÐÐ"
 
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "ÐÐÑÑÐ"
+
+#: ../mail/em-account-editor.c:926
+msgid "Never"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../mail/em-account-editor.c:927
+msgid "Always"
+msgstr "ÐÐÐÐ"
+
+#: ../mail/em-account-editor.c:928
+msgid "Ask for each message"
+msgstr "ÐÐÑÐÑ ÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1786 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "ÐÐÑÑÐ"
+
+#: ../mail/em-account-editor.c:2230
+msgid "Mail Configuration"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+
+#: ../mail/em-account-editor.c:2231
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"ÐÐÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÐÐÐÐÑÑÐÑÐ.\n"
+"\n"
+"ÐÐÐÐÐÐÑÐ âÐÐÑÑÐÐÐâ ÐÐ ÐÐÐÐÑÐÐÑÐ. "
+
+#: ../mail/em-account-editor.c:2234
+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:2236 ../mail/em-account-editor.c:2425
+msgid "Receiving Email"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Please configure the following account settings."
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
+
+#: ../mail/em-account-editor.c:2239 ../mail/em-account-editor.c:3022
+msgid "Sending Email"
+msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
+
+#: ../mail/em-account-editor.c:2240
+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:2242 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ"
+
+#: ../mail/em-account-editor.c:2243
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"ÐÐÐÑÐÑÐ ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ.\n"
+"ÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÐÑÐÐÐÐ."
+
+#: ../mail/em-account-editor.c:2247
+msgid "Done"
+msgstr "ÐÑÐÑÐÐÐ"
+
+#: ../mail/em-account-editor.c:2248
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"ÐÐÑÑÐÑÐÐÐ, ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÐÐÑÑÐÐÐ.\n"
+"\n"
+"ÐÐÐÐ ÑÑÐ ÑÐÑÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÑÐÑÑ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ.\n"
+"\n"
+"ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐâ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐ."
+
+#: ../mail/em-account-editor.c:2784
+msgid "Check for _new messages every"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
+
+# bug: plural-forms
+#: ../mail/em-account-editor.c:2792
+msgid "minu_tes"
+msgstr "ÐÐÐÑ_ÑÐ"
+
+#: ../mail/em-account-editor.c:3365 ../mail/mail-config.ui.h:101
+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:3419 ../mail/em-account-editor.c:3502
+msgid "Receiving Options"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
+
+#: ../mail/em-account-editor.c:3420 ../mail/em-account-editor.c:3503
+msgid "Checking for New Messages"
+msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8360,22 +8432,22 @@ msgstr[3] "ÐÑÐÐÐÐ"
 #: ../mail/e-mail-attachment-bar.c:608
 #: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
-msgstr "ÐÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐ"
 
 #: ../mail/e-mail-attachment-bar.c:610
 #: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
-msgstr "ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÑ"
 
 #: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
-msgstr ""
+msgstr "(ÐÐÐ ÑÑÐÑÐÐÑÐ)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -8390,16 +8462,12 @@ msgid "_From This Address"
 msgstr "_ÐÐ ÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../mail/e-mail-display.c:87
-#, fuzzy
-#| msgid "_Send To..."
 msgid "Send _Reply To..."
-msgstr "_ÐÐÑÐÑÐ ÐÐ..."
+msgstr "_ÐÐÑÐÑÐ ÐÐÐÐÐÐÑ..."
 
 #: ../mail/e-mail-display.c:89
-#, fuzzy
-#| msgid "Send a mail message to this address"
 msgid "Send a reply message to this address"
-msgstr "ÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑ ÐÐÑÐÑÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ ÐÐÑÐÑÑ"
 
 #: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
@@ -8415,57 +8483,55 @@ msgid "Forwarded messages"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../mail/e-mail-folder-utils.c:391
-#, fuzzy
-#| msgid "Mark the selected messages for deletion"
 msgid "Scanning messages for duplicates"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÑÑÐÐÐÐ"
 
 #: ../mail/e-mail-folder-utils.c:584
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[1] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[2] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[3] "ÐÐÐÐÐÑÐÑÐ %d ÐÐÑÑÐÐ"
+msgstr[0] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÑ"
+msgstr[1] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
+msgstr[2] "ÐÐÐÐÐÑÐÐ %d ÐÐÑÑÐÐ"
+msgstr[3] "ÐÐÐÐÐÑÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../mail/e-mail-folder-utils.c:833
 #, c-format
 msgid "Removing folder '%s'"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/e-mail-folder-utils.c:948
-#, fuzzy, c-format
-#| msgid "All accounts have been removed."
+#: ../mail/e-mail-folder-utils.c:967
+#, c-format
 msgid "File \"%s\" has been removed."
-msgstr "ÐÐÐ ÐÐÐÐÐÐ ÑÑ ÑÐÐÐÑÐÐÐ."
+msgstr "ÐÐÑÐÑÐÐÐ â%sâ ÑÐ ÑÐÐÐÑÐÐÐ."
 
-#: ../mail/e-mail-folder-utils.c:952
-#, fuzzy
-#| msgid "All accounts have been removed."
+#: ../mail/e-mail-folder-utils.c:971
 msgid "File has been removed."
-msgstr "ÐÐÐ ÐÐÐÐÐÐ ÑÑ ÑÐÐÐÑÐÐÐ."
+msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐÐ."
 
-#: ../mail/e-mail-folder-utils.c:1011
-#, fuzzy
-#| msgid "Saving attachment"
+#: ../mail/e-mail-folder-utils.c:1030
 msgid "Removing attachments"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../mail/e-mail-folder-utils.c:1177
+#: ../mail/e-mail-folder-utils.c:1194
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
-msgstr[0] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[1] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[2] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
-msgstr[3] "ÐÑÐÐÑÐ %d ÐÐÑÑÐÐ"
+msgstr[0] "ÐÑÐÐÐ %d ÐÐÑÑÐÑ"
+msgstr[1] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
+msgstr[2] "ÐÑÐÐÐ %d ÐÐÑÑÐÐ"
+msgstr[3] "ÐÑÐÐÐ ÑÐÐÐÑ ÐÐÑÑÐ"
 
-#: ../mail/e-mail-folder-utils.c:1515 ../mail/em-folder-utils.c:577
-#, fuzzy, c-format
-#| msgid "Invalid folder: `%s'"
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:612
+#, c-format
 msgid "Invalid folder URI '%s'"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "ÐÐÑÑÐÐÑ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ:"
 
 #: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
@@ -8499,7 +8565,7 @@ msgid "_Later"
 msgstr "ÐÐÑÐÐ_ÑÐ"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:676
+#: ../modules/mail/e-mail-shell-view-actions.c:679
 msgid "Add Label"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÐÑ"
 
@@ -8512,8 +8578,8 @@ msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"ÐÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÐ ÐÐÐÐ Ñ ÐÐÐÐÑÐ ÐÐÑÐÑÑÐ\n"
-"ÑÐ ÐÐÐ ÑÐÑÐÑÐÐÐÑÐ Ñ ÐÐÐÐÑÑ."
+"ÐÐÐÐÐÐÐÐ: ÐÐÐÐÑÑÐÐ ÐÐÐÐ Ñ ÐÐÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ\n"
+"ÐÐÐ ÑÐÑÐÑÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐÐÑ."
 
 #: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
@@ -8527,30 +8593,30 @@ msgstr "ÐÐÑÐ"
 msgid "Name"
 msgstr "ÐÐÐ"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:309
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:717
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "ÐÐÐÐÑÑÐ"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "ÐÐÑÑÑÐ"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "ÐÐ ÑÐÐÑÐ"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:725
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "ÐÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8559,7 +8625,7 @@ msgstr "ÐÐÐÐÐÐÐ"
 
 #: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
-msgstr "ÐÑÐÐÐÑÐÑÐ..."
+msgstr "ÐÑÐÐÐÑÐÐ..."
 
 #: ../mail/e-mail-migrate.c:168
 msgid "Migration"
@@ -8568,7 +8634,7 @@ msgstr "ÐÑÐÐÐÐÐÐ"
 #: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
-msgstr "ÐÑÐÐÐÑÐÑÐ â%sâ:"
+msgstr "ÐÑÐÐÐÑÐÐ â%sâ:"
 
 #: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
@@ -8581,971 +8647,783 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"ÐÐÑÐÐÑ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐ ÐÐ SQLite ÑÐÑ ÐÐ ÐÐÐÐÑÑÐÑÐ 2.24.\n"
+"ÐÐÑÐÐÑ ÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÑÐÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐÐÑÑ ÑÐÑ ÐÐ ÐÐÐÐÑÑÐÑÐ 2.24.\n"
 "\n"
 "ÐÑÐÐÑÐ ÑÑÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 msgid "Unable to create local mail folders at '%s': %s"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ Ñ â%sâ: %s"
 
-#: ../mail/e-mail-notebook-view.c:578
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ."
 
-#: ../mail/e-mail-reader-utils.c:139
-#, fuzzy
-#| msgid "Do not ask me again"
-msgid "Do not warn me again"
-msgstr "ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ"
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÑ"
 
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
-#, c-format
-msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../mail/e-mail-reader-utils.c:960
-msgid "Save Message"
-msgid_plural "Save Messages"
-msgstr[0] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
-msgstr[1] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
-msgstr[2] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
-msgstr[3] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
-
-#. Translators: This is part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * mbox format, when the first message doesn't have a
-#. * subject.  The extension ".mbox" is appended to the
-#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:981
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "ÐÐÑÑÐÐ"
-msgstr[1] "ÐÐÑÑÐÐ"
-msgstr[2] "ÐÐÑÑÐÐ"
-msgstr[3] "ÐÐÑÑÐÐ"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÑ"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "ÐÑÐÐÐÑÑÐ Ñ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "ÐÑÐ_ÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_ÐÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ-ÐÐ: ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ."
+msgstr "_ÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÐÐÐÐÐÑ-ÐÐ:â ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ."
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "ÐÐ_ÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "ÐÐÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐ ÐÐ _ÑÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐ _ÑÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
-msgstr "ÐÐÐÑÑÐÑÐÑ ÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÑÐÑÐÑÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_ÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÑ _ÐÐÑÑÑ..."
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "ÐÐÐÑÐÑ ÐÐ _ÐÑÐÐÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "ÐÐÐÑÐÑ ÐÐ ÐÐÑ_ÐÑÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "ÐÐÐÑÐÑ ÐÐ _ÐÐÑÐÐÐ..."
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
-msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐ ÐÐÑÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "ÐÑÐ_ÐÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "Ð_ÑÐÐÐÑÐ Ñ ÐÐÑÑÑÐ..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÑÑÐÐÑÑÐ ÑÐÐÑÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "ÐÐÐÐ_ÐÐ ÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "ÐÐÐÐÑ_Ð ÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "ÐÐÐ_ÐÐ..."
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "ÐÑÐ_ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÐÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "ÐÐÑÑ_ÐÑ"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 msgid "Forward the selected message in the body of a new message"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ Ñ ÑÐÐÑ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
-msgstr "ÐÑÐÑÐÐÐÐ _ÑÐÑÑÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÑÐÑÑÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_ÐÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÑÐÑÐÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐ _ÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
-msgstr "ÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ Ñ HTML ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_ÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "ÐÐ_ÑÐ ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 msgid "Mark the selected messages as not being junk"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "ÐÑÐ_ÑÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "ÐÐ_ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 msgid "Mark the selected messages as not having been read"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_ÐÑÐÐÐ ÐÐÐ ÐÐÐÑ ÐÐÑÑÐÑ..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 msgid "Open the selected messages in the composer for editing"
 msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ Ñ ÑÐÑÑÐÐÑÐÑÑ ÑÐÐÐ ÑÑÐÑÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "ÐÐÑÑÐÐÐ _ÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_ÐÑÐÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "_ÐÑÐÐÐÑÑÐ Ñ ÑÐÑÑÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "ÐÑÐÑÐ Ñ _ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1979
-#, fuzzy
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
-msgstr "ÐÐÑÑÐÐÐÑÐÑ ÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:1984
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
-msgstr "ÐÑÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1991
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
-msgstr "ÐÑÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:1998
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "_ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2000
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
-msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "_ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÑÐÑÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "_ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "ÐÑ_ÐÑÑÐÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2047
-#, fuzzy
-#| msgid "_Previous Message"
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "_ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2049
-#, fuzzy
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "Ð_ÑÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÑÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "ÐÑÐÐÐÐÑ ÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "ÐÑÐÑ_ÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "ÐÑÐÑ_ÑÐÐÑÐÐÐ (ÐÐÐ ÑÐÑÐÑÐ) ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÑÐÐÑÐÐÐ (ÐÐÐ ÑÐÑÐÑÐ) ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2082
-#, fuzzy
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
-msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2084
-#, fuzzy
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
-msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2089
-#, fuzzy
-#| msgid "Recent Messages"
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
-msgstr "ÐÐÐÑÐÑÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐ _ÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2091
-#, fuzzy
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ(Ð) ÐÐÑÑÐÑ(Ð) ÐÐ ÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "ÐÐÐÐÐÐÑÐ _ÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ _ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÑ"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ mbox..."
+msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÑ..."
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐÐ mbox ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐÐ âmboxâ ÐÐÑÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "ÐÐÐÐ_ÑÐÐ ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "Ð_ÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "_ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "ÐÐ_ÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
-msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÑÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "Ð_ÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐ_ÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "ÐÐÐÐÐ ÑÑ_ÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2189
-#, fuzzy
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
-msgstr "Ð_ÐÐÐÐÐÑÐ"
+msgstr "Ð_ÐÐÐÐÐÑÐ ÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "_ÐÐÐ ÐÐ"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "Ð_ÐÐÐÑÐ ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "ÐÐ_ÐÑÐÑ"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ _ÐÐÑÑÑ..."
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐÑÐÐ _ÐÐÑÑÐ..."
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐ_ÐÐÑÐ..."
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÑÐÐÐ_ÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ _ÐÐÑÐÑÐÐÑÐ..."
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ _ÐÐÑÐÑÐÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ Ð_ÐÑÐÐÐ..."
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ Ð_ÐÑÐÐÐÐ..."
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "ÐÐÐÐÐÐÐ ÐÐ _ÐÑÐÑÐÑÐ..."
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "ÐÐÐÑÐ ÐÐÐ _ÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "ÐÐÐÐÑÐ ÐÐ _ÐÐÑÐ ÑÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "Ð_ÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÐÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "ÐÐÐÐÑÐ ÐÐÐ _ÐÐÐÑÐÑÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "ÐÐÑÐÐ Ñ_ÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑÑÑÐ ÐÑÑÑÐÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÑÐÐÑÑÑÐ ÐÑÑÑÐÑ Ñ ÑÐÐÑ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "ÐÐÐ _ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÑ ÑÐ ÑÐÐÐ ÐÐÐÐÐÐÑÐÐÐ Ð-ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐÑ ÑÐ ÑÐÐÐ ÐÐÐÐÐÐÑÐÐÐ Ð-ÐÐÑÑÐ"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐ â%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:3229 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "ÐÑÐÑÐ_ÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3416
-#, fuzzy
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
-msgstr "ÐÑÑÐÐÑÐ ÑÑÐÐÐÐ ÐÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÑÑÐÐ"
 
-#: ../mail/e-mail-reader.c:3417
-#, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "ÐÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "ÐÑÐÑÑÐÐÐÐ"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../mail/e-mail-reader.c:4186
-#, fuzzy, c-format
-#| msgid "Folder"
+#: ../mail/e-mail-reader.c:4205
+#, c-format
 msgid "Folder '%s'"
-msgstr "ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ â%sâ"
+
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "ÐÐ ÑÐÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÐ"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:669
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"ÐÐÑÑÐÐÐÐ â%sâ ÑÐÐÑÐÐ %u ÐÑÐÐÐÑÐÐÑ ÐÐÑÑÐÑ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ "
+"ÐÐÐÑÐÑÐÑÐ?"
+msgstr[1] ""
+"ÐÐÑÑÐÐÐÐ â%sâ ÑÐÐÑÐÐ %u ÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑ "
+"ÐÐÐÑÐÑÐÑÐ?"
+msgstr[2] ""
+"ÐÐÑÑÐÐÐÐ â%sâ ÑÐÐÑÐÐ %u ÐÑÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑ "
+"ÐÐÐÑÐÑÐÑÐ?"
+msgstr[3] ""
+"ÐÐÑÑÐÐÐÐ â%sâ ÑÐÐÑÐÐ %u ÐÑÐÐÐÑÐÐÑ ÐÐÑÑÐÑ. ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ "
+"ÐÐÐÑÐÑÐÑÐ?"
+
+#: ../mail/e-mail-reader-utils.c:1046
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr[1] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
+msgstr[2] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
+msgstr[3] "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1067
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "ÐÐÑÑÐÐ"
+msgstr[1] "ÐÐÑÑÐÐ"
+msgstr[2] "ÐÐÑÑÐÐ"
+msgstr[3] "ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-session.c:863
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../mail/e-mail-session.c:665
+#: ../mail/e-mail-session.c:867
 msgid "Enter Passphrase"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:871
 #, c-format
 msgid "Enter Password for %s"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../mail/e-mail-session.c:673
+#: ../mail/e-mail-session.c:875
 msgid "Enter Password"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/e-mail-session.c:724
+#: ../mail/e-mail-session.c:926
 #, c-format
 msgid "User canceled operation."
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÑÐÑÑ."
 
-#: ../mail/e-mail-session.c:839
+#: ../mail/e-mail-session.c:1039
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
 msgstr "ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐ, ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐ."
 
-#: ../mail/e-mail-session.c:848
+#: ../mail/e-mail-session.c:1048
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ, ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐ."
 
-#: ../mail/e-mail-session-utils.c:416
-#, fuzzy, c-format
-#| msgid "Expunging and storing account '%s'"
+#: ../mail/e-mail-session-utils.c:419
+#, c-format
 msgid "Cannot get transport for account '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../mail/e-mail-session-utils.c:496 ../mail/mail-ops.c:633
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑ ÑÐÐÑÐÑÐ: %s"
 
-#: ../mail/e-mail-session-utils.c:520 ../mail/e-mail-session-utils.c:554
-#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
-#, fuzzy, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
-"ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ Ñ %s: %s\n"
-"ÐÐÐÑÑÐÐÐÑÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ."
+"ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ Ñ %s: %s\n"
+"ÐÐÐÑÑÐ ÑÐÐÐ ÐÑÐÐÐÑÐÑÑ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ."
 
-#: ../mail/e-mail-session-utils.c:574 ../mail/mail-ops.c:706
-#, fuzzy, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ Ñ ÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ âÐÐÑÐÐÑÐâ: %s"
 
-#: ../mail/e-mail-session-utils.c:785 ../mail/mail-ops.c:809
-#: ../mail/mail-ops.c:905
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/e-mail-session-utils.c:861
-#, fuzzy, c-format
-#| msgid "Unsubscribing from folder \"%s\""
+#: ../mail/e-mail-session-utils.c:873
+#, c-format
 msgid "Unsubscribing from folder '%s'"
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÑÐÐÑÑÑÐÐ ÑÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
-#: ../mail/e-mail-store-utils.c:165
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐ â%sâ"
 
-#: ../mail/e-mail-store-utils.c:256
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ â%sâ"
 
-#: ../mail/e-mail-store-utils.c:331
+#: ../mail/e-mail-store-utils.c:334
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÐÐÐ â%sâ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../mail/e-mail-tag-editor.c:291
 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:568 ../mail/mail-config.ui.h:72
-#: ../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:572 ../mail/mail-config.ui.h:130
-#: ../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:576 ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL ÑÐÑÑÐÐÐÑÐ"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "ÐÐÑÑÐ"
-
-#: ../mail/em-account-editor.c:920
-msgid "Never"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../mail/em-account-editor.c:921
-msgid "Always"
-msgstr "ÐÐÐÐ"
-
-#: ../mail/em-account-editor.c:922
-msgid "Ask for each message"
-msgstr "ÐÐÑÐÑ ÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "ÐÐÑÑÐ"
-
-#: ../mail/em-account-editor.c:2177
-msgid "Mail Configuration"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ"
-
-#: ../mail/em-account-editor.c:2178
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"ÐÐÐÑÐ ÐÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÐÐÐÐÑÑÐÑÐ.\n"
-"\n"
-"ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÐÑÐÐ. "
-
-#: ../mail/em-account-editor.c:2181
-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:2183 ../mail/em-account-editor.c:2346
-msgid "Receiving Email"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
-
-#: ../mail/em-account-editor.c:2184
-msgid "Please configure the following account settings."
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐ."
-
-#: ../mail/em-account-editor.c:2186 ../mail/em-account-editor.c:2846
-msgid "Sending Email"
-msgstr "ÐÐÐÑÐ ÐÐÑÑÐ"
-
-#: ../mail/em-account-editor.c:2187
-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:2189 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ"
-
-#: ../mail/em-account-editor.c:2190
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ.\n"
-"ÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÐÑÐÐÐÐ."
-
-#: ../mail/em-account-editor.c:2194
-msgid "Done"
-msgstr "ÐÐÑÐÐÐ"
-
-#: ../mail/em-account-editor.c:2195
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"ÐÐÑÑÐÑÐÐÐ, ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÐÐÑÑÐÐÐ.\n"
-"\n"
-"ÐÐÐÐ ÑÑÐ ÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÑÐÑÐ.\n"
-"\n"
-"ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐâ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐ."
-
-#: ../mail/em-account-editor.c:2660
-msgid "Check for _new messages every"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
-
-# bug: plural-forms
-#: ../mail/em-account-editor.c:2668
-msgid "minu_tes"
-msgstr "ÐÐÐÑ_ÑÐ"
-
-#: ../mail/em-account-editor.c:2960
-msgid "Please select a folder from the current account."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÐÐÐÐ."
-
-#: ../mail/em-account-editor.c:3269 ../mail/mail-config.ui.h:101
-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:3315 ../mail/em-account-editor.c:3383
-msgid "Receiving Options"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÑÐ"
-
-#: ../mail/em-account-editor.c:3316 ../mail/em-account-editor.c:3384
-msgid "Checking for New Messages"
-msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
-
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
 #. 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 mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9553,37 +9431,37 @@ msgstr ""
 "Ð ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. Ñ ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} ÐÐÑÐ:"
 
-#: ../mail/em-composer-utils.c:1195
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 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:1976
+#: ../mail/em-composer-utils.c:1985
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "ÐÐÑÐ ÐÐÑÑÐÐ ÐÐ %s ÐÐ ÑÐÐÑ â%sâ ÐÐ %s ÑÐ ÐÑÐÑÐÑÐÐÐ."
 
-#: ../mail/em-composer-utils.c:2030
+#: ../mail/em-composer-utils.c:2044
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÑÐÐÑ ÐÐ: â%sâ"
 
-#: ../mail/em-composer-utils.c:2532
+#: ../mail/em-composer-utils.c:2567
 msgid "an unknown sender"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ"
 
-#: ../mail/em-composer-utils.c:2933
+#: ../mail/em-composer-utils.c:2972
 msgid "Posting destination"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÐÐÑÑÐ"
 
-#: ../mail/em-composer-utils.c:2934
+#: ../mail/em-composer-utils.c:2973
 msgid "Choose folders to post the message to."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -9600,7 +9478,7 @@ msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐÑ"
 
 #: ../mail/em-filter-i18n.h:6
 msgid "BCC"
-msgstr "BCC"
+msgstr "ÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
@@ -9608,7 +9486,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:8
 msgid "CC"
-msgstr "CC"
+msgstr "ÐÐ"
 
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
@@ -9668,7 +9546,7 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:29
 msgid "Forward to"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐ"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "Important"
@@ -9747,7 +9625,7 @@ msgid "Play Sound"
 msgstr "ÐÑÑÑÐ ÐÐÑÐ"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "ÐÐÑÐÑ"
 
@@ -9757,7 +9635,7 @@ msgstr "ÐÑÐÐÐÐÑÐ"
 
 #: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
-msgstr "Regex ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
@@ -9838,7 +9716,7 @@ msgid "Add Ac_tion"
 msgstr "ÐÐÐÐÑ ÑÐ_ÐÑÑ"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:142
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "ÐÐÐÑÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ:"
@@ -9847,7 +9725,7 @@ msgstr[2] "ÐÐÐÑÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ:"
 msgstr[3] "ÐÐÐÑÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:153
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "ÐÐÑÐÐÐ ÐÐÑÑÐÐ:"
@@ -9856,143 +9734,225 @@ msgstr[2] "ÐÐÑÐÐÐ ÐÐÑÑÐÐ:"
 msgstr[3] "ÐÐÑÐÐÐ ÐÐÑÑÐÐ:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:175
 #, 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:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "ÐÑÐÐÑÐÑÑÐÐÐÑÑ ÐÐÐÑÐ"
 
-#: ../mail/em-folder-properties.c:314
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "ÐÐ_ÐÑÐÐÐ"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "_ÐÐÐ ÑÐÑÑÐÐÐÐ:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../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:1165 ../mail/mail-vfolder.c:1240
-msgid "Search Folders"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ"
-
-#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
-msgid "Loading..."
-msgstr "ÐÑÐÑÐÐÐÑÐ..."
-
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:664
 msgid "Folder names cannot contain '/'"
-msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ â/â"
+msgstr "ÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ â/â"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:784
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1606
 msgid "Mail Folder Tree"
 msgstr "ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2088 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2095 ../mail/message-list.c:2212
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2099 ../mail/message-list.c:2214
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2118
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐÑÐ ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÑ(Ð) Ñ ÐÑÑÐÐÑ ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐÑ"
+
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
+#: ../mail/mail-vfolder.c:1121 ../mail/mail-vfolder.c:1235
+msgid "Search Folders"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/em-folder-utils.c:481
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
+msgid "UNMATCHED"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ"
+
+#: ../mail/em-folder-tree-model.c:787 ../mail/em-folder-tree-model.c:1072
+msgid "Loading..."
+msgstr "ÐÑÐÑÐÐÐÐ..."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ Ñ"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ Ñ"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:589
 msgid "Create Folder"
 msgstr "ÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:590
 msgid "Specify where to create the folder:"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ:"
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1683
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "ÐÐÐÐÐÑÑÐÐ ÐÐÑÑÐÑ..."
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "ÐÐÐÐÐÑÐÐ â%sâ"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "ÐÐÐÐÑÐÐÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
+
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
+
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ, ÐÐÐ ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÐÑÐ"
+
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "ÐÐÑÐÐÑ ÐÐÑÑÐÑÐ, ÐÐÐ ÑÑÐÐÐ ÑÐÐÐÐ ÐÑÑÑ"
+
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "ÐÐÑÐÑÑÐÐÐÐÐ"
+
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "ÐÐÑÑÐÐÐÐÐ, ÑÐÐÐÐ"
+
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "ÐÐÑÑÐÐÐÐÐ"
+
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "ÐÐÑÑÐÐÐÐÐ, ÑÐÐÐ"
+
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
+
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "ÐÐÑÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
+
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐ ÑÑÑÐÐÐÑÑ (%s)"
+
+#: ../mail/em-format-html.c:2172
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s) ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÐÑÐ â%sâ"
+
+#: ../mail/em-format-html.c:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s)"
+
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÑÐÐÐ ÐÐÐÐÑÐÐ (%s)"
+
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ (ÑÐÐÐ â%sâ)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "ÐÐÑÐ: %s"
+
+#: ../mail/em-format-html.c:2937
+msgid "(no subject)"
+msgstr "(ÐÐÐ ÐÐÑÐÐÐÐ)"
+
+#: ../mail/em-format-html.c:3013
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "ÐÐÑÑÐÑ ÑÐÑÐ â%sâ ÐÐ ÐÐÐ â%sâ"
+
+#: ../mail/em-format-html-display.c:89
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐÐÐ. ÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐÑÐÐ."
-
-#: ../mail/em-format-html-display.c:86 ../mail/em-format-html.c:1684
-msgid "Valid signature"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐÑÐÐÐ. ÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÐ ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐÑÐÐ."
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 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:87 ../mail/em-format-html.c:1685
-msgid "Invalid signature"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ"
+"ÐÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÑÑÐÑÐÐ."
 
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "ÐÐÑÐÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ, ÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÑÐÐÐÑÑ."
 
-#: ../mail/em-format-html-display.c:88 ../mail/em-format-html.c:1686
-msgid "Valid signature, but cannot verify sender"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÐÐÑ, ÐÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐ"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10000,21 +9960,13 @@ msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÐ, ÐÐÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ "
 "ÐÐÑÐ ÐÑÐÐÐÑÐÐ."
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1687
-msgid "Signature exists, but need public key"
-msgstr "ÐÐÑÐÐÑ ÐÐÑÑÐÑÐ, ÐÐÐ ÑÑÐÐÐ ÑÐÐÐÐ ÐÑÑÑ"
-
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐÐÐ, ÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐÐ ÑÐÐÐÐÐ ÐÑÑÑÐ."
 
-#: ../mail/em-format-html-display.c:96 ../mail/em-format-html.c:1693
-msgid "Unencrypted"
-msgstr "ÐÐÑÐÑÑÐÐÐÐÐ"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10022,11 +9974,7 @@ msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÐÑÑÐÐÐÐÐ. ÐÐÐ ÑÐÐÑÐÐÑ ÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ Ñ ÐÑÐÐÐÑÑ ÐÑÐÐÐ "
 "ÐÐÑÐÑÐÐÑÐ."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1694
-msgid "Encrypted, weak"
-msgstr "ÐÐÑÑÐÐÐÐÐ, ÑÐÐÐÐ"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 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 "
@@ -10035,22 +9983,14 @@ msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÑÑÐÐÐÐÐ, ÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ.  ÐÐÑÐÐ ÑÐ, ÐÐÐ ÐÐ Ð ÐÐÐÐÐÑÑÐ "
 "ÐÐ ÐÐÐÐ ÑÐ ÑÑÑÐÐÐ Ñ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/em-format-html-display.c:98 ../mail/em-format-html.c:1695
-msgid "Encrypted"
-msgstr "ÐÐÑÑÐÐÐÐÐ"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 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:99 ../mail/em-format-html.c:1696
-msgid "Encrypted, strong"
-msgstr "ÐÐÑÑÐÐÐÐÐ, ÑÐÐÐ"
-
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:103
 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 "
@@ -10059,44 +9999,62 @@ msgstr ""
 "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÑÑÐÐÐÐÐ, ÑÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐ. ÐÐÐÐÐ ÑÐ ÑÐÑÐÐ ÐÐ ÐÐÐÐ ÑÐ ÑÑÑÐÐÐ "
 "Ñ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐÑ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/em-format-html-display.c:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
-msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÐÑÐÑÐ"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
-msgstr "ÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÑÐÑÑÐÐ"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÐ ÑÐÑÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:539
+#: ../mail/em-format-html-display.c:556
 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:806
+#: ../mail/em-format-html-display.c:746
+#, fuzzy
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "ÐÐÑÑÐÐÑ ÐÐÑÑÐÑ"
+
+#: ../mail/em-format-html-display.c:794
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save _Image..."
+msgstr "ÐÐÑÑÐÐÑ ÐÐÐ..."
+
+#: ../mail/em-format-html-display.c:796
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐ"
 
-#: ../mail/em-format-html-display.c:814
+#: ../mail/em-format-html-display.c:1036
 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:818
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr "ÐÐ"
 
-#: ../mail/em-format-html-display.c:1081 ../mail/em-format-html-display.c:1128
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
 msgid "View _Unformatted"
 msgstr "ÐÑÐÐÐÐÐÐÑ _ÐÐÑÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:1083
+#: ../mail/em-format-html-display.c:1322
 msgid "Hide _Unformatted"
 msgstr "ÐÐÐÑÐÑ _ÐÐÑÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../mail/em-format-html-display.c:1148
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÑÑ"
 
@@ -10105,136 +10063,69 @@ msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÑÑ"
 msgid "Page %d of %d"
 msgstr "%d. ÑÑÑÐÐÐ ÐÐ %d"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ..."
-
-#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1537
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "ÐÐÐÐÐÑÐÑÐ â%sâ"
-
-#: ../mail/em-format-html.c:2058
-msgid "Unknown external-body part."
-msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
-
-#: ../mail/em-format-html.c:2066
-msgid "Malformed external-body part."
-msgstr "ÐÐÑÐ ÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐ ÐÐÑÑÐÐ."
-
-#: ../mail/em-format-html.c:2096
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ FTP ÑÑÑÐÐÐÑÑ (%s)"
-
-#: ../mail/em-format-html.c:2107
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s) ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÑÑÑÐÐÐÑÐ â%sâ"
-
-#: ../mail/em-format-html.c:2109
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÑ ÐÐÑÐÑÐÐÑ (%s)"
-
-#: ../mail/em-format-html.c:2130
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑÐÐ (%s)"
-
-#: ../mail/em-format-html.c:2141
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ (ÑÐÐÐ â%sâ)"
-
-#: ../mail/em-format-html.c:2799
-#, fuzzy
-#| msgid "Subject"
-msgid "(no subject)"
-msgstr "ÐÐÑÐÐÐ"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2815
-#: ../plugins/mail-notification/mail-notification.c:407
-#, c-format
-msgid "From: %s"
-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:2892
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "ÐÐÑÑÐÑ ÑÐÑÐ â%sâ ÐÐ ÐÐÐ â%sâ"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
-msgstr "ÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÑÑÑÐÐÐ ÐÐÐÐ ÑÐÐ."
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1156
 msgid "Folder Subscriptions"
 msgstr "ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1195
 msgid "_Account:"
 msgstr "_ÐÐÐÐÐ:"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1210
 msgid "Clear Search"
 msgstr "ÐÑÐÑÑÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1228
 msgid "Sho_w items that contain:"
-msgstr "ÐÑÐÐÐ_ÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ:"
+msgstr "_ÐÑÐÐÐÐÐ ÑÑÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ:"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1267
 msgid "Subscribe to the selected folder"
-msgstr "ÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1268
 msgid "Su_bscribe"
-msgstr "_ÐÑÐÑÐÐÐ ÑÐ"
+msgstr "Ð_ÑÐÑÐÐÐ ÑÐ"
 
-#: ../mail/em-subscription-editor.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../mail/em-subscription-editor.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Unsubscribe from the selected folder"
-msgstr "ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-subscription-editor.c:1262
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Unsubscribe"
 msgstr "_ÐÐÑÐÐÐ ÑÐ"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1291
 msgid "Collapse all folders"
-msgstr "ÐÐÑÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐ ÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1292
 msgid "C_ollapse All"
-msgstr "Ð_ÐÑÐÐ ÑÐÐ"
+msgstr "_ÐÐÑÐÐ ÑÐÐ"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1302
 msgid "Expand all folders"
-msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÑÐ ÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1303
 msgid "E_xpand All"
-msgstr "Ð_ÐÐÐÑÐÐÐÑ ÑÐÐ"
+msgstr "_ÐÐÐÐÑÐÐÐÑ ÑÐÐ"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1313
 msgid "Refresh the folder list"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÑÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1325
 msgid "Stop the current operation"
-msgstr "ÐÑÐÐÐÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
+msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ"
 
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
@@ -10244,15 +10135,15 @@ msgstr "ÐÑÐÐÐÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
-msgstr[0] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÑ ÐÐÑÐÐÐÐÐ?"
+msgstr[0] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑ %d ÐÐÑÑÐÑ?"
 msgstr[1] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
 msgstr[2] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ?"
-msgstr[3] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %d ÐÐÑÑÐÑ ÐÐÑÐÐÐÐÐ?"
+msgstr[3] "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÑ ÑÐÐÐÑ ÐÐÑÑÐÑ?"
 
 #: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
-msgstr "_ÐÐ ÐÑÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑ"
+msgstr "_ÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑ."
 
 #: ../mail/em-utils.c:331
 msgid "Message Filters"
@@ -10261,70 +10152,70 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 #: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
-msgstr "ÐÐÑÑÐÐ ÐÐ %s"
+msgstr "ÐÐÑÑÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÐÐ %s"
 
 #: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "ÐÐÑ_ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "ÐÐÐÐÑ ÑÐÑÑÐÐÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Filter Editor\" window maximize state"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐâ"
+msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Filter Editor\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "\"Folder Subscriptions\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
+msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Folder Subscriptions\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
-msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ"
+msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "ÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "ÐÑÐÐÐ Ñ ÑÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÐ Ñ ÑÑÐÑÑÑÐÐÑ ÑÑÐÑÐ."
 
@@ -10333,36 +10224,32 @@ msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
 msgstr ""
+"ÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ ÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÐÑÑÑÐ ÐÐÐ "
+"ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐÐÐÐÑ Ñ ÐÑÐÐÐÑÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:16
-#, fuzzy
-#| msgid "Attached message"
 msgid "Attribute message."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
+msgstr "ÐÑÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ Ñ ÑÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
+msgstr "ÐÑÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÑÑÐÑÐ"
+msgstr "ÐÑÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
@@ -10370,7 +10257,7 @@ msgstr "ÐÐÑÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
-msgstr "ÐÐÑÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ."
+msgstr "ÐÐÑÐ ÐÐ ÐÑÑÐÑÐÑÐ ÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
@@ -10378,7 +10265,7 @@ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑ ÑÐÑÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
@@ -10386,13 +10273,15 @@ msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÐÑÑÐÐÑÐÑÐ ÐÐ ÑÑÐÑÐÐÐÑÐ/Ð
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC"
+msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:28
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
-msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC ÐÐ ÐÑÐÑ ÐÐÑÐÑÐÐ Ñ address_count."
+msgstr ""
+"ÐÑÑÐ ÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐ Ñ TO/CC/BCC ÐÐ ÐÑÐÑ ÐÐÑÐÑÐÐ Ñ address_count "
+"(ÐÑÐÑ ÐÐÑÐÑÐ)."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
@@ -10412,7 +10301,7 @@ msgid ""
 "in the format \"headername=value\"."
 msgstr ""
 "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ. ÐÐÐÐÐÐÑÐ "
-"ÑÐÐÑÐÐ ÑÑ ÐÐÐ ÑÐÑÐÐÑÐ âheadername=valueâ."
+"ÑÐÐÑÐÐ ÑÑ ÐÐÐ ÑÐÑÐÐÑÐ âheadername=valueâ (ÐÐÐ ÐÐÐÐÐÐÑÐ=ÐÑÐÐÐÐÑÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
@@ -10464,21 +10353,23 @@ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Describes wheter message headers in paned view should be collapsed or "
+"Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
+"ÐÐÐÑÑÑÐ ÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÑÑÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑ ÑÐÑÐÑÐÐÐ ÐÐÐ "
+"ÑÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐ. 0 = ÑÐÑÐÑÐÐÐ, 1 = ÑÐÑÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
-"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ "
+"ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ Ñ ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐ "
 "ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
-msgstr "ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
@@ -10489,7 +10380,7 @@ msgid ""
 msgstr ""
 "ÐÑÐÑÑÑÑÐ ÐÐ ÐÐ ÐÐ ÐÑÐÑÑÐÐÐ Ñ ÐÐÑÐÑÐÑÑ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ. ÐÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐ, "
 "ÐÐ ÑÐÑÑÑÐÐÐ ÑÐ Ñ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ. ÐÑÐÐÐ ÑÐ Ñ ÐÐÑÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ "
-"ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ. ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐ ÐÐÐ ÑÑ ÐÐÑÐÑÐÑÐ (ÑÐÑÐÐÐ LDAP) ÐÐÐÐÑÐÐÐ ÐÐ "
+"ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ. ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐ ÐÐÐ ÑÑ ÐÐÑÐÑÐÑÐ (ÑÐÑÐÐÐ ÐÐÐÐ) ÐÐÐÐÑÐÐÐ ÐÐ "
 "ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:48
@@ -10529,11 +10420,11 @@ msgstr "ÐÑÐÑÑÑÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÐÐ ÑÐÑÐÑÐÐÐÑÐ ÐÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐ ÑÐÐÑÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÑÐÐÑÑ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÐÐÑÐÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
-msgstr "ÐÐ ÐÐÐÐÑ ÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
@@ -10560,12 +10451,12 @@ 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:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÐÐÑÐ, ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÑÑÐÐÑ ÐÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐÑ."
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐ ÐÑÑÑÐÑÐ, ÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÑÑÑÐÑ ÐÐÐ ÑÐÑÐÑÐ ÐÐÑÑÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
@@ -10577,7 +10468,7 @@ msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÑÑÐ ÑÐÐÐÐÑÐÑÐ ÐÑÐ Ð
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
-msgstr "ÐÐÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÐ ÐÐÐÑÑÐÐÑÑ ÑÑÐÐÐÑÐ ÐÑÑÐÑÐ Ñ ÐÐÐÑÐÐ"
+msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐ ÐÑÐÑÑÑÑÑÐ ÐÐÐÑÑÐÐÑÑ ÑÑÐÐÐÑÐ ÐÑÑÐÑÐ ÑÐÐÐÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
@@ -10592,7 +10483,7 @@ msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
-"ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÑÑÐÐÐ, ÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐÐÑÑ Ñ ÐÑÐÑÑÐÐÐ "
+"ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐ ÐÐÐÑÑÐ, ÑÑÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐÐÑÑ Ñ ÐÑÐÑÑÐÐÐ "
 "ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:69
@@ -10608,22 +10499,18 @@ msgid ""
 "Enable to display only message texts not exceeding size defined in "
 "'message_text_part_limit' key."
 msgstr ""
-"ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÐ ÑÐÐÐ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÑÑÑÐÐ "
-"âmessage_text_part_limitâ."
+"ÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÑÐÐÐÐ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÑÑÑÐÐ "
+"âmessage_text_part_limitâ (ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÑÐ ÐÐÑÑÐÐ)."
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
+"ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:72
-#, 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:73
 msgid "Enable/disable caret mode"
@@ -10631,7 +10518,7 @@ msgstr "ÐÐÑÑÑÑÑÐ/ÐÑÐÑÑÑÑÑÐ ÐÑÐÐÐÐ ÐÑÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "ÐÐÐÐÑÐÑ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ Outlook/GMail ÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÐÑÑÐÑÐÐ/ÐÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
@@ -10640,23 +10527,21 @@ msgid ""
 "because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
 "standard."
 msgstr ""
-"ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐ ÑÑÐ ÑÐ ÑÐÐÐ Outlook ÐÐÐ GMail, "
-"ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐ UTF-8 ÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐ ÐÐÐÐÑÑÐÑÐ, "
-"ÐÐÑÑÐ ÑÐ ÐÐ ÐÑÐÐÑÐÐÐÐÑÑ RFC 2231, ÐÐÐÐ ÐÐÑÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐÑÐ RFC 2047."
+"ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ Ñ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐ ÑÑÐ ÑÐ ÑÐÐÐ ÐÑÑÐÑÐ ÐÐÐ ÐÐÐÑÑÐ, "
+"ÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐ ÐÐÐ-8 ÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐ ÐÐÐÐÑÑÐÑÐ, "
+"ÐÐÑÑÐ ÑÐ ÐÐ ÐÑÐÐÑÐÐÐÐÑÑ ÐÐÐ 2231, ÐÐÐÐ ÐÐÑÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÑÑÐÐÐÐÑÐ ÐÐÐ 2047."
 
 #: ../mail/evolution-mail.schemas.in.h:76
 msgid "Flush Outbox after filtering"
-msgstr ""
+msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÐ ÑÐÐÑÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:77
-#, fuzzy
-#| msgid "Forwarded message"
 msgid "Forward message."
-msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÑÐÐÑÑÑÐ ÐÐÑÑÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "ÐÑÑÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
@@ -10664,7 +10549,7 @@ msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
-msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
@@ -10675,8 +10560,8 @@ 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 ÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ, ÐÐÑÐ ÐÐ ÐÐ ÐÐ "
-"ÐÐÐÑÑÐ ÐÐÐÐ ÑÐ ÐÐ ÑÑÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÑÐ 10 ÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ, ÐÐÑÐÑÐ ÐÐ ÐÐ "
+"ÐÐ ÐÐÐÑÑÐ ÐÐÐÐ ÑÐ ÐÐ ÑÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
@@ -10684,44 +10569,44 @@ msgid ""
 "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:84
 msgid "Ignore list Reply-To:"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÑÑÐ ÐÐÑÑÑ âÐÐÐÐÐÐÑ-ÐÐ:â"
 
 #: ../mail/evolution-mail.schemas.in.h:85
 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:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
-"ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:87
 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:88
 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:89
@@ -10731,10 +10616,10 @@ msgid ""
 "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:90
 msgid ""
@@ -10743,9 +10628,9 @@ msgid ""
 "particular value is not used by Evolution since the \"Folder Subscriptions\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
-"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ "
-"ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐÑ ÐÑÑÑ ÑÐÐÐ "
+"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ "
+"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
+"ÐÐÑÐÑÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐÑ ÐÑÑÑ ÑÐÐÐ "
 "ÑÐÐÑÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:91
@@ -10755,8 +10640,8 @@ msgid ""
 "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 ""
-"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ "
-"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
+"ÐÐÑÐÑÐÐ ÑÑÐÑÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÑÐÐÐÐÑÑ ÑÐ "
+"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
 "ÐÐÑÐÑÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐÑ ÐÑÑÑ ÑÐÐÐ "
 "ÑÐÐÑÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ."
 
@@ -10768,42 +10653,42 @@ msgid ""
 "\" window cannot be maximized. This key exists only as an implementation "
 "detail."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ âÐÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐâ. ÐÑÐÐÐÐÑÑ ÑÐ "
-"ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ "
-"ÐÐÑÐÑÑÐ ÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐ ÐÑÐÐÐÐÑÑ "
-"ÑÐÐÐ ÑÐÐÑÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ."
+"ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÑÐ Ð ÐÑÐÐÐÑÐ ÐÐÑÑÐ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÐÐÐ ÑÐÐÑÐ ÐÑÐÐÐÑ. ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÑ "
+"ÐÑÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ. ÐÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÐ ÑÐÐÑÐÑÑÑÑÐ "
+"ÐÐÑÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:93
 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:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ ÑÐÐÐÐÐÐ "
-"ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÑ."
+"ÐÐÑÐÑÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÑÐ âÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÐÐâ. ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÑÐÑÐ "
+"ÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÑÐÑÐÑÐ ÐÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:95
 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:96
 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:97
 msgid ""
@@ -10812,9 +10697,9 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
-"ÐÐÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐ âÐÐÐÐÐÐÑ ÐÑÑÐÐâ Ñ ÑÑÐÑÐ ÐÐÐÑÐÐ ÐÐÐÑÑÐÑÐ ÐÐ "
-"ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÑÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐ, ÐÐÐÑÑÐ ÐÐÐÑÐÐÐ "
-"ÐÐÐÐÑÐÑÐ âÐÐÐÐÐÐÑÐ ÑÐÐÐÐâ."
+"ÐÐÐÑÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐ, ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐ "
+"âÐÐÐÐÐÐÑ ÐÑÑÐÐâ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÑÐ ÑÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ "
+"ÐÐÑÑÐ ÐÑÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÑ ÐÐÐÐÐÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
@@ -10823,23 +10708,22 @@ msgid ""
 "the search results."
 msgstr ""
 "ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ "
-"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ. "
+"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:99
 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:100
 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:101
 msgid ""
@@ -10847,29 +10731,23 @@ msgid ""
 "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:102
-#, 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 trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr ""
-"ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ "
-"ÐÑÐÑÑÐÐÐ ÑÑÐÑÐÐ, Ð ÐÐ ÑÐÐÐ ÑÐÐÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ ÐÑÐÑÑÐÐÐ. "
+"ÐÐÐÐÑÑÐÐÐ/ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ "
+"ÐÑÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑ ÑÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:103
-#, fuzzy
-#| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
-msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:104
-#, fuzzy
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ"
 
@@ -10878,7 +10756,7 @@ msgid "Layout style"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "ÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐ ÑÐ ÐÐÑÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ."
 
@@ -10888,7 +10766,7 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÐ Ð ÑÐÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "ÐÐÑÑÐ MIME ÑÐÐÐÐÐ ÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ Bonobo ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐ ÐÐÐÐ ÑÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
@@ -10908,7 +10786,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
-msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÐÑ ÐÐÐÐÐÐÑÐ Ð ÐÐ ÐÐ ÑÑ ÑÐÑÑÑÐÐÐ."
+msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÐÑÐ Ð ÐÐ ÐÐ ÑÑ ÑÐÑÑÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
@@ -10920,7 +10798,7 @@ msgid ""
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "ÐÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ. ÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐ "
-"ÐÐÐÐÐÐ ÐÐÐ:ÐÐÑÐ ÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ HTML hex ÐÐÐÐÑÐÑÐ."
+"ÐÐÐÐÐÐ ÐÐÐ:ÐÐÑÐ ÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
@@ -10928,7 +10806,7 @@ msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÑÐÐÐÐÐ ÑÐÑÐ ÑÐ ÐÐÑÐÐÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:116
 msgid "Load images for HTML messages over HTTP"
-msgstr "ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ HTML ÐÐÑÑÐÐ ÐÑÐÐÐ HTTP-Ð"
+msgstr "ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÐÐ-Ð"
 
 #: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
@@ -10936,13 +10814,13 @@ msgid ""
 "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â - ÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ."
+"ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÐ(Ð)-Ð. ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ ÑÑ: 0 â ÐÐÐÐÐÐ "
+"ÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ. 1 â ÐÑÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐÑ "
+"Ñ ÐÐÐÑÐÐÑÐÐÐ. 2 â ÐÐÐÐ ÑÑÐÑÐÐÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Log filter actions"
-msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
@@ -10970,11 +10848,11 @@ msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÐÑ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
@@ -10985,16 +10863,14 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#, fuzzy
-#| msgid "Message Display"
 msgid "Message text limit for display"
-msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:130
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr ""
-"ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ (ânormalâ ÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐ; âfull headersâ ÐÐ ÐÑÐÐÐÐ "
-"ÑÐÐÑ ÐÐÐÐÐÐÑÐ; âsourceâ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐ)"
+"ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ (normal â ÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐ; full headers â ÐÐ ÐÑÐÐÐÐ "
+"ÑÐÐÑ ÐÐÐÐÐÐÑÐ; source â ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÐ)"
 
 #: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
@@ -11014,33 +10890,28 @@ msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ TO/CC/BCC"
+msgstr "ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ ÐÐ/ÐÐ/ÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:136
-#, fuzzy
-#| msgid "-----Original Message-----"
 msgid "Original message."
-msgstr "-----ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ-----"
+msgstr "ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
-msgstr ""
+msgstr "ÐÑÑÐÑÐ Ñ ÐÐÑÐÑ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐ ÑÑÐÐÐ ÐÐ ÑÑÐÐÐ ÑÐÐÑ ÑÐÐÑÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
+"ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ ÑÑ: âneverâ â ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÑÐÑÑÐÐÐÐÐÑÐ; "
+"âalwaysâ â ÐÐ ÑÐÐÐ ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÑÐÑÑÐÐÐÐÐÑÐ Ð âaskâ â (ÐÐÐ ÐÐÐÐ ÐÐÑÐ "
+"ÐÑÑÐÐ ÐÑÐÐÐÐÑÑ) ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:139
-#, fuzzy
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
 msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-"ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÑÐ:\n"
-"{0}"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÐ ÑÐÐÑÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑ ÑÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
@@ -11057,25 +10928,19 @@ msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:144
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Prompt when replying to many recipients"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ Bcc ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
@@ -11083,7 +10948,7 @@ msgstr "ÐÐÑÐ ÐÑÐ ÐÑÐÐÑÐÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
-msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐ ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ (Bcc)"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐ ÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (Bcc)"
 
 #: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -11094,8 +10959,8 @@ 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:151
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
@@ -11103,7 +10968,7 @@ msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐÐ ÐÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐ
 
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid "Prompt when user tries to send unwanted HTML"
-msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ HTML"
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt while marking multiple messages"
@@ -11111,7 +10976,7 @@ msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÑÑ ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÑÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
@@ -11119,7 +10984,7 @@ msgstr "ÐÐÑÑÐÐÑÐ ÐÑÑÑÐÑ ÐÐ ÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÐÐ Ñ ÑÐÐÑÑÑ Ð ÐÐÐÐÑÑÑÐ ÐÑ ÑÐÐÐÐÐÐ."
+msgstr "ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐÑÐ Ñ ÑÐÐÑÑÑ Ð ÐÐÐÐÑÑÑÐ ÐÑ ÑÐÐÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
@@ -11131,7 +10996,7 @@ msgstr "ÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐ ÐÐÐ ÑÑÐÑÐÑÐ Ñ ÐÐÐÐÐÐÐÑ 
 
 #: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐÑÐÑÑÐ"
+msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÑÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
@@ -11139,55 +11004,55 @@ msgstr "ÐÑÐÐÐ ÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑ
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐ ÐÐÑÑÑ ÐÐÐ HTML"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐ ÐÐÑÑÑ ÐÐÐ HTML."
+msgstr "ÐÐÑÐ ÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÑ ÑÐ Ð-ÐÐÑÐÑÐÐÐ  Ñ ÑÐÐÑÐÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÐÐÐÐ Ð-ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ Ñ ÑÐÐÑÐÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
-msgstr "ÐÐÑÐÑÐÐÐ ÑÐÐÑÑÐÐÐÐÐÑÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÐÐ ÑÑÐÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:165
 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:166
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âBccâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âBccâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âCcâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âCcâ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âÐÐÑÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÑÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÐÐÐ ÑÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐ âÐÐÐÐÐÐÑ ÐÐâ ÐÐÐÐ ÑÐÑÐ ÐÐÑÑÐÑ"
 
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
@@ -11203,19 +11068,19 @@ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐ
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ ÐÐÑÑÐÐ Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÐÐÐÑ ÑÐÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ âÐÐÑÑÐâ."
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÑ ÐÐÑÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
@@ -11287,10 +11152,17 @@ msgid ""
 "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:189
 msgid "Spell check inline"
-msgstr "ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
@@ -11302,7 +11174,7 @@ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:192
 msgid "State of message headers in paned view"
-msgstr ""
+msgstr "ÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÐÑÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
@@ -11313,18 +11185,18 @@ msgid "The default plugin for Junk hook"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐ ÐÐ ÑÑÐÑÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:195
-#, 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 "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐ."
+msgstr ""
+"ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÐÑÑ ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ 1. ÑÐÐÑÐÑÐ, 1970 "
+"(ÐÐÐÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:196
-#, 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 "ÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐ."
+msgstr ""
+"ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÐÑÑ ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÑÐ, Ñ ÐÐÐÐÐÐ ÐÐ 1. ÑÐÐÑÐÑÐ, 1970 "
+"(ÐÐÐÑ)."
 
 #: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
@@ -11333,9 +11205,9 @@ msgid ""
 "message list. \"1\" (Vertical View) places the preview pane next to the "
 "message list."
 msgstr ""
-"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ. "
-"â0â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÑ ÐÐÐÑÑ ÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ. "
-"â1â (ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÐÑÑ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ."
+"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ "
+"ÐÐÑÑÐÐ. 0 â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÑ ÐÐÐÑÑ ÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ. 1 â "
+"(ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÐÑÑ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:198
 msgid "The terminal font for mail display."
@@ -11346,18 +11218,24 @@ msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
+"ÐÐÐÑÑ ÐÐÑÐ ÑÐ ÑÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ, ÐÐÑÐ ÑÐ ÑÐÐÐÐ ÐÐ "
+"ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
+"ÐÐÐÑÑ ÐÐÑÐ ÑÐ ÑÐÐÑÑÑÐ ÐÑÐÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ (ÐÐÑÐÐÐ ÐÑÐ ÐÑÑÑ), ÐÐÑÐ "
+"ÑÐ ÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
+"ÐÐÐÑÑ ÐÐÑÐ ÑÐ ÑÐÐÑÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑÑÐÑ, ÐÑÐÐÐÑÑÑÑÑÐ ÐÐÑÑÐÑ "
+"ÐÑÐÐÐÐÐÐÐÐÐ ÐÑÑÐÑÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
@@ -11368,22 +11246,20 @@ msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
-"ÐÐÐÐ ÐÐÐÑÐ ÑÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ. â0â ÐÐ ÐÑÐÑÐÐ. â1â ÐÐ ÑÐÐÐÐÑÐÑÐ. â2â ÐÐ "
+"ÐÐÐÐ ÐÐÐÑÐ ÑÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÑÑÐ: 0 â ÐÐ ÐÑÐÑÐÐ, 1 â ÐÐ ÑÐÐÐÐÑÐÑÐ Ð 2 â ÐÐ "
 "ÐÐÑÑÐÐ Ð ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐ."
 
 # bug: s/interms/in terms/ (space)
 #: ../mail/evolution-mail.schemas.in.h:204
-#, 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."
+"ÐÐÐ ÐÐÑÐÑÑÑÐ ÐÐÑÐÐÑÑ ÐÐÐÐÑÐÐÑ ÑÐÐÑÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ Ñ "
+"ÐÐÐÐÑÑÐÑÐ, ÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐÐÑÑÐÐÐ (KB). ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ 4096 (4MB). ÐÐÐ "
+"ÐÑÐÐÐÐÑÑ ÑÐ ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐÐ ÐÑÑÑ "
+"âforce_message_limitâ (ÐÑÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÐÐÑÑÐÐ)."
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
@@ -11410,9 +11286,10 @@ msgid ""
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
 msgstr ""
-"ÐÐÐÑ ÐÑÑÑ ÑÑÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÑ XML ÑÑÑÑÐÑÑÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐÑ "
-"ÐÐÐÐÐÐÑÐ Ð ÐÐÑÑÐÐÑ ÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐ. XML ÑÑÑÑÐÑÑÑÐ ÑÐ ÑÐÑÐÐÑÐ &lt;header "
-"enabled&gt; - ÐÐÐÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÑÑÐ."
+"ÐÐÐÑ ÐÑÑÑ ÑÑÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÑÑÑ ÐÐÐ ÑÑÑÑÐÑÑÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐÑ "
+"ÐÐÐÐÐÐÑÐ Ð ÐÐÑÑÐÐÑ ÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐ. ÐÐÐ ÑÑÑÑÐÑÑÑÐ ÑÐ ÑÐÑÐÐÑÐ &lt;header "
+"enabled&gt; â ÐÐÐÐÐÑÐÑÐ ÐÐÑ ÐÐÑÐÑÑ ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÐ Ñ "
+"ÐÑÐÐÐÐÐÑ ÐÐÑÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
@@ -11434,19 +11311,15 @@ msgid ""
 "beyond which a '...' is shown."
 msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÑ ÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐ Ñ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÐÐ, "
-"ÐÐÑÐÐ ÑÐÐÐ ÑÐ â...â ÐÑÐÐÐÐÐÐÐ."
+"ÐÐÑÐÐ ÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ â...â."
 
 #: ../mail/evolution-mail.schemas.in.h:211
-#, fuzzy
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Evolution requires a restart."
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
 msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ "
-"ÑÐÑÐÑÐÐÐ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
+"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ "
+"ÑÐÑÐÑÐÐÐ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
@@ -11454,8 +11327,8 @@ msgid ""
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑ ÐÐÑÑÑÐ "
-"ÑÐÐÐÐÐ ÐÐÐÐ, ÑÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
+"ÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÑÐ ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑ ÐÐÑÑÑÐ "
+"ÑÐÐÐÐ ÐÐÑÐ, ÑÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑ. ÐÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
@@ -11463,10 +11336,13 @@ msgid ""
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder."
 msgstr ""
+"ÐÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐ ÐÐÑÐÐ, ÑÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÑÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑ "
+"ÑÐÑÑÐÐÐÑ ÑÐ ÑÐÐÐÐÐÐ, ÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ~/ÐÐÐÐÐ. ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ ÑÐ ÑÐÐÐÑÐ "
+"ÐÐÑÐÑÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÑÐÑÐ ÐÐ ÑÐÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑÐÑÑ ÑÐÑÑÐÐÐÑ."
 
 #: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÑ ÑÐÑÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
@@ -11474,7 +11350,7 @@ msgstr "ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐ"
 
 #: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
-msgstr "ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐ."
+msgstr "ÐÑÐÐÐ ÐÐ ÐÐÑÐ ÑÐ ÐÐÑÑÐÐ ÐÐÑ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÑÐÐÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
@@ -11485,75 +11361,65 @@ msgid "Underline color for misspelled words when using inline spelling."
 msgstr "ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ."
 
 #: ../mail/evolution-mail.schemas.in.h:219
-msgid "Use SpamAssassin daemon and client"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÐÐÑ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ (spamc/spamd)."
-
-#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÐÐÐ ÑÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÑÐÑÐ ÑÐÐÑÑÐÐÐÐÑ ÑÐÐÑÐÐÐ"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÑÑÐ."
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use only local spam tests."
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ."
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Use only the local spam tests (no DNS)."
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ (ÐÐÐ DNS-Ð)."
-
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:221
 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:226
+#: ../mail/evolution-mail.schemas.in.h:222
 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:227
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "ÐÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:224
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "ÐÐ ÐÐ ÑÐ ÐÐÐÑÐÑÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑ ÐÐÑÑÑÐ."
 
-#: ../mail/evolution-mail.schemas.in.h:229
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
+"ÐÐ ÐÐ ÑÐ ÐÑÑÐÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ Ñ ÑÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐ "
+"ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑ ÐÐÐÐÐÐ âÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÐÐÑ Ð ÐÐÐÑÑÐâ ÐÑÐÐÐÐÐÐ "
+"ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ. ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÑÐÐÐÐ ÑÐ "
+"âsend_recv_on_startâ (ÐÐÑÐÑÐ_ÐÑÐÐÐ_ÐÑÐ_ÐÐÐÑÐÑÐÑÑ) ÐÐÑÐÑÐÐ."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
+"ÐÐ ÐÐ ÑÐ ÐÑÑÐÑÐ ÐÑÐÐÐÑÑ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ. ÐÐÐ "
+"ÑÐÑÑÑÑÑÐ Ð ÑÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐ."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:227
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÑ ÑÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÑÐÐÑ ÑÑÐÑÐ."
 
-#: ../mail/evolution-mail.schemas.in.h:232
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11561,73 +11427,70 @@ msgstr ""
 "ÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÐÑÐÐÐÐ ÑÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÑÐ In-"
 "Reply-To ÐÐÐ References."
 
-#: ../mail/evolution-mail.schemas.in.h:233
+#: ../mail/evolution-mail.schemas.in.h:229
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÑÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑ ÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐ"
 
-#: ../mail/evolution-mail.schemas.in.h:234
+#: ../mail/evolution-mail.schemas.in.h:230
 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:235
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "ÐÐÑÐÐÐ ÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
-msgstr "ÐÐÐÐÐÑÐ Elm ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "ÐÐÑÑÐ"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ Elm ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
-msgstr "ÐÐÐÐÐ ÐÐÑÑÐ ÐÐ ÐÑÐÐÑÐÐÐ Elm."
+msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÐÐÐ."
 
 #: ../mail/importers/evolution-mbox-importer.c:135
 #: ../plugins/dbx-import/dbx-importer.c:249
-#, fuzzy
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
-msgstr "ÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "_ÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÐ"
 
 #: ../mail/importers/evolution-mbox-importer.c:417
-#, fuzzy
-#| msgid "Subject"
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "ÐÐÑÐÐÐ"
 
 #: ../mail/importers/evolution-mbox-importer.c:422
-#, fuzzy
-#| msgid "From"
 msgctxt "mboxImp"
 msgid "From"
 msgstr "ÐÐÑÐ"
@@ -11648,34 +11511,32 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÐÐÑÑÐÑÐ"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
-#, fuzzy, c-format
-#| msgid "Importing `%s'"
+#: ../plugins/pst-import/pst-importer.c:629
+#, c-format
 msgid "Importing '%s'"
-msgstr "ÐÐÐÐÐÑÐ â%sâ"
+msgstr "ÐÐÐÐÐÐ â%sâ"
 
 #: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
-msgstr "ÐÑÐÑÑÐÐÐ %s"
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ â%sâ"
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
-msgstr "ÐÐÐÐÐÑÐ Pine ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../mail/importers/pine-importer.c:451
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/importers/pine-importer.c:458
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "ÐÐÑÐÑÐÑ"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
-msgstr "ÐÐÐÐÑÑÐÑÐ Pine ÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
-msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÑÐÐÑÐÐÐ Pine."
+msgstr "ÐÐÐÐÐ ÐÐÑÑÑ ÐÐ ÐÑÐÐÑÐÐÐ ÐÐÐÐ."
 
 #: ../mail/mail-autofilter.c:72
 #, c-format
@@ -11716,9 +11577,17 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
+"ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ â%sâ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ \n"
+"â%sâ."
 msgstr[1] ""
+"ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ â%sâ ÑÑ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ \n"
+"â%sâ."
 msgstr[2] ""
+"ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ â%sâ ÑÑ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ \n"
+"â%sâ."
 msgstr[3] ""
+"ÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ â%sâ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ \n"
+"â%sâ."
 
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
@@ -11733,25 +11602,25 @@ msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
+"ÐÐÐ ÐÐÐÐ Ð-ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÑÐÐ ÑÐÐÑÐÐÑÐÐ ÑÐ ÐÐÑÐ "
+"ÐÑÑÐÐÐÑÑÐÐ ÑÐÐÑÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:6
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÑÐÐÐÑÐ _ÐÐÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐ ÐÑÐÑÑÐÐÑÐ ÐÑÐÐÐÑÐÑ ÐÐÑÑÐÑ ÐÐ ÐÐÑÑÑ"
 
 #: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "_ÐÐÐÐÑÐ ÑÐÑÑÑÑ ÐÐ ÑÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
+msgstr "_ÐÐÐÐÑÐ ÑÐÑÑÑÑ ÑÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÑÑ (cc):"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (cc):"
 
 #: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÑÑ (Bcc):"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐ _ÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÑÐÑ ÐÐÐÐÑÑ (Bcc):"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
@@ -11759,7 +11628,7 @@ msgstr "ÐÐÐÐ _ÐÐÑÑÑ ÐÑÑÑÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÑÐÐ ÐÑÐ 
 
 #: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "ÐÐ_ÐÐ ÑÐÑÑÑÑ Ð ÐÐÐÐ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐ_ÐÐ Ð ÐÐÐÐ ÑÐÑÑÑÑ ÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -11767,16 +11636,16 @@ msgstr "ÐÐÐÐ ÑÑÐÐÐ ÐÐÐÑÐÑÐÐÑÑ"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
-msgstr ""
+msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ _ÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
-msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
-msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐ _ÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐÐ _ÑÐÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
@@ -11791,16 +11660,12 @@ msgid "Check cu_stom headers for junk"
 msgstr "ÐÑÐÐÐÑÐ ÐÐÐ ÐÐ ÑÑÐÑÐÑÐ Ñ _ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:20
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new _messages on start"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐ _ÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:21
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messa_ges in all active accounts"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ _ÐÐÐÑ ÐÐÑÑÑ ÑÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÑÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
@@ -11836,13 +11701,11 @@ msgid "Confirm _when expunging a folder"
 msgstr "_ÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:30
-#, fuzzy
-#| msgid "Configuration"
 msgid "Confirmations"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "ÐÐÑÐÐÑ ÐÐÑÑÐ/ÐÑÐÐÐ"
@@ -11868,8 +11731,6 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐ_ÐÐÐÐÐ ÐÐÑÑÐÐ (ÐÐÐÑÐÐÑÐÐÐÐÐÐ)"
 
 #: ../mail/mail-config.ui.h:39
-#, fuzzy
-#| msgid "Displayed Message _Headers"
 msgid "Displayed Message Headers"
 msgstr "ÐÑÐÐÐÐÐÐÐ _ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
@@ -11883,19 +11744,19 @@ msgstr "ÐÐ ÑÐÑÐÑÐÑ"
 
 #: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
-msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
+msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
-msgstr "ÐÐÐÐÑÑÐÐÑÐÐ _ÐÐÑÐÑÐ:"
+msgstr "ÐÐÑÐÑÐ _Ð-ÐÐÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
-msgstr "ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ _ÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑ"
+msgstr "ÐÑÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ _ÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÑ"
 
 #: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐ_ÑÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÑÐ_ÑÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
@@ -11906,14 +11767,12 @@ msgid "F_all back to threading messages by subject"
 msgstr "ÐÑÐ_ÑÐ ÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:49
-#, fuzzy
-#| msgid "Fix_ed width Font:"
 msgid "Fix_ed Width Font:"
-msgstr "ÐÐÐÑ ÐÐÐ_ÑÐÐÐÑÐÐÐ ÑÐÑÐÐÐ:"
+msgstr "ÐÐÐÑ _ÑÑÐÐÐÐ ÑÐÑÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
-msgstr "ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ Ñ H_TML"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÑÑÐÐ Ñ ÐÐÐ_Ð"
 
 #: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
@@ -11921,15 +11780,15 @@ msgstr "ÐÐÐ Ð ÐÑÐÐÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑ ÐÑÑÐÐ ÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ, ÐÐÐ ÑÐ ÐÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
-msgstr "HTML ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
-msgstr "H_TTP ÐÐÑÑÐÐÐÐÐ:"
+msgstr "ÐÐÐÐ _ÐÐÑÑÐÐÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:56
 msgid "Header content"
@@ -11949,7 +11808,7 @@ msgstr "ÐÐÐÐÐÑÐ _ÑÐÑÐÑÐ ÑÐ"
 
 #: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ-ÐÐ: ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐÑÐ âÐÐÐÐÐÐÑ-ÐÐ:â ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
 
 #: ../mail/mail-config.ui.h:61
 msgid "Inline"
@@ -11957,7 +11816,7 @@ msgstr "ÐÐÑÑÐÑ"
 
 #: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
-msgstr "ÐÐÑÑÐÑ (Outlook ÑÑÐÐ)"
+msgstr "ÐÐÑÑÐÑ (ÐÑÑÐÑÐ ÑÑÐÐ)"
 
 #: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
@@ -11991,11 +11850,15 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 msgid "No _Proxy for:"
 msgstr "ÐÐÐ _ÐÐÑÑÐÐÐÐÐÐ ÐÐ:"
 
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
+
 #: ../mail/mail-config.ui.h:73
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
-"ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÑÑÐ ÑÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ "
-"ÐÐÐÐÐÐÑÐÐ ÐÐ ÑÑÐÑÐÑÐÐ."
+"ÐÐÑÐÑÐ ÑÐ ÐÐÐÐÐÐÑÑÑÐ ÑÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐÐ "
+"ÑÑÐÑÐÑÐ."
 
 #: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
@@ -12008,7 +11871,7 @@ msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:77
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG ÐÐ _ÐÑÑÑÐ:"
+msgstr "ÐÐÐ/ÐÐÐ ÐÐ _ÐÑÑÑÐ:"
 
 #: ../mail/mail-config.ui.h:78
 msgid "Pass_word:"
@@ -12048,10 +11911,8 @@ msgid "Remember _password"
 msgstr "ÐÐÐÐ_ÐÑÐ ÐÐÐÐÐÐÑ"
 
 #: ../mail/mail-config.ui.h:88
-#, fuzzy
-#| msgid "Replies and parents"
 msgid "Replies and Forwards"
-msgstr "ÐÐÐÐÐÐÑÐ Ð ÐÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÑÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:89
 msgid "Required Information"
@@ -12059,23 +11920,27 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:90
 msgid "SHA1"
-msgstr ""
+msgstr "ÐÐÐ1"
 
 #: ../mail/mail-config.ui.h:91
 msgid "SHA256"
-msgstr ""
+msgstr "ÐÐÐ256"
 
 #: ../mail/mail-config.ui.h:92
 msgid "SHA384"
-msgstr ""
+msgstr "ÐÐÐ384"
 
 #: ../mail/mail-config.ui.h:93
 msgid "SHA512"
-msgstr ""
+msgstr "ÐÐÐ512"
+
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
-msgstr "SSL ÐÐÑÐ ÐÐÐÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:96
 msgid "S_earch for sender photograph only in local address books"
@@ -12095,15 +11960,15 @@ msgstr "_ÐÑÐÐÐÐÑÐÐÐ ÑÐÐÑ:"
 
 #: ../mail/mail-config.ui.h:100
 msgid "Secure MIME (S/MIME)"
-msgstr "ÐÐÐÑÑÐÐ MIME (S/MIME)"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐ (Ð/ÐÐÐÐ)"
 
 #: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÑÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
-msgstr "ÐÐÐÐÐÑÐÑÐ HTML ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÑÐÐÑ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:104
 msgid "Sender Photograph"
@@ -12111,43 +11976,29 @@ msgstr "ÐÐÑÐÐÑÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐ"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:106
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Sending a _private reply to a mailing list message"
-msgstr "ÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐ ÐÑÐÐÐÑÐÐÐ _ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ ÐÐÐÐÑÐÐ ÐÐÑÑÐ"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:108
-#, fuzzy
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
 msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr ""
-"ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÑÐ:\n"
-"{0}"
+msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ _ÐÑÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑ ÑÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÐÐÑÑÐ"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:110
-#, fuzzy
-#| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Sending a message with an _empty subject line"
-msgstr "_ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÐÐÐ ÐÐÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ _ÐÐÑÐÐÐÐ"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:112
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Sending a message with only _Bcc recipients defined"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÐ Bcc ÐÑÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐ _ÐÑÑ ÐÑÐÐÐÐÑÐ"
 
 # bug(slobo): ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:114
-#, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Sending a reply to a large _number of recipients"
-msgstr "ÐÐÑÐÑÐÐÐÑ ÐÐÐ ÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐ ÐÐÐÐÐÐÑÐ _ÐÐÑÐÐ ÐÑÐÑÑ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
@@ -12155,7 +12006,7 @@ msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐÑ _ÐÐÑÑÐÐ:"
 
 #: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
-msgstr "ÐÐÑ_ÐÐÑ ÑÑÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ"
+msgstr "ÐÐÑ_ÐÐÑ ÑÑÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
@@ -12163,19 +12014,15 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
-msgstr "_ÐÐÐ ÑÐÑÐÐÑÐ: "
+msgstr "_ÐÐÐ ÑÐÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:119
-#, fuzzy
-#| msgid "Add Custom Junk Header"
 msgid "Set custom junk header"
-msgstr "ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/mail-config.ui.h:120
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÐÑÐÑÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
@@ -12183,7 +12030,7 @@ msgstr "ÐÐÑ_ÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÑÐÑÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
@@ -12194,16 +12041,12 @@ msgid "Signatures"
 msgstr "ÐÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:125
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐ _ÐÐÑÐÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÐÐÑÐÑÐÐ Ð_ÐÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:126
-#, fuzzy
-#| msgid "Local Folders"
 msgid "Special Folders"
-msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
@@ -12211,13 +12054,15 @@ msgstr "ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
-msgstr "Ð ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐ _ÐÑÑÐÑÐ ÐÐ ÐÐÑ"
+msgstr "Ð ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐ _ÐÑÑÐÑÐ ÐÑÐ ÐÐÑ"
 
 #: ../mail/mail-config.ui.h:129
-#, fuzzy
-#| msgid "Start: "
 msgid "Start up"
-msgstr "ÐÐÑÐÑÐÐ:"
+msgstr "ÐÐÐÑÐÑÐÑÐ"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
@@ -12237,7 +12082,7 @@ msgid ""
 "for display purposes only. "
 msgstr ""
 "ÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÐÐÐ\n"
-"ÐÐÑÐÐÑ. ÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ\n"
+"ÐÐÑÐÐÑ. ÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ\n"
 "ÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑ. "
 
 #: ../mail/mail-config.ui.h:136
@@ -12245,6 +12090,8 @@ msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
+"ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÑÑÐ Ð ÐÐÐÐÐÐÐÐÐÑÑ Ð-ÐÐÑÑÐ, ÐÐÑÐÑÑÐ ÐÐ ÐÐÑÐÑÐÑ ÐÑÐ "
+"ÐÐÐÑÑÐÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐÑ ÑÐÐÑÐ:"
 
 #: ../mail/mail-config.ui.h:137
 msgid ""
@@ -12260,13 +12107,11 @@ msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
-msgstr "ÐÐÑÐÑÑÐ ÐÑÑÐ_ÐÑÐÑÐÐÐÑÐÑÑ"
+msgstr "ÐÐÑÐÑÑÐ _ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:141
-#, fuzzy
-#| msgid "User_name:"
 msgid "User _Name:"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ _ÐÐÐ:"
 
 #: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
@@ -12274,152 +12119,134 @@ msgstr "_ÐÐÐÐÑ ÐÐÑÐÐÑ"
 
 #: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
-msgstr "_ÐÐÐÐ ÑÑÐÑÐÐÐÑ ÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐ"
+msgstr "_ÐÐÐÐ ÑÑÐÑÐÑ ÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐ"
 
 #: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
-msgstr "ÐÐÐ _ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐ ÐÐ_ÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
 #: ../mail/mail-config.ui.h:145
-msgid "_Default junk plugin:"
-msgstr "_ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐ:"
-
-#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_ÐÐÑÐÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐÐ"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "ÐÐ ÐÐÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÐ Ñ_ÐÑÑÐÐÐÐ (Outlook ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ)"
+msgstr "ÐÐ ÐÐÑÐÐÑÑÑ ÐÐÑÑÐÐÐ ÐÐ Ñ_ÐÑÑÐÐÐÐ (ÐÑÑÐÑÐ ÐÐÐÐÐÑÐÐÐÐÐÐÑÑ)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "ÐÑÐÐ _ÐÑÐÑÐÐÑÐÐÐÑÐ:"
 
 # bug: requires a comment on usage
-#: ../mail/mail-config.ui.h:149
-#, fuzzy
-#| msgid "Current Folder"
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
-msgstr "ÑÐÐÑÑÐÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ _ÑÑÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:150
-#, fuzzy
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "_ÐÐÐÑÐÐ ÐÐÑÐÐÑ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐ ÐÐÐÐÐÐÑÑ"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_ÐÐÐÐÑÐ"
 
-#: ../mail/mail-config.ui.h:152
-#, fuzzy
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
-msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ Ñ ÐÐÑÑÐÑ"
+msgstr "_ÐÑÐÑÐÑ ÑÐÐÐÐ ÑÐÐÐ Ñ ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_ÐÐÑÑÐÐÐ ÑÐÐÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÑ"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_ÐÐÐÐ ÐÐÐ ÐÑÐÐ ÐÐÑ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "_ÐÑÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_ÐÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐÐÑ ÑÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÑÐ"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "_ÐÑÑÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_ÐÐÑÑ:"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:159
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
-msgstr "_ÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÑÑ HTML ÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ ÐÑ ÐÐ ÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐÑÐ ÐÑ ÐÐ ÐÐÐÐ"
 
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "_ÐÑÐÐ ÐÐÐÐÐÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_ÐÐÑÐÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
-msgstr "_ÐÐÐÐÐÐÐÐ HTTP ÐÐÑÑÐÐÐÐÐ:"
+msgstr "_ÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐ:"
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../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:167
-#, fuzzy
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÑÐÑÐ."
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐÐÑÐÐÐ ÑÐÐÐÐ"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:167
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÑÐÑÑ ÐÐÑÐÑÐÐÑÐ Ñ ÐÑÐÐÐÐÐÑ ÐÐÑÑÐ"
 
-#: ../mail/mail-config.ui.h:169
-#, fuzzy
-#| msgid "Drafts _Folder:"
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
-msgstr "_ÐÐÑÑÐÐÐÐ ÐÐÑÑÑÐ:"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐ _ÑÐÐÑÐ:"
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐ"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_ÐÐÑÐÑÑÐ ÐÑÑÐ ÑÐÐÑÐÐÐ ÐÐÐ ÐÑÑÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "Ð"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "ÐÐÑÐ"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "ÐÐÐÑ"
 
-#: ../mail/mail-config.ui.h:177
-msgid "gtk-ok"
-msgstr ""
-
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "ÐÐÐ ÐÐÑÐÐÐÐ ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
-msgstr "ÐÐÐ ÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÐ ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐ ÐÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÐ ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
@@ -12430,87 +12257,88 @@ msgid "Call"
 msgstr "ÐÐÐÐÐ"
 
 # timezone.
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "ÐÐ_ÐÑÑÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "ÐÐ ÐÑÐÑÐÐÑÑÑ"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
-msgstr "ÐÐÑÑÐÑÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "ÐÐÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
-msgstr "ÐÐ ÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑÑ"
+msgstr "ÐÐ ÐÐÑÑ ÐÐÑÐÑÐÐÑÐÑÑ"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "ÐÑÐÑÐÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "ÐÐÐÐÐÑ Ð ÐÐÑÐÐÑÐ"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÑ"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ÐÑÐÑÐÑÐÑÐ"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "ÐÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
-msgstr "ÐÐÐÑÑÐÐÑÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐÑÑÐ"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "ÐÐÑÑÐÐ ÐÐÑÐ ÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐ ÑÑ ÐÐÐÐ ÐÐÐÐÑÑÐÐÐ.\n"
-"ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ âÐÐÐÐÐÐâ."
+"ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÑ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ âÐÐÐÐÐÐâ."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_ÐÑÐÑÐÐÑÐ ÐÐÑÐÐÑÑ"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_ÐÐÐ:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_ÐÐÐÐÐÐ:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "ÐÐ_ÐÐÑÐÑÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ ÑÐÐÐÐÑ Ð ÐÐÑÐÐÑÐ"
 
-#: ../mail/mail-folder-cache.c:767
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "ÐÑÐÐÑÑÑÐÐ ÐÐÑÑÑÐÐÐÑÑ ÐÐ %s"
@@ -12523,78 +12351,77 @@ msgstr "ÐÐÐÑÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÑÐÐ"
 msgid "Fetching Mail"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/mail-ops.c:820
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "ÐÐÐÑÐ ÐÐÑÑÐÐ %d ÐÐ %d"
+msgstr "ÐÐÑÐÐ ÐÐÑÑÐÑ %d ÐÐ %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:868
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ %d ÐÐ %d ÐÐÑÑÐÐ"
 
-#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "ÐÑÐÐÐÐÐÐ."
 
-#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "ÐÐÐÑÑÐÐÐ."
 
-#: ../mail/mail-ops.c:984
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ Ñ â%sâ"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1102
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "ÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1176
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ Ð ÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐ Ð ÑÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÐÐ â%sâ"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐ â%sâ"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1240
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1418
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â%sâ"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐÑÐ Ñ â%sâ"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÑÐÐÑÐ Ñ â%sâ"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1492
 msgid "Local Folders"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../mail/mail-ops.c:1589
-#, fuzzy, c-format
-#| msgid "Disconnecting from '%s'"
+#: ../mail/mail-ops.c:1590
+#, c-format
 msgid "Disconnecting %s"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ ÑÐ â%sâ"
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÑ ÑÐ â%sâ"
 
 #: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
-msgstr "ÐÑÐÐÐÐÐÐÑÐ..."
+msgstr "ÐÑÐÐÐÑÑÐÐ..."
 
 #: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
@@ -12606,33 +12433,31 @@ msgstr "ÐÑÐÐÐÐ _ÑÐÐ"
 
 #: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
-msgstr "ÐÐÑÑÐÑÐÑÐ..."
+msgstr "ÐÐÑÑÐÑÐÐ..."
 
 #: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
-msgstr "ÐÐÐÐÑÐ..."
+msgstr "ÐÐÐÐÐ..."
 
 #: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
-msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ"
 
 #: ../mail/mail-tools.c:72
-#, fuzzy, c-format
-#| msgid "Could not create spool directory `%s': %s"
+#, c-format
 msgid "Could not create spool directory '%s': %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÑÐÐÑÐÐÑ â%sâ: %s"
 
 #: ../mail/mail-tools.c:106
-#, fuzzy, c-format
-#| msgid "Trying to movemail a non-mbox source `%s'"
+#, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÑÑÐ ÐÐ ÐÐ-mbox ÐÐÐÐÑÐ â%sâ"
+msgstr "ÐÐÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÑÑ ÐÐ ÐÐ-ÐÐÐÐÑ ÐÐÐÐÑÐ â%sâ"
 
 #: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ - %s"
+msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ â %s"
 
 #: ../mail/mail-tools.c:217
 msgid "Forwarded message"
@@ -12643,18 +12468,17 @@ msgstr "ÐÑÐÑÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 msgid "Setting up Search Folder: %s"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ: %s"
 
-#: ../mail/mail-vfolder.c:238
-#, fuzzy, c-format
-#| msgid "Updating Search Folders for '%s:%s'"
+#: ../mail/mail-vfolder.c:232
+#, c-format
 msgid "Updating Search Folders for '%s' : %s"
-msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%s: %sâ"
+msgstr "ÐÐÑÑÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ â%s : %sâ"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the 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:681
+#: ../mail/mail-vfolder.c:675
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12665,44 +12489,46 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
+"ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â%sâ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ\n"
+"â%sâ."
 msgstr[1] ""
+"ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â%sâ ÑÑ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ\n"
+"â%sâ."
 msgstr[2] ""
+"ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â%sâ ÑÑ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ\n"
+"â%sâ."
 msgstr[3] ""
+"ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ â%sâ ÑÐ ÐÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑ ÑÐÑÑÐÐÐÑ\n"
+"â%sâ."
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1308
 msgid "Edit Search Folder"
 msgstr "ÐÑÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1413
 msgid "New Search Folder"
 msgstr "ÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
 #: ../mail/mail.error.xml.h:1
-#, fuzzy
-#| msgid "Check Junk Failed"
 msgid "\"Check Junk\" Failed"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐ ÑÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
-#| msgid "Report Junk Failed"
 msgid "\"Report Junk\" Failed"
-msgstr "ÐÐÐÐÑÑÐÐÐÑÐ ÐÐ ÑÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑ ÐÐ ÑÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐ"
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
-#| msgid "Report Not Junk Failed"
 msgid "\"Report Not Junk\" Failed"
-msgstr "ÐÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÑÐ ÑÑÐÑÐ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÐÐÑÐ ÐÐ ÐÐÑÐ ÑÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
 #: ../mail/mail.error.xml.h:4
 msgid "A folder named \"{0}\" already exists. Please use a different name."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÐÑÑÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÑÐÑ ÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ."
 
 # bug: use the same message as above
 #: ../mail/mail.error.xml.h:5
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐ â{1}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÐÑÑÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐ â{1}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÑÐÑ ÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -12713,21 +12539,21 @@ msgid ""
 msgstr ""
 "ÐÐÑÑÐÐÐÐ ÑÐ ÑÐÐÑÐÐÑÐÐ ÐÐ â{1}â ÐÐÑ ÐÐÑÑÐÑÐ.\n"
 "\n"
-"ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ, ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÑÐÐ "
-"ÑÐÐÑÐÐÑ, ÐÐÐ ÐÐÐÑÐÑÐ."
+"ÐÐÐÐÑÐ ÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ, ÐÐ ÑÐ ÐÑÐÐÐÑÐÑÐ ÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐ ÑÐÐ "
+"ÑÐÐÑÐÐÑ, ÐÐÐ ÐÐ ÐÐÐÑÐÑÐ."
 
 #: ../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}?"
+msgstr "ÐÐÐÑÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ â{1}â. ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÑÑ ÐÐ {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../mail/mail.error.xml.h:10
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
-msgstr "ÐÐÑÐÐÑ ÐÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÐÑÑÐÐ ÐÐÐ."
+msgstr "ÐÐÑÐÐÑ ÑÐ ÐÐÐÐÐÐÐ â{0}â ÐÐÑ ÐÐÑÑÐÑÐ. ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÑÑÐÐ ÐÐÐ."
 
 #: ../mail/mail.error.xml.h:11
 msgid ""
@@ -12761,11 +12587,12 @@ msgstr ""
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÑÑÐÑÐÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â{0}â?"
+msgstr ""
+"ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â{0}â?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ Ñ HTML ÐÐÐÐÐÑ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ Ñ ÐÐÐÐ ÐÐÐÐÐÑ?"
 
 # mail:ask-send-only-bcc primary
 #: ../mail/mail.error.xml.h:18
@@ -12780,7 +12607,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÑÐ ÐÐ
 # mail:ask-send-only-bcc primary
 #: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÑÐÐÐ ÑÐ BCC ÐÑÐÐÐÐÑÐÐÐ?"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÑÐÐÐ ÑÐ ÐÐÐ ÐÑÐÐÐÐÑÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:21
 msgid "Are you sure you want to send a message without a subject?"
@@ -12792,93 +12619,91 @@ msgstr "ÐÑÐÐÐÐ ÐÐÑÐÐÑ"
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ â{0}â."
 
 # mail:no-copy-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â Ñ â{1}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ â{0}â Ñ â{1}â."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÑÐÐÐÑ â{0}â."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÐ ÐÐ ÑÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ, ÐÐÐÐ â{1}â"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ, ÐÐÐÐ â{1}â"
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÑÐÑ ÑÐÑÑÐÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÑÐÑ ÑÐÑÑÐÐÐÑ â{0}â."
 
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÐÑÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ â{0}â ÐÐÑÑÐ ÐÐ ÐÐÑÑÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÐ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ â{0}â ÑÐÑ ÐÐ ÐÐÑÑÐÑÐ."
 
 # mail:no-move-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â Ñ â{1}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â Ñ â{1}â."
 
 #: ../mail/mail.error.xml.h:32
-#, fuzzy
-#| msgid "Cannot open source \"{1}\""
 msgid "Cannot open source \"{1}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑ â{1}â"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑ â{1}â"
 
 # mail:no-copy-folder-nostore secondary
 #: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÑ â{2}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑ â{2}â."
 
 # mail:no-copy-folder-to-nostore secondary
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑ â{2}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑ â{2}â."
 
 #: ../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}â, ÐÐÐÐ ÐÑÐÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÑÐÑÐÐ. "
-"ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÑ."
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ â{0}â, ÐÐÐÐ ÐÑÐÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÑÐÑÐÐ. "
+"ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÑÐÑÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑÐÑÐ ÐÐÑÐÐÑÑ."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ â{0}â Ñ â{1}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ â{0}â Ñ â{1}â."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑ ÑÐÑÑÐÐÐÑâ{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÑÑÐÐ ÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÐ ÑÐÑÑÐÐÑÐÑ ÑÐÑÑÐÐÐÑâ{0}â."
 
 # mail:account-notunique primary
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑ."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÑ â{0}â."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ Ñ ÐÐÑÐÑÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ Ñ ÐÐÑÐÑÐÐÑ â{0}â."
 
 #: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐÑ â{0}â."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐÑ â{0}â."
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -12889,30 +12714,22 @@ msgstr ""
 "ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐ; ÐÐÐÐÐ ÑÑ ÑÐÑÑÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ."
 
 #: ../mail/mail.error.xml.h:43
-#, fuzzy
-#| msgid "Close this window"
 msgid "Close message window."
-msgstr "ÐÐÑÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÑ"
+msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐÑÑÐÐ."
 
 #: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ."
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
-#| msgid "Do not disable"
 msgid "Do _Not Disable"
-msgstr "ÐÐÐÐÑ ÐÑÐÑÑÑÐÑÐ"
+msgstr "ÐÐÐÐÑ _ÐÑÐÑÑÑÐÑÐ"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
-#| msgid "Do _not Send"
 msgid "Do _Not Send"
 msgstr "ÐÐ ÑÐÑ_Ð"
 
 #: ../mail/mail.error.xml.h:48
-#, fuzzy
-#| msgid "_Do not Synchronize"
 msgid "Do _Not Synchronize"
 msgstr "_ÐÐ ÑÑÐÐÐÑÑÑ"
 
@@ -12926,11 +12743,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
-msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐÐÐÐ?"
 
 #: ../mail/mail.error.xml.h:52
 msgid "Enter password."
@@ -12942,7 +12759,7 @@ msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÐÐÑÐÐÐÑÐÑÐ ÑÐÐÑÐÑ
 
 #: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
@@ -12961,109 +12778,104 @@ msgid ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
+"ÐÐÐÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ Ñ  ÐÐÑÐÐÐÑ. ÐÐÑÐ "
+"ÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐ "
+"ÐÐÑÑÐÐÐ ÑÐ ÑÐÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÑÐÐÐ ÐÐ ÑÐ ÐÑÐÑÐÐÐÑÐ?\n"
+"\n"
+"ÐÐÐÐÑ ÐÐÐÐÐ ÑÐ ÐÐÑÐ ÐÐÐÑÐÐÑÐÐ ÐÐÑÐÐ ÑÑÐÐÑÐ ÑÑÐÑÐÑ ÐÐÐÐÑ ÑÐÑÑÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ "
+"ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐ ÑÑÐÐÑÐÐÐ ÐÑÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐ "
+"ÐÐÐÐÑÐÐ ÐÑÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑ ÑÐÐÐÐÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÑ ÐÑÐÑÐÐÐÑÐ ÑÐÐÐ."
 
 #: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
-msgstr ""
+msgstr "ÐÐÐÐÑÑÐÑÐÐ ÐÐÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÑÐ ÑÐ ÐÑÐÐÐÑÐÐ."
 
 #: ../mail/mail.error.xml.h:63
-#, fuzzy
-#| msgid "_Download Messages for Offline Usage"
 msgid "Failed to download messages for offline viewing."
-msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÐÐ."
 
 # bug: plural-forms
 #: ../mail/mail.error.xml.h:64
-#, fuzzy
-#| msgid "Failed to send %d of %d messages"
 msgid "Failed to find duplicate messages."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐ."
 
 #: ../mail/mail.error.xml.h:65
-#, fuzzy
-#| msgid "failed to open book"
 msgid "Failed to open folder."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ."
 
 #: ../mail/mail.error.xml.h:66
 #, fuzzy
-#| msgid "View image attachments directly in mail messages."
-msgid "Failed to remove attachments from messages."
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ."
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"ÐÐÐÑÐ ÑÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
 #: ../mail/mail.error.xml.h:67
-#, fuzzy
-#| msgid "Unable to retrieve message"
+msgid "Failed to remove attachments from messages."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐ."
+
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÐ"
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:68
-#, fuzzy
-#| msgid "Failed to send %d of %d messages"
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÐÑÐ %d ÐÐ %d ÐÐÑÑÐÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:69
-#, fuzzy
-#| msgid "Unsubscribing from folder \"%s\""
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ â%sâ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÐ ÑÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ, ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐÑÐÐ."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
-#, fuzzy
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐÑ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÑÑÐÐÐÐ â{0}â ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐÑÑÐÐ."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/mail.error.xml.h:75
-#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
+#: ../mail/mail.error.xml.h:76
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ Ð ÑÐÐÑÐÐÑ ÐÐÐÑÐÑÑÐÐÐÐ ÑÐ ÐÐÑÐ "
-"ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ Ð ÑÐÐÑÐÐÑ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ "
+"ÐÐÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ, ÑÐÐ ÑÐÐ ÑÐÐÑÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐ."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "ÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÑÐÐ ÐÐÑÑÐÐÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐÐ."
+msgstr "ÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÑÐÐ ÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÑÐÐÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
-"ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ Ð ÑÐÐ ÐÑÐÐÐÐÐÑÑÑÐ\n"
-"ÐÐÐÐÑÐ ÑÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ Ð ÑÐÐ\n"
+"ÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÑÐ, ÐÐÐÐÑÐ Ð ÐÐÐÐÐÑ ÐÐÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13071,89 +12883,81 @@ msgstr ""
 "ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐ, ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ "
 "ÐÐÐÐÑÑÐÑÑ."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÑÐ ÐÐÑÑÐ"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÑÐ ÑÑ ÐÑÑÐÐÐÑÑÐÐ ÐÐÑÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 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: ÐÑÐÐÐÐÑÐ."
+"ÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐÑÑ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐÐ-ÐÐâ ÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐ "
+"ÐÐÐ ÐÑÐÐÐÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÐ, Ñ ÑÐÐÐÐÐ ÑÐÑÑÐÑÑ ÐÐÐÐÑÑÐÑÐ ÑÐÐ "
+"ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ. ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐ, ÐÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐÐÐÐÐ âÐÑÐÐÐ:â ÐÐÐ âCC:â "
+"ÐÑÐÐÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:87
-#, fuzzy
-#| msgid ""
-#| "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?"
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ: ÐÑÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÑÐ ÐÐÑÐÑÐÑÐ ÑÐÐÑ ÐÐÑÑÐÑ ÑÐ "
-"ÑÐÐÐ ÐÐÐÐÑÐÑÐ Ñ ÑÐÑÑÐÐÐÐ.\n"
-"ÐÐÐÐÑÐ ÐÐ ÐÐÐ ÐÐ ÑÑÐÐÐÑÐ?"
+"ÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ ÐÐÑÑ ÑÐÐÐÑÑÐ. ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÐ ÐÐ "
+"ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÑÐÐÑ ÐÐÐÑÐÑÐÑÐÑÐ ÑÑÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ Ñ "
+"ÐÐÑÐÐÐ ÑÐ ÑÐÐÐÑÐÐ ÐÐÐÐÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÑÑÐÐ?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÑÑÐ ÑÐÑÑÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:90
-#, fuzzy
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
-msgstr "ÐÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÐ"
 
-#: ../mail/mail.error.xml.h:91
-#, fuzzy
-#| msgid "Could not create message."
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÐÑÑ ÐÑÐÐÐÑÐÐÐ ÐÑÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "ÐÐÐÐÑÐ ÐÐÑÑ ÐÐÐÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
-msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐ ÑÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ."
+msgstr "ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÐ."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÑÑÐÐÐ ÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 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:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13162,78 +12966,75 @@ msgstr ""
 "ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÐÐ Ð ÐÐÐÑ ÐÐ ÐÑÐÐÐ HTML ÐÐÑÑÑ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÑÐÐÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÑÐ ÐÑÐÐÑÑÐÐÑÐ ÐÐÐÑ ÐÐÑÐÐÑ."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "ÐÐÑÐÐÐÑÑÐ."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐ ÐÑÐÐÐÑÑ ÑÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ â{0}â."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "ÐÐÐÑÐ ÑÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ."
+msgstr ""
+"ÐÐÐÑÐ ÑÐÐÑÐ ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
-msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐ."
+msgstr "ÐÑÐÑÐÑÐÑÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐÐÑÐÑÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â Ð ÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â Ð ÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
-msgstr "ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑ â{0}â?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ â{0}â?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
-msgstr ""
+msgstr "ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÑÐÐ?"
 
-#: ../mail/mail.error.xml.h:107
-#, fuzzy
-#| msgid "_Private"
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
-msgstr "Ð_ÐÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ _ÐÑÐÐÐÑÐÐ"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÑÐÐ ÐÐÑÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
-msgstr ""
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑ?"
 
 # bug(slobo): ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ
-#: ../mail/mail.error.xml.h:112
-#, fuzzy
-#| msgid "Sender or Recipients"
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
-msgstr "ÐÐÑÐÑÐÐÐÑ ÐÐÐ ÐÑÐÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÐÐÐÐÑÐÐÐ?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "ÐÐÑÐÐÑ ÐÐÑ ÐÐÑÑÐÑÐ"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 msgid "Synchronize folders locally for offline usage?"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ?"
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr ""
-"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐ ÑÐ ÐÐ ÐÐÐÑ "
-"ÐÑÐÐÐÐÐÐÐÐÑÐ, ÐÑÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÑÐÑÐ."
+"ÐÐÑÑÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÑÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐ Ð ÐÐ ÐÐÐÑ "
+"ÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐÐÐ, ÐÑÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13244,35 +13045,35 @@ msgid ""
 msgstr ""
 "ÐÐÐÑÐÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÑÐÑÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐ.\n"
 "\n"
-"ÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐ-ÐÑÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐ "
-"BCC ÐÑÐÐÐÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÐ, ÐÐÐÐÑÑÐÑÐ ÑÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ. "
-"ÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐ, ÐÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐ: ÐÐÐ CC: ÐÑÐÐÐÐÑÐ."
+"ÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐÑÑ ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ âÐÑÐÐÐÐÐÐ-ÐÐâ ÐÐÑÐ ÐÐÐ ÑÐÐÐ "
+"ÐÐÐ ÐÑÐÐÐÐÑÐ. ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ, ÐÐÐ ÑÐ ÐÐÐÐÑÐ, ÐÐÐÐÑÑÐÑÐ ÑÐÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑÐÐ. "
+"ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÐ, ÐÐÐÐÑÑÐ ÐÐÑÐÐ ÑÐÐÐÐÐ âÐÑÐÐÐ:â ÐÐÐ âCC:â ÐÑÐÐÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"ÐÐÑÐ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐÑÐ:\n"
+"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÐÐÐÐÐÑ ÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐÑÐÑ ÐÑÐÐÐÐÐÑÐ:\n"
+"ÐÐÐÐÐÑÐ ÐÑÐÐÐÐÑÐ ÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÑÐ ÐÐÐÑÑÐÐ."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
-msgstr ""
+msgstr "ÐÐÐ ÐÐÑÑÐÐ ÐÐÑÑ ÑÐÐÐÑÑÐ."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13280,18 +13081,18 @@ msgstr ""
 "ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐ,\n"
 "ÐÐÐÑÐ Ñ ÑÑÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ Ð ÐÐÐÐÑÑÐ ÑÐ ÐÐÑÐÑÐÑÐ, ÐÐÐ ÐÐÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:129
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐ ÑÐ ÐÑÐÑÑÑÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÐÐ ÑÐÑÐÑÐ"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:130
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐÑÑÐ ÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÑÐÐÐÐÑÐ"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13299,198 +13100,177 @@ msgstr ""
 "ÐÐÐÑ ÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÑÑÐÐÐÐÐ ÑÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐ "
 "ÐÐÐÑÐÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 msgid "This signature has been changed, but has not been saved."
 msgstr "ÐÐÐÑ ÐÐÑÐÐÑ ÑÐ ÐÑÐÐÐÑÐÐ, ÐÐÐ ÐÐÑÐ ÑÐÑÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:133
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr ""
 "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ Ð ÐÐÐÑÐÑÑÐÐÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:133
-#, fuzzy
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
+#: ../mail/mail.error.xml.h:134
 msgid "This will mark all messages as read in the selected folder."
-msgstr ""
-"ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ Ð ÐÐÐÑÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ Ñ ÐÐÐÐÑÐÐÐÑ ÑÐÑÑÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐ GroupWise ÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑ."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐÑÐÑÑÐÑÐ ÑÐÑÑÐÐÑÐÑ "
-"ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ. ÐÐ ÐÐÑÐÑÑÐÐ ÑÐÑÑÐÐÑÐÑ "
+"ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ ÑÐÐÑÑÐ ÑÐÐÐ?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÑÐ."
 
-#: ../mail/mail.error.xml.h:137
-#, fuzzy
-#| msgid "Unable to retrieve message"
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÐÐÑÑÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÑÐÑ."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "ÐÐÑÐÑÑÐ _ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
-msgstr "ÐÐÑÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
+msgstr "ÐÐ ÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÑÑÑÐ?"
 
-#: ../mail/mail.error.xml.h:140
-#, fuzzy
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
-msgstr "ÐÑÐÑÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÐÑ ÑÐ ÐÐÑÑÐÐÐ?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 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:142
+#: ../mail/mail.error.xml.h:143
 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:143
-#, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this?"
+#: ../mail/mail.error.xml.h:144
 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:144
+#: ../mail/mail.error.xml.h:145
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÑÑ."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "ÐÐÑÑÐ ÑÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÑÑÐÐ, ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ?"
+msgstr "ÐÐÐÑÐ ÐÐÐÐÑÐÐÑÐ ÐÐÑÑÐÐ, ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
-msgstr "ÐÐ ÐÐÐÐÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐ ÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÑÐ ÐÑÑÐÐ ÐÐÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐ ÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 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."
 msgstr ""
-"ÐÐÑÐÑÐ ÐÐÐÐÑÑÐ ÐÐÑ ÑÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑ.\n"
-"ÐÐÐÐ ÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ, Ð/ÐÐÐ ÐÐÐÐÑÐÐ ÑÐÐÑ ÐÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐÐ, "
-"ÑÐÐÑ ÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐÐ Ð ÑÐÐÐÐÑ Ð ÐÑÑÐÐÑ."
+"ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑ ÑÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐÐ ÐÐÐÐÑ.\n"
+"ÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ, Ð/ÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÐ "
+"ÑÐÑÑÐÐÐÐ, ÑÐÐ ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐ Ð ÑÐÐÐÐ Ð ÐÑÑÐÐ."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑ â{0}â ÐÐÐ â{0}â ÐÐÑÐ ÑÑÐÐÐÐ."
 
-#: ../mail/mail.error.xml.h:153
-#, fuzzy
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
-msgstr "ÐÐÐÐ"
+msgstr "_ÐÐÐÐ"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
-msgstr "_ÐÐÐÐÑ"
+msgstr "_ÐÑÐÐÐÑÐ"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_ÐÐÐÐÐÐÑÑÐ"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Empty Trash"
 msgstr "ÐÑÐÑÐÐÐÐ _ÐÐÐÑÐ"
 
-#: ../mail/mail.error.xml.h:158
-#, fuzzy
-#| msgid "Evolution"
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
-msgstr "ÐÐÐÐÑÑÐÑÐ"
+msgstr "_ÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "ÐÐ_ÐÐÑÐ"
 
-#: ../mail/mail.error.xml.h:160
-#, fuzzy
-#| msgid "Migration"
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
-msgstr "ÐÑÐÐÐÐÐÐ"
+msgstr "Ð_ÑÐÑÐÐÐ ÑÐÐÐ"
 
-#: ../mail/mail.error.xml.h:161
-#, fuzzy
-#| msgid "No"
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
-msgstr "ÐÐ"
+msgstr "_ÐÐ"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_ÐÑÐÐÑÐ ÐÐÑÑÐÐ"
 
 # bug(slobo): ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑ Ð ÐÐÑÑÐÐÐ
-#: ../mail/mail.error.xml.h:165
-#, fuzzy
-#| msgid "Send Receipt"
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐÑÐÐÑÑ"
+msgstr "ÐÐÑÐÑÐ _ÐÐÐÑÐÑÐÐÑÑ"
 
-#: ../mail/mail.error.xml.h:166
-#, fuzzy
-#| msgid "Synchronize"
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
-msgstr "ÐÑÐÐÐÐÐ"
+msgstr "_ÐÑÐÐÐÐÐ"
 
-#: ../mail/mail.error.xml.h:167
-#, fuzzy
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
-msgstr "ÐÐ"
+msgstr "_ÐÐ"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
 #: ../mail/message-list.c:1211
 msgid "Unseen"
@@ -13532,54 +13312,59 @@ msgstr "ÐÐÑÐ"
 msgid "Highest"
 msgstr "ÐÐÑÐÐÑÐ"
 
-#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1832 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1839 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
-msgstr "ÐÐÐÐÑ %l:%M %p"
+msgstr "ÐÐÐÐÑ Ñ %l:%M %p"
 
-#: ../mail/message-list.c:1854
+#: ../mail/message-list.c:1848
 msgid "Yesterday %l:%M %p"
-msgstr "ÐÑÑÐ %l:%M %p"
+msgstr "ÐÑÑÐ Ñ %l:%M %p"
 
-#: ../mail/message-list.c:1866
+#: ../mail/message-list.c:1860
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1874
+#: ../mail/message-list.c:1868
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1870
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2644
+#: ../mail/message-list.c:2638
 msgid "Select all visible messages"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2796 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "ÐÐÑÑÐÐ"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3991
+msgid "Follow-up"
+msgstr "ÐÐÐÐÐ"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4475 ../mail/message-list.c:4894
+#: ../mail/message-list.c:4495 ../mail/message-list.c:4914
 msgid "Generating message list"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../mail/message-list.c:4712
+#: ../mail/message-list.c:4732
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
-"ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÐÐÐÑÐ ÐÑÐÑÑÐÑÐ ÐÑÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐ "
-"ÐÑÐÑÑÐÐÐ->ÐÑÐÑÑÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
+"ÐÐÐÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÑÐÐ ÑÑÐÐÐÐÐÐ ÐÑÐÑÑÐÐÐ. ÐÐÐÐÑÐ ÐÑÐÑÑÐÑÐ ÐÑÐÑÑÐÐÑ ÐÐ ÐÐÐÐÑÐ "
+"âÐÑÐÑÑÐÐÐ->ÐÑÐÑÑÐâ ÐÐÐ ÑÐ ÐÐÐÐÐÐÑÐ."
 
-#: ../mail/message-list.c:4714
+#: ../mail/message-list.c:4734
 msgid "There are no messages in this folder."
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÑ ÑÐÑÑÐÐÐÐ."
 
@@ -13597,7 +13382,7 @@ msgstr "ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÑÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐ"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -13614,30 +13399,30 @@ msgstr "ÐÐÐÐÑÐÐÐ"
 
 #: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
-msgstr "ÐÐÑÐÐÐ - ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐ â ÑÐÑÐÑÐÐÐ"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Body contains"
 msgstr "ÐÐÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Message contains"
 msgstr "ÐÐÑÑÐÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Recipients contain"
 msgstr "ÐÑÐÐÐÐÑÐ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Sender contains"
 msgstr "ÐÐÑÐÑÐÐÐÑ ÑÐÐÑÐÐ"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Subject contains"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐÐ"
 
@@ -13650,16 +13435,16 @@ 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:209
 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:211
 msgid ""
@@ -13667,40 +13452,39 @@ msgid ""
 "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:610
-#, fuzzy
-#| msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "ÐÐÑÐÑÑÐ Ñ ÐÐÐÐÐÐÐÑÑ _ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:646
+#: ../modules/addressbook/addressbook-config.c:666
 msgid "Copy _book content locally for offline operation"
 msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÐÑ _ÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/addressbook/addressbook-config.c:753
+#: ../modules/addressbook/addressbook-config.c:778
 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:827
+#: ../modules/addressbook/addressbook-config.c:857
 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:902
+#: ../modules/addressbook/addressbook-config.c:937
 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 "
@@ -13709,32 +13493,32 @@ msgid ""
 msgstr ""
 "ÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐÑÐÐÐÑÐ ÐÑÐÐÐÑ ÐÐÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐ ÐÐÑÑÐÐÑÐ ÑÑÐÐÐÐ "
 "ÐÐÑÐÐÑÐÑÐÑÑÐÐ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐ ÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÐ ÐÐ "
-"ÐÑÐÑÑÐÐÑ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÑÐÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ ÐÐÑÐ "
+"ÐÑÐÑÑÐÐÑ. ÐÐÐÐ ÐÑÐÑÑÐÐÐ âÑÐÐÐÐâ ÑÐ ÑÐÑÑÑÐÑÐ ÑÐÐÐ ÑÐÐÑÐ ÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ ÐÐÑÐ "
 "ÐÐÐÐ."
 
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "ÐÐÐÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1064
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "ÐÑÐÑÑÐÐÐÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "ÐÑÐÑÐÐÐÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../modules/addressbook/addressbook-config.c:1234
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐÑ"
 
@@ -13744,31 +13528,31 @@ msgstr "ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑÑÐÐÐÑÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "Contact layout style"
-msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Contact preview pane position (horizontal)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ (ÑÐÑÐÐÐÐÑÐÐÐÐ)"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (ÐÐÐÐÐÐÐÐ)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid "Contact preview pane position (vertical)"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ (ÐÐÑÑÐÐÐÐÐÐ)"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ (ÑÑÐÑÐÐÐÐ)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML ÐÐ ÐÐÑÑÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÑÐ Ð-ÑÐÑÑÐÐÐÐ ÐÐÑÑÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML ÐÐ ÐÐÑÑÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ."
+msgstr "ÐÐÐ ÐÐÑÑÐ Ð-ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ ÐÐÑÐÑÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÐ ÑÐÑÐÐÐÐÑÐÐÐÐ."
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÐ ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÑÑÐ ÑÑÐÑÐÐÐÐ."
 
 # note(slobo): message thread, ÐÐÐ --> ÐÐÑÐ ÐÑÐÐÐÐ ÑÐ ÑÐÑÐÑÐÐÐ
 # note(slobo): ÐÐÐÐÐÐÐ ÑÐÐ ÐÐ summary ÐÐÑÐÑÑÐÐ --> âÑ ÐÑÐÑÐÐÐ ÑÑÑÐÐÐâ
@@ -13779,20 +13563,16 @@ msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ Ð
 # note(slobo): address book, ÐÐÑÐÑÐÑ --> ÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐÑÑÐ ÐÑÐÐÐ
 # note(slobo): spam , ÐÑÐÑÐ --> ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#, fuzzy
-#| msgid "evolution address book"
 msgid "Primary address book"
-msgstr "ÐÐÑÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐ ÑÐ ÐÐÑÐÑÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-#, fuzzy
-#| msgid "Show Animations"
 msgid "Show maps"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
@@ -13803,6 +13583,8 @@ msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
 msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐÐâ) ÐÐÑÐÑÐÑÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ "
+"âÐÐÐÑÐÐÑÐâ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
@@ -13811,21 +13593,21 @@ msgid ""
 "contact list. \"1\" (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ. "
-"â0â (ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÑ ÐÐÐÑÑ ÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ. "
-"â1â (ÐÐÑÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ) ÑÐÐÑÑÐ ÐÐÐÑÑ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÑÐÐÐÑÐ."
+"ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÑÑÐÑÑÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐÐ Ñ ÐÐÐÐÑÑ ÐÐ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ. 0 â "
+"(ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ. 1 â (ÑÑÐÑÐÐÐÐ "
+"ÐÑÐÐÐÐÐ) ÐÐÑÑÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr ""
-"ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑ ÑÐÑÑÐÑÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÑÐ ÐÐ "
+"ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑ ÑÐÑÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐÑ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÑÐÑÐ ÐÐ "
 "ÑÐÐÐÐÐÐÑÐÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 msgid "URI for the folder last used in the select names dialog"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÑÑ ÐÐÑÐÑÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÑÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑ ÐÐÐÐÐ"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
@@ -13836,86 +13618,85 @@ 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:19
-#, fuzzy
-#| msgid "Whether to show the preview pane."
 msgid "Whether to show maps in preview pane."
-msgstr "ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐ Ñ ÐÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
-msgstr "ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ."
+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:165
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../modules/addressbook/autocompletion-config.c:184
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "ÐÐÐÐÐÐ _ÑÐÐÐÐÐ:"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "ÐÐÐÐÐÐÐÑÑÐÐÐÑÐ"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 msgid "Always _show address of the autocompleted contact"
 msgstr "ÐÐÐÐ _ÐÑÐÐÐÐÑÑ ÐÐÑÐÑÑ ÑÐÐÐÐÐÐÑÑÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:98
+#: ../modules/addressbook/e-book-shell-backend.c:102
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
-msgstr "ÐÐ LDAP ÑÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
-msgstr "ÐÐÐÑÐÐÑ ÐÐ_ÑÑÐ"
+msgstr "ÐÐ_ÑÑÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:311
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÑ ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_ÐÐÑÐÑÐÑ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:321
 #: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑ"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:338
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "ÐÐÐÑÐÐÑÐ"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
-msgstr "ÐÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ"
 
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:387
 #: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐ ÐÐÐÑÑÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
@@ -13923,7 +13704,7 @@ msgstr "ÐÐÐÐÐÐ _ÑÐÐ ÐÐÐÑÐÐÑÐ Ñ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
@@ -13931,7 +13712,7 @@ msgstr "Ð_ÐÑÐÑÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
@@ -13939,7 +13720,7 @@ msgstr "ÐÑÐÐÐÑÑÐ _ÑÐÐ ÐÐÐÑÐÐÑÐ Ñ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
@@ -13951,31 +13732,27 @@ msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÐÑÐ_ÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:847
-#, fuzzy
-#| msgid "Address Book"
 msgid "Address Book _Map"
-msgstr "ÐÐÑÐÑÐÑ"
+msgstr "_ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:849
-#, fuzzy
-#| msgid "Copy the contacts of the selected address book to another"
 msgid "Show map with all contacts from selected address book"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1204
 msgid "_Rename..."
 msgstr "_ÐÑÐÐÐÐÐÑÑ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
@@ -13987,7 +13764,7 @@ msgstr "_ÐÐÐÐÐÐ ÐÐÐÑÐÐÑ Ñ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
@@ -13999,7 +13776,7 @@ msgstr "_ÐÑÐÐÐÑÐ Ñ ÐÐÐÑÐÐÑÑ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ"
+msgstr "ÐÑÐÑÑÐÐÐÑÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
@@ -14007,7 +13784,7 @@ msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÐÑÐÐÑ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÑÐÐÑ ÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÑÐÐÑ ÐÑÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
@@ -14015,7 +13792,7 @@ msgstr "_ÐÑÐÐÐÑÑÐ ÐÐÐÑÐÐÑ Ñ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÑÑÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
@@ -14023,7 +13800,7 @@ msgstr "ÐÐÐÐ ÐÐÐ_ÑÐÐÑ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
-msgstr "ÐÐÐÐ ÐÐÐÑÐÐÑ _ÑÐÐÑÐÐ..."
+msgstr "ÐÐÐÐ _ÐÐÑÑÐ ÐÐÐÑÐÐÑÐ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
@@ -14031,7 +13808,7 @@ msgstr "_ÐÑÐÐÑÐ ÐÐÐÑÐÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÑÐÐÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
@@ -14039,25 +13816,25 @@ msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÑÐÐÑÑ..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÑÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "_ÐÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "_Preview"
 msgstr "_ÐÑÐÐÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "_ÐÐÑÐÑÐ"
 
@@ -14066,10 +13843,8 @@ msgid "_Properties"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
-#, fuzzy
-#| msgid "Address Book"
 msgid "Address Book Map"
-msgstr "ÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
@@ -14077,62 +13852,58 @@ msgstr "ÐÑÐ_ÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:997
-#, fuzzy
-#| msgid "Show as list"
 msgid "Show _Maps"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÑÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:999
-#, fuzzy
-#| msgid "Show contact preview window"
 msgid "Show maps in contact preview window"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐÐ Ñ ÐÑÐÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../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:1474
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Classic View"
 msgstr "_ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "_Vertical View"
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÐ ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "ÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../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
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-#: ../shell/e-shell-content.c:638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
@@ -14150,11 +13921,11 @@ msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1114
 msgid "S_ave Address Book as vCard"
-msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÑ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "_ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÑ ÐÐÐ ÐÐÐÑÑÑ"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1116
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÑ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÑÑÑ"
 
 #. Translators: This is an action label
 #: ../modules/addressbook/e-book-shell-view-actions.c:1122
@@ -14204,7 +13975,7 @@ msgstr "ÐÐÐÑÐÐÑ"
 #: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
-msgstr "ÐÐÐÑÐÐÑ ÐÐÐÐÑÐ ÐÐ %s"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÑÑ ÐÐ %s"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:2
@@ -14236,15 +14007,15 @@ msgstr "ÐÐÐÐÐ"
 
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
-msgstr "ÐÑÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑ ÐÑÐÑÑÐÐÐ"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
-msgstr "ÐÑÐÐÐÐ ÐÐ _ÐÑÐÑÑÐÐÑ:"
+msgstr "ÐÑÐÐÐÐ _ÐÑÐÑÑÐÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
-msgstr "Ð_ÑÐÐÑÑÐÐÐ ÐÑÐÑÑÐÐÐ:"
+msgstr "_ÐÐÐÑÐÑ ÐÑÐÑÑÐÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
@@ -14289,16 +14060,49 @@ msgstr "ÐÐÐÐ Ð_ÑÐÑÑÐÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
-msgstr "_ÐÐÐ:"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ:"
+msgstr "_ÐÑÐÐÐÐÑÐÐ ÑÐÐ:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "ÐÐÑÑÐ"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÑÐÑ (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÐÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÐÑÐÑÑ: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÑÐÑ ÑÑÑÑÐÐ ÐÐÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐÑÑÐ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑÐÑÐ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ Ñ _ÐÐÐÐÐÐ"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "ÐÐÐÐÑÐÐÑÐÑ"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐÑÑÐÐ ÐÐÑÑÐ Ñ ÐÐÐÐÐÐ"
+
+#: ../modules/bogofilter/evolution-bogofilter.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 ÐÑÐÐÐÐÑÐ "
+"ÑÐÑÐ ÑÑ ÑÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -14333,6 +14137,10 @@ msgstr "30 ÐÐÐÑÑÐ"
 msgid "60 minutes"
 msgstr "60 ÐÐÐÑÑÐ"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "ÐÐÐÑÐÐ"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "ÐÐÐÐÐÑÐÑÐ"
@@ -14354,7 +14162,9 @@ msgid "Display"
 msgstr "ÐÑÐÐÐÐ"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
+#, fuzzy
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÐ ÑÐÐÐ Ñ _ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
@@ -14367,301 +14177,300 @@ msgid "Minutes"
 msgstr "ÐÐÐÑÑÐ"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "Ð_ÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "ÐÑÐ_ÐÐÐÑÑÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "ÐÑÑ_ÐÐ ÐÐÐÐ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#, fuzzy
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "ÐÑÐ_ÐÐÐÐ ÐÐÐÑÐÑÐÐÐ"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÑÐÑÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
+"ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐ ÑÐ _ÐÐÐÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "Ð_ÐÐÐÑÐ ÐÐ ÐÐÐÐÑ:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "Ð_ÑÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "ÐÐÐÐÐ:"
 
 # note(slobo): ÐÐÐÐÐ ÑÑÐÐÐ ÑÐÐ
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "ÐÑÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "ÐÐÐÐÐ ÐÑÐÐÐÐÐ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "ÐÐÑÐÑÑÐ ÐÑÐÐÐÐÑÐÑ ÐÐÐÑ _ÑÐÑÑÐÐÐ"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "ÐÐÑÐÑÐÐ Ð_ÐÐÐÑÐ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "ÐÐÐÐÐ ÐÐÐÐ:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - ÑÐÑÐÐÐÐ (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 - ÑÐÑÐÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_ÐÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_ÐÐÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "ÐÐÑÐÑÐÐ _ÐÐÐÐ:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_ÐÐÑ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_ÐÐÐÑÐÑ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_ÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_ÐÐÐÑÐÑÑÐÐÐ ÐÐÐÐÑÐ:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "_ÐÑÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÑÑÐÑÐÐ Ñ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "ÐÐÐÐÐÐ _ÐÑÐÐÐÐÐ:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_ÐÑÐ"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "_ÐÑÐ"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "ÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ/ÑÐÑÐÐÐÐÐÐ"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "ÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐ"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "ÐÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÐÑÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑ, Ñ ÐÐÐÐÐÑ â#rrggbbâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÐÑÐ, Ñ ÐÐÐÐÐÑ â#rrggbbâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
-msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
-msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
-msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐ ÑÐ ÐÐÐÑÐÑÐ ÐÐÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr ""
 "ÐÐÑÐ ÐÐ ÐÑÑÑÑÐÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ Ñ ÑÑÐÑÐ ÐÑÐÐÐÐÐ (ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ "
 "ÐÑÐÐÐÐ)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "ÐÐÑÐ ÐÐ ÐÑÑÑÑÐÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÑÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÑ Ð ÐÐÐÑÑÐÐÐÑÑ ÑÐ ÑÐÐÐÐ ÑÐÑÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ ÐÐÐÑÐÑÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐ ÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "ÐÐÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "ÐÐÐÑÐÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr ""
 "ÐÐÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 "
 "ÐÐ 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr ""
 "ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÐ, Ñ ÐÐÐÐÐÑÐÑÑÐÑÐÐÑÐÑÐÑÐÐÐÐÐ ÐÐÐÐÐÑ, ÐÐ 0 ÐÐ 23."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "ÐÐÐÐÐÐÐ ÑÐ âÑÐÑÐÐâ, Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "ÐÐÑÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐ Ð ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐÐÐ, Ñ ÐÐÐÑÑÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+#| msgid "Last alarm time"
+msgid "Last reminder time"
 msgstr "ÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÐ ÐÐÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑ ÐÑÑÐÐÑ ÐÑÐÐÐÐÑÐÐÑ ÐÐÐÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐ/ÐÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ - ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "ÐÐÑÐ ÐÐÑÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐ - ÑÑÐÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14669,57 +14478,55 @@ msgstr ""
 "ÐÐÑÐÐÑÐ ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑ ÐÑÐÐÐÐÑÐÐÑ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ Ñ ÑÐÐÑÐÑ "
 "âday_second_zonesâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "ÐÐÑÐÐÑÐ ÐÑÐÑ ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑ ÐÑÐÐÐÐÑÐÐÑ ÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐ (ÐÐÑÑÐÐÐÐÐÐ)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÐ, ÐÐ 0 ÐÐ 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ, ÐÐ 0 ÐÐ 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-#, fuzzy
-#| msgid "Number of units for determining a default reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "ÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐ."
+msgstr "ÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "ÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "ÐÑÐÑ ÑÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÑÐÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14727,7 +14534,7 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ "
 "ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14735,19 +14542,19 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
 "ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÐÐÑÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÑÐÑÐÐÐÐÑÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14755,7 +14562,7 @@ msgstr ""
 "ÐÐÐÐÐÐÑ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÐÑÑÐ ÐÐÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ "
 "ÐÐÑÑÐÑ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14763,7 +14570,7 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
 "ÐÐÐÐÑÐÐÐ Ñ ÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÐÐÑÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 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."
@@ -14771,34 +14578,42 @@ msgstr ""
 "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐÐÑÑÐ, ÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ Ð ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐ Ð ÑÐÐÑÐÐ "
 "ÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
 msgstr "ÐÑÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÑÐÐÑÑÐ ÐÐÐÑÐÐÐÐ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 #, fuzzy
-#| msgid "Recurrence date is invalid"
-msgid "Recurrent Events in Italic"
-msgstr "ÐÐÑÑÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "ÐÐÐÑÐÑÐÐÑÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÑÑÐÐÑ ÐÐÐÑÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -14807,7 +14622,7 @@ msgstr "ÐÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:66
 msgid "Show RSVP field in the event/task/meeting editor"
-msgstr "ÐÑÐÐÐÐÐ RSVP ÐÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
@@ -14824,9 +14639,13 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐ
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
+"ÐÑÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÐÑÐÑÑ ÐÑÐÐÑÐÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐ Ñ "
+"ÐÐÑÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÐÐ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -14850,10 +14669,10 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-#, 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 "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ Ð ÐÑÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑ ÐÐÐÐÑÑ"
+msgstr ""
+"ÐÑÐÐÐÐÑÑÐ ÐÑÐÑ ÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ, Ñ ÐÑÐÐÐÐÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ Ð "
+"ÐÑÐÑÑÐÐÐÐÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
@@ -14884,18 +14703,22 @@ msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view."
 msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐÐâ) ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ "
+"âÐÐÐÐÐÐÐÑâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐâ) ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ âÐÐÐÐÑÐÐâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
 msgstr ""
+"ÐÐÐ ÐÐÐÐÑÐÐÐÐ (ÐÐÐ âÐÑÐÐÐÑÐÐÐâ) ÐÐÐÐÑÐÐ Ñ ÐÐÑÐÐÑ ÐÐÐÑÑÐ Ñ ÐÑÐÐÐÐÐÑ âÐÐÐÐÑÐâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
@@ -14951,7 +14774,9 @@ msgid "Time divisions"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
 msgstr "ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÑÐÐ, Ñ time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -14963,12 +14788,12 @@ msgid "Twenty four hour time format"
 msgstr "24-ÑÐÑÐÐÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-#, fuzzy
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ, âÐÐÐÑÑÐâ, âÑÐÑÐâ ÐÐÐ âÐÐÐÐâ."
+msgstr ""
+"ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ, âÐÐÐÑÑÐâ, âÑÐÑÐâ ÐÐÐ "
+"âÐÐÐÐâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
@@ -15002,7 +14827,9 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "ÐÐÐ ÐÐÑÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐ, ÐÐ ÐÐÐÐÑÐ (0) ÐÐ ÑÑÐÐÑÐ (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐÑ ÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -15044,14 +14871,14 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-#, fuzzy
-#| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÑÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ RSVP Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/"
+"ÑÐÑÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
@@ -15080,10 +14907,8 @@ msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÐ Ñ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐ/ÐÐÐÐÑÐÐÐ/ÑÐÑÑÐÐÐÐÐ"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, fuzzy
-#| msgid "Whether to show week numbers in the date navigator."
 msgid "Whether to show week numbers in various places in the Calendar."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ Ñ ÐÐÐÑ ÐÐ ÐÐÑÑÐ."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
@@ -15105,116 +14930,127 @@ msgstr "ÐÐÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ"
 msgid "Workday start minute"
 msgstr "ÐÐÐÑÑ ÐÐÑÐÐ ÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "Ð_ÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "Ð_ÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "Ð_ÐÐÐÐ Ñ ÐÐÐÐÑÐÐ"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+#, fuzzy
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐ ÐÐÐÐÐ ÑÐÑ"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "_ÐÑÐÐÐ Ð ÐÐÑÑÐ:"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "ÐÐÐÐ _ÐÐÑÑÐ:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:117
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:104
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:104
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "ÐÐ ÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-backend.c:119
 #: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "ÐÑÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:206
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "ÐÐÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ_ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "Ð_ÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "ÐÐÐÐ_ÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-backend.c:751
-#: ../plugins/itip-formatter/itip-formatter.c:2937
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "ÐÐÐÐÐÐÐÑ Ð ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:635
-#, fuzzy
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
-msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:652
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1000
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ %s"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ ÐÐ %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "ÐÑÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 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 "
@@ -15225,488 +15061,484 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ ÑÑÐÑÐÑÐ ÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
 #: ../modules/calendar/e-cal-shell-view-memopad.c:220
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ iCalendar"
+msgstr "ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "_ÐÐÐÐÐÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "ÐÐ_ÑÐÑÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "ÐÐÐ ÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "ÐÐÐ ÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÑÑÐ ÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "ÐÐÐÐÐÑÐ _ÐÐÑÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "ÐÐÐÐ_ÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
-msgstr "ÐÐÐÐÑÐ ÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÑÐÑÐ ÐÐÐÐÐÐÐÐÑÐ Ð ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "Ð_ÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐ ÐÐÐÑ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "_ÐÐÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "_ÐÐÐÐÐÐÑÐÑ ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "_ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "ÐÐÑÐÑÐ ÐÐÑ _ÐÐÑÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
-msgstr "ÐÐÑÐÑÐ ÐÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÑ ÐÐÑÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "ÐÐÑÐÑÐ ÑÐÐ ÐÐ_ÑÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
-msgstr "ÐÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ _ÐÐÐÐÑÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
-msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
 #: ../modules/calendar/e-cal-shell-view-memopad.c:254
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "ÐÐÐÐ _ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
-msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "ÐÑÐÐ_ÐÑÐ Ñ ÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "ÐÐÐÐ _ÐÐÐÐÐÐÐÐÑÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "ÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐ _ÐÐÐÑÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "_ÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
-msgstr "ÐÑÐÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "Ð_ÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "_ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
-msgstr "ÐÑÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ Ñ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "ÐÑÐ_ÑÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
-msgstr "ÐÑÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "ÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "ÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "ÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "ÐÐÑÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐ ÐÐÑÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑ ÐÐÐÐÑÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑ ÑÐÐÐÑ ÐÐÐÐÑÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑ"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "ÐÐÐÑ ÑÐÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÑ ÐÐÐÐÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÐ ÑÑÐÐÐÑ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
 #: ../modules/calendar/e-cal-shell-view-memopad.c:295
 msgid "Save as iCalendar..."
-msgstr "ÐÐÑÑÐÐÑ ÐÐÐ iCalendar..."
+msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "ÐÐÐÐ _ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
-msgstr "ÐÐÐÐÑÐ ÑÐÐÐÑ ÐÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑ ÐÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
-msgstr "ÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:275
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "ÐÑÐÐÑÐ _ÐÐÐ ÑÑÑÐÐÐÑÑ"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
 
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "_ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "_ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "_ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "ÐÐÐÐ ÐÐÐ_ÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
-msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "Print the selected task"
 msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
 msgid "_Save as iCalendar..."
 msgstr "_ÐÐÑÑÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐÐÑ..."
 
-#: ../modules/calendar/e-calendar-preferences.c:440
-msgid "Selected Calendars for Alarms"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÐ ÐÐÐÐÐ ÑÐÑ"
-
-#: ../modules/calendar/e-calendar-preferences.c:839
-msgid "Ti_me and date:"
-msgstr "_ÐÑÐÐÐ Ð ÐÐÑÑÐ:"
-
-#: ../modules/calendar/e-calendar-preferences.c:840
-msgid "_Date only:"
-msgstr "ÐÐÐÐ _ÐÐÑÑÐ:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "ÐÐÐÐÑÐ_Ð"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_ÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "ÐÐÐ_ÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:577
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:887
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐ %s ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑ ÑÐ â%sâ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "ÐÑÐÐÐÐÑ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "_ÐÐÑÐÑÐ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "Ð_ÑÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑÐ"
+msgstr "ÐÑÐÑÑÐÐÐÑÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÑ ÐÐÐÐÑÑÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
 msgstr "ÐÐ_ÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "_ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐ ÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "_ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÑÐÐÐÑ"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÑ"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
@@ -15718,63 +15550,55 @@ msgstr[2] "%d ÐÐÐÐÑÐÐ"
 msgstr[3] "%d ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
-msgstr "%d ÐÐÐÐÑÐÐÐ"
-
-#: ../modules/calendar/e-memo-shell-view.c:227
-msgid "Delete Memos"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑ â %d"
 
-#: ../modules/calendar/e-memo-shell-view.c:229
-msgid "Delete Memo"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÑ"
-
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "ÐÐÐÐÑÐÐ_Ð ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "ÐÐÐÑÐÐ ÐÐ_ÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
-msgstr "ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:577
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:887
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ Ñ %s"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÐ Ñ â%sâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "ÐÑÐÐÐÐÑ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15784,109 +15608,117 @@ msgstr ""
 "ÐÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐ ÑÑÐÑÐÐ ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÐÐÐÑÑÐÐÐ. ÐÐÐ "
 "ÐÐÑÑÐÐÐÑÐ, ÐÐÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ.\n"
 "\n"
-"ÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÐÐ?"
+"ÐÐ ÐÐÑÐÑÐÐ ÐÐÐ ÐÐÐÐÑÐÐ?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:591
 msgid "Do not ask me again"
 msgstr "ÐÐ ÐÐÑÐÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "_ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "_ÐÑÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑÑ Ñ ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "ÐÐÐÐÐÐ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "Ð_ÐÑÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "ÐÐ_ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
-msgstr "ÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐ ÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "Ð_ÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "ÐÑÐÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "ÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
-msgstr "ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Preview the list of tasks to be printed"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐ ÑÑÐÐÐÑ"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15895,31 +15727,19 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[2] "%d ÐÐÐÐÑÐÐÐ"
 msgstr[3] "%d ÐÐÐÐÑÐÐ"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐ"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐ"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
-msgstr "%d ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "ÐÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÐÐ â %d"
 
 #: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
@@ -15928,7 +15748,7 @@ msgstr "_ÐÐÑÑÐÐ"
 
 #: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÐÑ"
 
 #: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
@@ -15937,130 +15757,131 @@ msgstr "_ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÑ"
 
 #: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÑÑÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÑÐÐÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "_ÐÐÐÐÐÐÑÑÐ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Disable this account"
-msgstr "ÐÐÐÐÐÐÑÑÐ ÐÐÐÑ ÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÑÐÑÐ ÐÐÐÑ ÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_Download Messages for Offline Usage"
-msgstr "_ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr ""
+"ÐÑÐÑÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÐ ÐÐÑÐ ÑÑ ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
 msgid "Fl_ush Outbox"
-msgstr "ÐÑ_ÐÑÐÐÐÐ ÐÐ ÑÐÐÑÐ"
+msgstr "ÐÑ_ÐÑÐÐÐÐ âÐÐ ÑÐÐÑÐâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "_Copy Folder To..."
 msgstr "_ÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Copy the selected folder into another folder"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Permanently remove this folder"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "E_xpunge"
 msgstr "ÐÐÐÐ_ÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Mar_k All Messages as Read"
 msgstr "ÐÐÐÐÑÐ ÑÐÐ ÐÐ_ÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Mark all messages in the folder as read"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÑÐÐÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Move Folder To..."
 msgstr "_ÐÑÐÐÐÑÑÐ ÑÐÑÑÐÐÐÑ Ñ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Move the selected folder into another folder"
-msgstr "ÐÑÐÐÐÑÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÑÑÐÐÐÑ Ñ ÐÑÑÐÑ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_New..."
 msgstr "_ÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Create a new folder for storing mail"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÑ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Change the properties of this folder"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Refresh the folder"
-msgstr "ÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Change the name of this folder"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
 msgid "Select Message _Thread"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÑÐÑÐÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select all messages in the same thread as the selected message"
-msgstr "ÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÑÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÑÑÐ ÑÐÑÐÑÐÐÐ ÐÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Select Message S_ubthread"
-msgstr "ÐÐÑÐ Ð_ÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÐÐÑÐ Ð_ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Select all replies to the currently selected message"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Empty _Trash"
 msgstr "ÐÐÐÐÑÐ _ÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "_New Label"
 msgstr "_ÐÐÐÐ ÐÐÐÐÐÐ"
 
@@ -16069,205 +15890,205 @@ 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:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "N_one"
 msgstr "Ð_ÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#, fuzzy
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Manage Subscriptions"
-msgstr "_ÐÑÐÑÐÐÐ..."
+msgstr "_ÐÐÑÐÐÑÐÑ ÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Send / _Receive"
 msgstr "ÐÐÐÑÐ / Ð_ÑÐÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Send queued items and retrieve new items"
 msgstr "ÐÐÑÐ ÐÑÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
-#, fuzzy
-#| msgid "Received"
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "R_eceive All"
-msgstr "ÐÑÐÐÑÐÐÐ"
+msgstr "Ð_ÑÐÐÐ ÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
-#, fuzzy
-#| msgid "Permanently remove all the deleted messages from all accounts"
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Receive new items from all accounts"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐ ÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÑÐ ÑÐÐÑ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
-#, fuzzy
-#| msgid "_Send"
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Send All"
-msgstr "_ÐÐÑÐÑÐ"
+msgstr "Ð_ÐÑÐÑÐ ÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
-#, fuzzy
-#| msgid "Send queued items and retrieve new items"
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send queued items in all accounts"
-msgstr "ÐÐÑÐ ÐÑÐÐÑÐÐÑÐÐÐ Ð ÐÐÐÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÑÑÐÐÐÐ ÐÐ ÑÐÐÐÑÑ Ñ ÑÐÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "ÐÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Cancel the current mail operation"
-msgstr "ÐÑÐÐÐÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ ÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÐÑÐÑÐÑÑ ÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Collapse All _Threads"
 msgstr "ÐÐÑÐÐ ÑÐÐ _ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "Collapse all message threads"
-msgstr "ÐÐÑÐÐ ÑÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐ ÑÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "E_xpand All Threads"
 msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÑÐ_ÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Expand all message threads"
-msgstr "ÐÐÐÐÑÐÐÐÑ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÑÐ ÑÐÐ ÐÐÑÑÐÐ Ñ ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "_Message Filters"
-msgstr "Ð_ÐÐÑÐÑÐ ÐÐ ÐÐÑÑÐÐ"
+msgstr "Ð_ÐÐÑÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Create or edit rules for filtering new mail"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
 msgid "_Subscriptions..."
 msgstr "_ÐÑÐÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "F_older"
 msgstr "ÐÐÑ_ÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "_Label"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "C_reate Search Folder From Search..."
 msgstr "ÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Search F_olders"
 msgstr "ÐÐÑ_ÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
 msgid "Create or edit search folder definitions"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Folder..."
 msgstr "_ÐÐÐÐ ÑÐÑÑÐÐÐÐ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Show Message _Preview"
 msgstr "ÐÑÐÐÐ_ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Show message preview pane"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Show _Deleted Messages"
 msgstr "ÐÑÐÐÐÐÐ Ð_ÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
-#, fuzzy
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Show deleted messages with a line through them"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐÐÐ) Ñ ÐÐÑÑÐ ÐÐÑÑÐÐ."
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐ (ÐÐÐ ÐÑÐÑÑÑÐÐÐ)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Group By Threads"
-msgstr "ÐÑÑÐÐÑÐ ÐÐ ÑÐÑÐÑÐÐÐÐÐ"
+msgstr "ÐÑÑÐÐÑÐ ÐÐ _ÑÐÑÐÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1455
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Threaded message list"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Show message preview below the message list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐ ÐÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Show message preview alongside the message list"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÑÐÐ ÑÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "All Messages"
 msgstr "ÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
 msgid "Important Messages"
 msgstr "ÐÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Last 5 Days' Messages"
 msgstr "ÐÐÑÑÐÐ Ñ ÐÐÐÑÐÑ 5 ÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Messages Not Junk"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÑ ÑÑÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Messages with Attachments"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "No Label"
 msgstr "ÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Read Messages"
 msgstr "ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Recent Messages"
 msgstr "ÐÐÐÑÐÑÑÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Unread Messages"
 msgstr "ÐÐÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1602
 msgid "Subject or Addresses contain"
 msgstr "ÐÐÑÐÐÐ ÐÐÐ ÐÐÑÐÑÐ ÑÐÐÑÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "All Accounts"
 msgstr "ÑÐÐÐ ÐÐÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Current Account"
 msgstr "ÑÐÐÑÑÐÐ ÐÐÐÐÐÑ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Current Folder"
 msgstr "ÑÐÐÑÑÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑ ÐÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-view.c:947
+msgid "Proxy _Logout"
+msgstr "_ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -16276,7 +16097,7 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÐ,"
 msgstr[2] "%d ÐÐÐÐÑÐÐÐÑ,"
 msgstr[3] "%d ÐÐÐÐÑÐÐÐ,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -16285,17 +16106,17 @@ msgstr[1] "%d ÐÐÑÐÑÐÐÐ"
 msgstr[2] "%d ÐÐÑÐÑÐÐÐÑ"
 msgstr[3] "%d ÐÐÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
-msgstr[0] "%d ÑÑÐÑÐ"
-msgstr[1] "%d ÑÑÐÑÐÑÐ"
-msgstr[2] "%d ÑÑÐÑÐÑÐ"
-msgstr[3] "%d ÑÑÐÑÐ"
+msgstr[0] "%d ÐÐÐÐÐÐÑÐÐ"
+msgstr[1] "%d ÐÐÐÐÐÐÑÐÐ"
+msgstr[2] "%d ÐÐÐÐÐÐÑÐÐÑ"
+msgstr[3] "%d ÐÐÐÐÐÐÑÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16304,7 +16125,7 @@ msgstr[1] "%d ÐÐÑÑÑÐ"
 msgstr[2] "%d ÐÐÑÑÑÐ"
 msgstr[3] "%d ÐÐÑÑÑ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16313,7 +16134,7 @@ msgstr[1] "%d ÐÐÐÐÑÐÐÑÐ"
 msgstr[2] "%d ÐÐÐÐÑÐÐÑÐÑ"
 msgstr[3] "%d ÐÐÐÐÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16322,7 +16143,7 @@ msgstr[1] "%d ÐÐÑÐÐÑÐ"
 msgstr[2] "%d ÐÐÑÐÐÑÐÑ"
 msgstr[3] "%d ÐÐÑÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16331,7 +16152,7 @@ msgstr[1] "%d ÐÐÐÑÐÑÐÑÐÐÐ,"
 msgstr[2] "%d ÐÐÐÑÐÑÐÑÐÐÐÑ,"
 msgstr[3] "%d ÐÐÐÑÐÑÐÑÐÐÐ,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16340,145 +16161,117 @@ msgstr[1] "%d ÑÐÑÐÐÐ"
 msgstr[2] "%d ÑÐÑÐÐÐ"
 msgstr[3] "%d ÑÐÑÐÐÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
-#, fuzzy
-#| msgid "Task"
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
-msgstr "ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐ"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
-#, fuzzy
-#| msgid "Send / _Receive"
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
-msgstr "ÐÐÐÑÐ / Ð_ÑÐÐÐÑÐ"
-
-#: ../modules/mail/e-mail-shell-view.c:559
-msgid "All Account Search"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÑ ÐÐÐÐÐÐ"
-
-#: ../modules/mail/e-mail-shell-view.c:732
-msgid "Account Search"
-msgstr "ÐÑÐÑÑÐÐÐ ÐÐÐÐÐÐ"
-
-#: ../modules/mail/e-mail-shell-view.c:943
-msgid "Proxy _Logout"
-msgstr "_ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
-
-#: ../modules/mail/em-account-prefs.c:218
-msgid "Evolution Account Assistant"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
-
-#: ../modules/mail/em-account-prefs.c:267
-msgid "Account Editor"
-msgstr "ÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐ / ÐÑÐÐÐ"
 
 # has "activatable" set.
-#: ../modules/mail/em-composer-prefs.c:490
+#: ../modules/mail/em-composer-prefs.c:493
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
-#: ../modules/mail/em-composer-prefs.c:494
+#: ../modules/mail/em-composer-prefs.c:497
 msgid "Language(s)"
 msgstr "ÐÐÐÐÐ(ÑÐ)"
 
 # bug: requires a comment on usage
 # ÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÐ Ð ÐÐÐÐÑÐ
-#: ../modules/mail/em-mailer-prefs.c:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "ÑÐÐÐÐ ÐÑÑ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "ÑÐÐÐÐÐ ÐÐÐÐÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "ÑÐÐÐÐÐ ÐÐÐÐÑÐÐ"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "ÑÐÐÐÐÐ ÐÐÑÐÑÐÐ"
 
-#: ../modules/mail/em-mailer-prefs.c:288
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../modules/mail/em-mailer-prefs.c:292
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÐÐÐÑÑ"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
-#, 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:706 ../modules/mail/em-mailer-prefs.c:780
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "ÐÐÐÐÑÐÐ %s ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐÐÑÐÐ."
-
-#: ../modules/mail/em-mailer-prefs.c:744
-msgid "No junk plugin available"
-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:1147
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "ÐÐÐÐÐÐÑÐ _ÐÐÑÑÐÐ:"
 
-#: ../modules/mail/em-mailer-prefs.c:1148
+#: ../modules/mail/em-mailer-prefs.c:1032
 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 "ÐÑÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÑÑ"
+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:146
-#, 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 "ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÑÐÑÑ ÑÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð-ÐÐÑÑÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ ÑÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐÐ Ð-ÐÐÑÑÐ?"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Click 'Work Online' to return to online mode."
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ âÐÐÐ ÐÐ ÐÑÐÐÐâââ ÐÐ ÑÐ ÐÑÐÑÐÑÐ ÐÐ ÑÐÐÐÐ ÐÐ ÐÑÐÐÐ."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#, fuzzy
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid "Evolution is currently offline due to a network outage."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ ÑÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÐ ÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐ."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-#, fuzzy
-#| msgid "Put Evolution into offline mode"
 msgid "Evolution is currently offline."
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÑÐÑÐ ÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐ ÐÑÐÐÐ."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-#, fuzzy
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ ÑÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
+msgstr ""
+"ÐÐÐÐÑÑÐÑÐ ÑÐ ÑÐ ÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐ ÐÐÐÐ "
+"ÑÑÐÐÑÑÐÐÑÐÐÐ."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÑÐÑÑÑÐ ÐÐÐÐÐ ÐÐ ÑÑÐÑÐÐ âÐÑÐ.ÐÐÐÐ.ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐâ "
+"ÑÐ ÐÐÑÐ ÐÐÑ ÐÐÐÐÐ ÐÑÐÑÑÑÐ ÐÐÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑÐÑÐÑÐ."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "ÐÐÑÑ"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"ÐÐÐ ÐÐÑÐÑÐ ÑÐ ÑÐ ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑ ÐÑÑÐÐ ÐÐÐÐÐÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐ"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
@@ -16509,78 +16302,128 @@ msgstr "_ÐÑÐÐÑÑÑÑÐ"
 msgid "Enable and disable plugins"
 msgstr "ÐÐÑÑÑÑÑÐ Ð ÐÑÐÑÑÑÑÑÐ ÐÐÐÐÑÐÐ"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐÑÐÐ"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "ÐÑÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÐÐÐÑÐÑÐÑ ÐÐÑÐÐÑÑÑÐÐ ÐÐÑÐÐÐ."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
-msgstr "ÐÐÑÐÐÐ Python"
+msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr "ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑ ÐÑÐÐÑÑÑÐÐ Python"
+msgstr "ÐÐÑÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÑ ÐÑÐÐÑÑÑÐÐ ÐÐÑÐÐÐ"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "ÐÐÑÑ ÐÑÐÐÑÑÑÐÐ Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÑÑ ÑÐÐÐÐ (%s): "
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "ÐÐÐÑÐÑÐÑ ÑÐÑÑ ÐÑÐÐÑÑÑÐÐ ÐÐ Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐ ÑÐÐÑÐÐÑ ÐÐÑÑÐÐ ÐÐÑÑÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ: "
+
+# bug: plural-forms
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ â%sâ Ñ ÐÐÐÑÐ ÑÐÐÐÐ: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "ÐÐÐ ÑÐ ÐÐÐÑÐ ÑÐÐÐÐ ÑÑÑÑÐÐ ÐÐÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐÑÑÐ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "Ð_ÐÑÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "ÐÐÐ ÑÐ ÐÐÐÑÑ ÑÐÐÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐÐÐÐÐÑÐÐ , ÐÐÐ ÑÐÐÑÐÑÐÐ."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "ÐÐÐÑÐ ÑÐÐÐÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÑÐÐÑ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐÐ (ÐÐÐ DNS-Ð)."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 msgid "Please select the information that you would like to import:"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:312
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "ÐÐ %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
 #: ../modules/startup-wizard/evolution-startup-wizard.c:420
-#, fuzzy
-#| msgid "Importing files"
 msgid "Importing Files"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐ. ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
-msgstr ""
+msgstr "ÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:490
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:496
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
-msgstr "ÐÐÐÑÐ ÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐÐ"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:501
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 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"
 "\n"
 "ÐÐÐÐÐÐÑÐ âÐÐÐÑÐÐâ ÐÐ ÐÐÑÑÐÐÐÑÐ. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:606
-#, fuzzy
-#| msgid "Loading..."
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 msgid "Loading accounts..."
-msgstr "ÐÑÐÑÐÐÐÑÐ..."
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐ..."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
@@ -16616,8 +16459,6 @@ msgid "Message has no attachments"
 msgstr "ÐÐÑÑÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
-#| msgid "_Add attachment..."
 msgid "_Add Attachment..."
 msgstr "_ÐÐÐÐÑ ÐÑÐÐÐÐ..."
 
@@ -16627,7 +16468,7 @@ msgstr "_ÐÑÐÐÐ ÐÐÑÑÐÑ"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
-msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
@@ -16635,11 +16476,11 @@ msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÑÐÐ
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "Inline Audio"
-msgstr "ÐÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÐÐ"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Play audio attachments directly in mail messages."
-msgstr "ÐÑÑÑÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ."
+msgstr "ÐÑÑÑÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÑÐÐÑÐÐ Ñ ÐÐÑÑÐÐÐÐ."
 
 #: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
@@ -16663,9 +16504,9 @@ msgid ""
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
 "settings, mail filters etc."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÑ, "
-"ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ, ÐÐÐÐÑÐÐ, ÐÐÐÑÐÐÑÐ. ÐÐÐÐÑÐ ÑÐ  ÐÐÐÑ ÐÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐ "
-"ÐÐÑÑÐÐÐÐ, ÑÐÐÑÐÑÐ ÐÐ ÐÐÑÑÑ, ÐÑÐ."
+"ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐ ÐÐÐÑÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÑÑÑ, "
+"ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ, ÐÐÐÐÑÐÐ, ÐÐÐÑÐÐÑÐ. ÐÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÑÐÐ "
+"ÐÐÑÑÐÐÐÐ, ÑÐÐÑÐÑÐ ÐÐ ÐÐÑÑÑ, ÐÑÐ."
 
 #: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
@@ -16684,31 +16525,23 @@ msgid "Restore from backup"
 msgstr "ÐÑÐÑÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../plugins/backup-restore/backup-restore.c:389
-#, fuzzy
-#| msgid "Backing up Evolution Data"
 msgid "_Back up Evolution Data..."
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐ _ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ..."
 
 #: ../plugins/backup-restore/backup-restore.c:391
-#, fuzzy
-#| msgid "Backup Evolution data and settings to an archive file"
 msgid "Back up Evolution data and settings to an archive file"
-msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ Ñ ÐÑÑÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ Ñ ÐÑÑÐÐÑ"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup-restore.c:396
-#, fuzzy
-#| msgid "Restoring Evolution Data"
 msgid "R_estore Evolution Data..."
-msgstr "ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "_ÐÑÐÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ..."
 
 #: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐ"
+msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÑÐÐÐ"
 
 #: ../plugins/backup-restore/backup.c:77
-#, fuzzy
-#| msgid "Backup Evolution directory"
 msgid "Back up Evolution directory"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
@@ -16717,10 +16550,8 @@ msgid "Restore Evolution directory"
 msgstr "ÐÐÑÐÐÑÐÑÐÑÑÐ ÐÐ ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:81
-#, fuzzy
-#| msgid "Check Evolution Backup"
 msgid "Check Evolution Back up"
-msgstr "ÐÑÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ ÐÐÐÐÑÑÐÑÐ"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:83
@@ -16729,7 +16560,7 @@ msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ"
 
 #: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
-msgstr "ÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐ"
+msgstr "ÐÐ ÐÑÐÑÐÑÐÐÐ ÐÐÑÑÐÐÑÐÐ"
 
 #. FIXME Will the versioned setting always work?
 #: ../plugins/backup-restore/backup.c:295
@@ -16739,7 +16570,7 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
@@ -16747,10 +16578,8 @@ msgstr ""
 "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ (ÐÐÑÑÐ, ÐÐÐÐÐÐÐÑÐ, ÐÐÐÐÑÐ, ÐÐÐÐÑÐÐ)"
 
 #: ../plugins/backup-restore/backup.c:327
-#, fuzzy
-#| msgid "Backup complete"
 msgid "Back up complete"
-msgstr "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÑÐ ÐÐÐÑÑÐÐÐ"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:334
@@ -16759,45 +16588,37 @@ msgid "Restarting Evolution"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:418
-#, fuzzy
-#| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
-msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ ÑÑÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:426
-#, fuzzy
-#| msgid "Extracting files from backup"
 msgid "Extracting files from back up"
-msgstr "ÐÑÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
-msgstr "ÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:502
-#, fuzzy
-#| msgid "Removing temporary backup files"
 msgid "Removing temporary back up files"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÐÐÑ ÑÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
 #: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
-msgstr "ÐÑÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
-msgstr "ÐÐÐÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ Ñ ÑÐÑÑÐÐÐÑ %s"
+msgstr "ÐÐÐÑÑÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ Ñ ÑÐÑÑÐÐÐÑ â%sâ"
 
 #: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
-msgstr "ÐÑÑÐ ÐÐÐÑÐÑÐÑ ÐÐ ÑÐÑÑÐÐÐÐ %s"
+msgstr "ÐÑÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐÐ â%sâ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
 #: ../plugins/backup-restore/backup.c:728
-#, fuzzy
-#| msgid "Evolution Backup"
 msgid "Evolution Back up"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
@@ -16811,7 +16632,7 @@ msgstr "ÐÐÑÐÑÑÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐ
 
 #: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
-msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÑÐÐÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐ."
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:769
@@ -16820,7 +16641,7 @@ msgstr "ÐÐÐÑÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
-msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÑÐÐ ÑÑÐÑÐ."
+msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐ ÐÐÐÐÑÐÐ Ñ ÐÑÐÐÐÐÑÐÐ ÑÑÐÑÐ."
 
 #: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
@@ -16828,58 +16649,43 @@ msgstr "ÐÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐ, Ñ ÐÐÐÐÑÐÐÑÑÐ ÐÐ ÐÐÐ
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#, fuzzy
-#| msgid "Backup and Restore"
 msgid "Back up and Restore"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÐÑÐÐ Ð ÐÐÐÑÐÐÐÐ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
-#| msgid "Backup and restore your Evolution data and settings."
 msgid "Back up and restore your Evolution data and settings."
-msgstr "ÐÑÐÐÐ ÑÐÐÐÑÐÑ Ð ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ."
+msgstr "ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÑ Ð ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÑÐÑÐ."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
 "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#, fuzzy
-#| msgid "Choose an action:"
 msgid "Close and Back up 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 "ÐÐÐÐÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ"
+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:6
-#, fuzzy
-#| msgid "Invalid Evolution backup file"
 msgid "Invalid Evolution back up file"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-#| msgid "Please select a valid backup file to restore."
 msgid "Please select a valid back up file to restore."
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑ."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
@@ -16890,6 +16696,9 @@ msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
+"ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÑ ÐÐÐÐÑÑ ÐÐÑÐÑ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÐÑÐÐÐÑÐ, ÐÑÐÐ ÐÐÑÐÑÐ ÐÐ "
+"ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ. ÐÑÐÐÑÐ ÑÐÐÑÑÐÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐ "
+"ÐÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐ."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
@@ -16898,6 +16707,10 @@ msgid ""
 "all your current Evolution data and settings and restore them from your back "
 "up."
 msgstr ""
+"ÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐÐÑÐ, ÐÑÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ. ÐÑÐÐÑÐ "
+"ÑÐÐÑÑÐÐ ÐÐ ÑÑÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐ. ÐÐÐ ÑÐ "
+"ÐÐÑÐÑÐÑÐ ÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÑÐÑÐ Ð ÐÐÐÐÑÐÐÐÑÐ Ð ÐÑÐÑÐÑÐ ÐÐÐ ÐÐ ÐÐÑÐ "
+"ÑÐÐÐÑÐÐÐ ÐÐÐÐÑÐ."
 
 #: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16907,7 +16720,7 @@ msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÐ"
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
-msgstr "ÐÑÐÐÐ ÑÐÐÑÐ Ñ _ÐÐÑÐÑÐÑ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐ"
+msgstr "ÐÐÐÑÐÐÐ ÑÐÐÑÐ Ñ _ÐÐÑÐÑÐÑ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐ"
 
 #: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
@@ -16915,18 +16728,16 @@ msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÑÐ
 
 #: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
-msgstr "ÐÑÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÐÑÐ ÑÑÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:735
-#, fuzzy
-#| msgid "Synchronize contact info and images from Pidgin buddy list"
 msgid "_Synchronize contact info and images from Pidgin buddy list"
-msgstr "ÐÑÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÑÐÐÑÐÐÐ Ð ÑÐÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐ Ñ ÐÐÑÐÐÑ"
+msgstr "_ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ ÑÐ ÐÐÑÑÐÐ ÐÑÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐ"
 
 #: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
-msgstr "ÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ Pidgin ÐÐÑÑÑ ÐÑÐÑÐÑÐÑÐ"
+msgstr "ÐÐÑÐ ÐÐÑÐÑÐÑ ÐÐ ÐÐÑÑÑ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÐÐ"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:752
@@ -16935,7 +16746,7 @@ msgstr "ÐÑÐÐÐÐÐ ÑÐ _ÐÐÑÑÐÐ ÐÑÑÐÐÑÐ ÑÐÐÐ"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
 msgid "BBDB"
-msgstr "BBDB"
+msgstr "ÐÐÐÐ"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid ""
@@ -16945,72 +16756,18 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"ÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐ ÑÐÐÐ Ñ ÑÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÑÐÐ.\n"
+"ÐÑÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐ ÑÐÐÐ Ñ ÑÐÑÐÐÑÐÑÑ ÐÐÑÐÑÐÑÐÐ.\n"
 "\n"
 "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐÑ ÐÐÐÐÐÐÐ Ð ÐÐÑÐÑÐÐÐ Ð-ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÑÐ ÐÐ "
 "ÐÐÑÑÐÐ. ÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÑÐÐÑ ÐÑÐÐÐ ÐÐÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐÐ ÐÑÑÐÐÑÐ."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
-#, 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:165
-#, c-format
-msgid "Error occurred while spawning %s: %s."
-msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐ %s: %s."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:194
-#, c-format
-msgid "Bogofilter child process does not respond, killing..."
-msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÑÑÐ, ÐÐÑÐÐ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:196
-#, c-format
-msgid "Wait for Bogofilter child process interrupted, terminating..."
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:219
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "ÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑÐÑÑ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:404
-msgid "Convert message text to _Unicode"
-msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ Ñ _ÐÐÐÐÐÐ"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-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 ÐÑÐÐÐÐÑÐ "
-"ÑÐÑÐ ÑÑ ÑÐÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐ."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÐÑÐÑ"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑÐÑÐ"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐÐÑÐÑÐ."
-
 #: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
-msgstr "ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ. ÐÐÑÐÐÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÑÐÐÑ."
+msgstr "ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐÑÐ ÑÑÐÐÐÐ. ÐÐÑÐÐÑ ÐÐÑÑÐÐÐ ÐÑÐÑÐÐÐÑ ÐÑÐÑÐÐÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
-msgstr "ÐÐÑÑ ÐÐÑÐÑÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÑ ÐÐÑÐÑÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
@@ -17019,12 +16776,12 @@ msgid ""
 "%d - %s"
 msgstr ""
 "ÐÐÑÐÐÑ ÑÐ ÐÐÐ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑ.\n"
-"%d - %s"
+"%d â %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:339
 #: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
-msgstr "ÐÐÑÑÐÐÐÐ ÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐ ÑÐÑÐÐÑÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÑÐÐÑÐ."
 
 #: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
@@ -17037,17 +16794,17 @@ msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ"
 #: ../plugins/caldav/caldav-browse-server.c:564
 #: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../plugins/caldav/caldav-browse-server.c:730
 #: ../plugins/caldav/caldav-browse-server.c:771
 #: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐÑ ÐÐÐÐÐÐÐÑÐ..."
+msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑÐ..."
 
 #: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ."
 
 #: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
@@ -17060,25 +16817,24 @@ msgid "Previous attempt failed with code %d"
 msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÑÑÐÑ ÐÐÑÐ ÑÑÐÐÐ, ÐÐÐ %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:908
-#, fuzzy, c-format
-#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#, c-format
 msgid "Enter password for user %s on server %s"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ <b>%s</b> ÐÐ ÑÐÑÐÐÑÑ <b>%s</b>"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ %s ÐÐ ÑÐÑÐÐÑÑ %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ soup ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑ ÐÐÐÐ ÐÐ ÐÐÑÐÑÑ â%sâ"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
-msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÐÐÑÐ ÑÐÑÑÐÐÐÐ..."
+msgstr "ÐÑÐÑÑÐÐÑÑÐÐ ÑÐÐÑÐÐÑ ÑÐÑÑÐÐÐÐ..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Server _handles meeting invitations"
-msgstr ""
+msgstr "ÐÐÑÐÐÑ _ÑÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÑÐÑÑÐÐÐÐ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
@@ -17089,16 +16845,14 @@ msgid "Supports"
 msgstr "ÐÐÐÑÑÐÐ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-#, fuzzy
-#| msgid "New email"
-msgid "User e-_mail:"
-msgstr "ÐÐÐÐ ÐÐÑÑÐÐ"
+#: ../plugins/caldav/caldav-source.c:255
+msgid "User e_mail:"
+msgstr "_Ð-ÐÐÑÑÐ ÐÐÑÐÑÐÐÐÐ:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ: %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
@@ -17107,45 +16861,46 @@ msgstr "ÐÐÑÐÑÐ ÑÐÑÐÐÑÐ â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
 #: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
-msgstr "ÐÑÐÐÐ ÐÐ CalDAV ÐÐÐÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/caldav/caldav-source.c:236
 #: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_ÐÐÑÐÑÐ :"
 
-#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/calendar-http/calendar-http.c:138
 #: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐÑ ÐÐÐÑ"
+msgid "Use _secure connection"
+msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ"
 
-#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/caldav/caldav-source.c:245
 #: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
 
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:260
 msgid "Brows_e server for a calendar"
 msgstr "ÐÐ_ÑÑÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/caldav/caldav-source.c:278
 #: ../plugins/calendar-file/calendar-file.c:195
 #: ../plugins/calendar-http/calendar-http.c:123
 #: ../plugins/calendar-weather/calendar-weather.c:403
 #: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Re_fresh:"
 msgstr "Ð_ÑÐÐÐÐ:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
-msgstr "ÐÐÐÐÑÐ ÐÐÐÑÑÐÑ ÐÐ CalDAV Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÐÑÑÐÑ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
-msgstr "ÐÐÐÑÑÐÐ ÐÐ CalDAV"
+msgstr "ÐÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐÐ"
 
 #: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
@@ -17165,7 +16920,7 @@ msgstr "ÐÑÐ ÐÑÐÐÑÐÑÑ"
 
 #: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
-msgstr "ÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 # Create the default Person calendar
 # Create the default Person task list
@@ -17176,27 +16931,23 @@ msgstr "ÐÐÑÐÐÐÐÑÐÐ"
 
 #: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
-msgstr "ÐÐÑÑÐÑÐ _ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐÐ _ÑÐÐÐ ÑÐÑÐÑÐ"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ"
-
 #: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
-msgstr "ÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
@@ -17275,28 +17026,20 @@ msgid "Weather Calendars"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/dbx-import/dbx-importer.c:282
-#, fuzzy
-#| msgid "Importing Outlook data"
 msgid "Importing Outlook Express data"
-msgstr "ÐÐÐÐÐÑÐ Outlook ÐÐÐÐÑÐÐÐ"
+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"
+msgstr "ÐÐÐÐÐ ÐÐÑÑÐÐ ÐÑÑÐÑÐ ÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#, fuzzy
-#| msgid "Outlook PST import"
 msgid "Outlook DBX import"
-msgstr "Outlook PST ÑÐÐÐ"
+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)"
+msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÑÑÐÑÐ ÐÐÑÐÑÐÑÐ 5/6 (.pst)"
 
 #: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
@@ -17304,7 +17047,7 @@ msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ _ÐÐÐÑÐÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑ"
 
 #: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
-msgstr "ÐÐÐÐ_ÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐÐ"
+msgstr "ÐÐÐ _ÐÐÐÑÑÐÐÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐÐ"
 
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
@@ -17341,8 +17084,6 @@ msgstr ""
 "ÐÐÐÐÐÐÑÐ, ÐÐÑÐÐ â=â Ð ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐ ÑÐ â;â"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
-#, fuzzy
-#| msgid "Security:"
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "ÐÐÐÑÑÐÐÑÑ:"
@@ -17351,46 +17092,34 @@ msgstr "ÐÐÐÑÑÐÐÑÑ:"
 # Create the default Person task list
 # orange
 #: ../plugins/email-custom-header/email-custom-header.c:320
-#, fuzzy
-#| msgid "Personal"
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "ÐÐÑÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:321
-#, fuzzy
-#| msgid "Unclassified"
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "ÐÐÑÐÐÐÑÑÑÐÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:322
-#, fuzzy
-#| msgid "Protected"
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ÐÐÑÑÐÑÐÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:323
-#, fuzzy
-#| msgid "Confidential"
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "ÐÐÐÐÑÑÐÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#, fuzzy
-#| msgid "Secret"
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "ÐÐÑÐÐ"
 
 #: ../plugins/email-custom-header/email-custom-header.c:325
-#, fuzzy
-#| msgid "Top secret"
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
-msgstr "ÐÑÑÐÐÐ ÑÐÑÐÐ"
+msgstr "ÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -17427,7 +17156,7 @@ msgstr "ÐÑÐÐÐÐÑÑÐ"
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
-msgstr "ÐÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -17440,12 +17169,12 @@ msgstr "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ Ð-ÐÐÑÑÐ"
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
 msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
-"ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÐ ÑÑÐÑÐÐÐÑ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑÑ ÑÐÑÑÐÑ Ñ ÑÐÑÑÐÐÑÐÑÑ ÐÐÑÑÐÐ"
+"ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐ ÑÑÐÑÐÐÐÑ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑÑ ÑÐÑÑÐÑ Ñ ÑÐÑÑÐÐÑÐÑÑ ÐÐÑÑÐÐ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
 #: ../plugins/external-editor/external-editor.c:131
 msgid "Automatically launch when a new mail is edited"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÐÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÐÑÐ ÐÑÐ ÑÑÐÑÐÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
@@ -17465,7 +17194,7 @@ msgid ""
 "For VI use \"gvim -f\""
 msgstr ""
 "ÐÐ ÐÐÐÐÑ ÐÐÑÐÑÑÐÑÐ âxemacsâ\n"
-"ÐÐ VI ÐÐÑÐÑÑÐÑÐ âgvim -fâ"
+"ÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ âgvim -fâ"
 
 #: ../plugins/external-editor/external-editor.c:399
 #: ../plugins/external-editor/external-editor.c:401
@@ -17482,7 +17211,7 @@ msgstr "ÐÐÑÐÑÑÐ ÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑ ÐÐ ÑÐÑÑÐÐÑÐÑÐ 
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÑ"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
@@ -17506,7 +17235,7 @@ msgid ""
 "closed as long as the editor is active."
 msgstr ""
 "ÐÐÐÑÐÐÑÑ ÑÐ ÑÐÐÑÐÐ ÑÑÐÑÐÐÐÑ. ÐÑÐÐÐÑ ÑÐÑÑÐÐÑÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐÑÐ "
-"ÐÐÐ ÑÐ ÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑ."
+"ÐÐÐ ÑÐ ÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -17518,7 +17247,7 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÐÑÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
@@ -17529,10 +17258,8 @@ msgstr ""
 "ÐÐÑÑÐÐÐÑÐ ÑÐÐÐÑ, ÐÐÐÑÐ ÑÐ ÐÐÑÑÐ ÐÐÑÐ ÐÐÑÐÑÐ."
 
 #: ../plugins/face/face.c:286
-#, fuzzy
-#| msgid "Select a File"
 msgid "Select a Face Picture"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÐÑ ÐÐÑÐ"
 
 #: ../plugins/face/face.c:296
 msgid "Image files"
@@ -17540,7 +17267,7 @@ msgstr "ÐÐÑÐÑÐÐÐ ÑÐÐÐÐ"
 
 #: ../plugins/face/face.c:352
 msgid "_Insert Face picture by default"
-msgstr "_ÐÐÐÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ"
+msgstr "_ÐÐÐÐÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐÑ ÐÐÐÑÐÐÑÐ"
 
 #: ../plugins/face/face.c:363
 msgid "Load new _Face picture"
@@ -17576,71 +17303,68 @@ msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐ .png. ÐÑÐÑÐÐ: {0}"
+msgstr ""
+"ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐ ÑÐÐÐÐ ÐÑÐÑÐÐÐÐÐ â.pngâ ÑÐÑÐÐÑÐ. ÐÑÐÑÐÐ: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:317
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server"
-msgstr "Ð_ÐÑÐÐÑ:"
+msgstr "ÐÐÑÐÐÑ"
 
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:447
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr ""
-"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ %s ÑÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ."
+"ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐÐÐ â%sâ ÑÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÑÑÐ ÐÑÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÑÐ."
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
-"ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ Google.\n"
+"ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÑÐÐ ÑÐÑÐÐÑÐ.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #: ../plugins/mail-to-task/mail-to-task.c:796
 #: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ."
 
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-source.c:667
 msgid "Cal_endar:"
 msgstr "ÐÐÐ_ÐÐÐÐÑ:"
 
-#: ../plugins/google-account-setup/google-source.c:698
-#, fuzzy
-#| msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "ÐÐÐÑÑÐ _ÐÐÑÑÑ"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
-msgstr "ÐÐÐÐÑÐ Google ÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
-msgstr "Google ÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
-msgstr "ÐÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÑÐÐÐÐ"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
 msgid "View image attachments directly in mail messages."
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ."
+msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÑÐÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐ Ñ ÐÐÑÑÐÐÐÐ."
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "ÐÑÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÑÐ"
 
-#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.c:341
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
-msgstr "IMAP ÐÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
@@ -17661,15 +17385,15 @@ msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐ IMAP ÐÐÐÐÐÐÑÐ. \n"
+"ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐ. \n"
 "ÐÑÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐ ÐÑÐÑÐÐÐÐÑÐ."
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
-"_ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐ - (ÐÐÑÐÑÐÐ) \n"
+"_ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÑÐ â (ÐÐÑÐÑÐÐ) \n"
 "ÐÐÑÐÑÑÐÑÐ ÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÐ ÑÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐÐ"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
@@ -17678,181 +17402,180 @@ msgstr "_ÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐÑÐ"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
 msgid "Fine-tune your IMAP accounts."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ IMAP ÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐ."
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
-msgstr "IMAP ÐÐÐÑÑÐÐÑÑÐ"
+msgstr "ÐÐÐÐ ÐÐÐÑÑÐÐÑÑÐ"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:490
-#, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s'"
+#, c-format
 msgid "Failed to load the calendar '%s' (%s)"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÐÐÐÐÐÐÑÐ â%sâ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:645
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ ÑÐ Ñ ÐÑÑÐ ÐÑÐÐÐ ÐÐÐ Ð ÐÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:654
+#: ../plugins/itip-formatter/itip-formatter.c:669
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ"
+msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐ ÐÐÐÐÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÑÑ â%sâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:775
 msgid "Unable to find any calendars"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:782
 msgid "Unable to find this meeting in any calendar"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÑÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:771
+#: ../plugins/itip-formatter/itip-formatter.c:786
 msgid "Unable to find this task in any task list"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐ Ñ ÑÐÐÐÐÐ ÑÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this memo in any memo list"
 msgstr "ÐÐÑÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÐÑÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
-#, fuzzy
-#| msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 msgid "Opening the calendar. Please wait..."
-msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÐ. ÐÐÑÐÐÐÑÑÐ..."
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ. ÐÐÐÐÐ ÑÐÑÐÐÐÑÑÐ..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 msgid "Searching for an existing version of this appointment"
-msgstr "ÐÑÐÑÑÐÐÐ ÑÐÐÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐ Ñ ÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1343
 msgid "Unable to parse item"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÑÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÑÐÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑ â%sâ.  %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÑ â%sâ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÑÐÑÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÑÐ ÑÐÐÐÑÐÑ"
+msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÐÐÑÑÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑÑ â%sâ ÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "ÐÑÐÐÐÐÐÐÑÐÑ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ %s "
+msgstr "ÐÑÐÐÐÐÐÐÑÐÑ ÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ â%sâ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1559
 msgid "Sent a cancelation notice to the delegate"
 msgstr "ÐÐÐÐÐÐÑÑ ÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÐÑÑÐÑÐ Ð ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1622
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÑÐÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÑÐÑÐ"
+msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÑÐÐ ÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/itip-formatter/itip-formatter.c:1701
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÑÐÑÐ ÑÑÐÑÐÐÐÐ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÑÐÐ ÑÑÐÑÐÐÐÐ. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Attendee status updated"
 msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÑÐ ÐÐÑÑÐÑÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1659
+#: ../plugins/itip-formatter/itip-formatter.c:1709
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "ÐÑÐÑÑÑ ÑÑÐÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑ ÑÑÐÐÐÐ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Meeting information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1684
+#: ../plugins/itip-formatter/itip-formatter.c:1734
 msgid "Task information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1687
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Memo information sent"
-msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐ ÐÐÑÐÐÑ"
+msgstr "ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐ ÑÐ ÐÐÑÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1746
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÑ, ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ, ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1699
+#: ../plugins/itip-formatter/itip-formatter.c:1749
 msgid "Unable to send task information, the task does not exist"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ, ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÑ, ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1702
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Unable to send memo information, the memo does not exist"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÐÑÐ ÐÐÐÐÑÐÐÐ Ð ÐÐÐÐÑÑÐ, ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐ, ÐÐÐÐÑÐÐ ÐÐ ÐÐÑÑÐÑÐ"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1767
+#: ../plugins/itip-formatter/itip-formatter.c:1817
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1772
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Save Calendar"
 msgstr "ÐÐÑÑÐÐÑ ÐÐÐÐÐÐÐÑ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1830
-#: ../plugins/itip-formatter/itip-formatter.c:1841
+#: ../plugins/itip-formatter/itip-formatter.c:1880
+#: ../plugins/itip-formatter/itip-formatter.c:1891
 msgid "The calendar attached is not valid"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1831
-#: ../plugins/itip-formatter/itip-formatter.c:1842
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "ÐÐÑÑÐÐ ÐÑÐÑÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÑÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ."
+msgstr ""
+"ÐÐÑÑÐÐ ÐÑÐÑÐÐÑÑÑÐ ÐÐ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ, ÐÐÐ ÑÐÑ ÐÐÐÐÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ "
+"ÐÐÐÐÐÐÐÐÑ."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1882
-#: ../plugins/itip-formatter/itip-formatter.c:1910
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1960
+#: ../plugins/itip-formatter/itip-formatter.c:2069
 msgid "The item in the calendar is not valid"
 msgstr "ÐÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÑÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1883
-#: ../plugins/itip-formatter/itip-formatter.c:1911
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1961
+#: ../plugins/itip-formatter/itip-formatter.c:2070
 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:1924
+#: ../plugins/itip-formatter/itip-formatter.c:1974
 msgid "The calendar attached contains multiple items"
 msgstr "ÐÐÐÐÐÐÐÑ Ñ ÐÑÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÐ ÑÑÐÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:1975
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17864,40 +17587,46 @@ 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.
-#: ../plugins/itip-formatter/itip-formatter.c:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2633
 msgctxt "cal-itip"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2649
 msgid "Tentatively Accepted"
 msgstr "ÐÑÐÑÐÐÑÐÐÐ Ñ ÑÐÐÐÑÐÐÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2767
 msgid "This meeting recurs"
-msgstr "ÐÐÐÑ ÑÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑ ÑÐÑÑÐÐÐÐ ÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2720
+#: ../plugins/itip-formatter/itip-formatter.c:2770
 msgid "This task recurs"
-msgstr "ÐÐÐÑ ÑÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÑ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2723
+#: ../plugins/itip-formatter/itip-formatter.c:2773
 msgid "This memo recurs"
-msgstr "ÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÑÐ ÐÐÐÐÐÑÐ"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2992
+#, fuzzy
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2962
+#: ../plugins/itip-formatter/itip-formatter.c:3017
 msgid "_Delete message after acting"
 msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÐ ÑÐÐÑÐ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2972
-#: ../plugins/itip-formatter/itip-formatter.c:3005
+#: ../plugins/itip-formatter/itip-formatter.c:3027
+#: ../plugins/itip-formatter/itip-formatter.c:3060
 msgid "Conflict Search"
-msgstr "ÐÐÐÐÐÐ ÐÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÑÐÐÐ"
+msgstr "ÐÑÐÑÑÐÐÐ ÐÑÐÐÐÐÐÐÑÐ"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2987
+#: ../plugins/itip-formatter/itip-formatter.c:3042
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐÑÐ Ñ ÑÐÑÑÐÐÑÐÐÐ"
 
@@ -17905,44 +17634,44 @@ msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÑ ÐÑÐÐÐÐÐÐÑÐ 
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
-msgstr "ÐÐÐÐÑ %H:%M"
+msgstr "ÐÐÐÐÑ Ñ %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
-msgstr "ÐÐÐÐÑ %H:%M:%S"
+msgstr "ÐÐÐÐÑ Ñ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "ÐÐÐÐÑ %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:224
 msgid "Tomorrow %H:%M"
-msgstr "ÐÑÑÑÐ %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:228
 msgid "Tomorrow %H:%M:%S"
-msgstr "ÐÑÑÑÐ %H:%M:%S"
+msgstr "ÐÑÑÑÐ Ñ %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "ÐÑÑÑÐ %l:%M %p"
+msgstr "ÐÑÑÑÐ Ñ %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "ÐÑÑÑÐ %l:%M %S %p"
+msgstr "ÐÑÑÑÐ Ñ %l:%M %S %p"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -18054,279 +17783,222 @@ msgstr "ÐÐÐÐÐÐÐÑÐ ÐÑÐÐÐ"
 #: ../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>"
+#, c-format
 msgid "Please respond on behalf of %s"
-msgstr "ÐÐÐÐÐÐÑÐÑÐ Ñ ÐÐÐ <b>%s</b>"
+msgstr "ÐÐÐÐÐÐÑÐÑÐ Ñ ÐÐÐ %s"
 
 #: ../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>"
+#, c-format
 msgid "Received on behalf of %s"
-msgstr "ÐÑÐÐÑÐÐÐ Ñ ÐÐÐ <b>%s</b>"
+msgstr "ÐÑÐÐÑÐÐÐ Ñ ÐÐÐ %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has published the following meeting information:"
+#, c-format
 msgid "%s through %s has published the following meeting information:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following meeting information:"
+#, c-format
 msgid "%s has published the following meeting information:"
-msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ:"
+msgstr "%s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:381
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has delegated the following meeting to you:"
+#, c-format
 msgid "%s has delegated the following meeting to you:"
-msgstr "<b>%s</b> ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s requests your presence at the following meeting:"
+#, c-format
 msgid "%s through %s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your presence at the following meeting:"
+#, c-format
 msgid "%s requests your presence at the following meeting:"
-msgstr "<b>%s</b> ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
+msgstr "%s ÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ ÐÐ ÑÐÐÐÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+#, c-format
 msgid "%s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑ:"
+msgstr "%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:"
+#, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
-msgstr ""
-"<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "meeting:"
+#, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#, c-format
 msgid "%s through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following meeting response:"
+#, c-format
 msgid "%s has sent back the following meeting response:"
-msgstr "<b>%s</b> ÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+#, c-format
 msgid "%s through %s has canceled the following meeting:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following meeting."
+#, c-format
 msgid "%s has canceled the following meeting."
-msgstr "<b>%s</b> ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../plugins/itip-formatter/itip-view.c:416
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#, c-format
 msgid "%s through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../plugins/itip-formatter/itip-view.c:418
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following meeting changes."
+#, c-format
 msgid "%s has proposed the following meeting changes."
-msgstr "<b>%s</b> ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../plugins/itip-formatter/itip-view.c:422
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#, c-format
 msgid "%s through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following meeting changes."
+#, c-format
 msgid "%s has declined the following meeting changes."
-msgstr "<b>%s</b> ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
+msgstr "%s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÐ."
 
 #: ../plugins/itip-formatter/itip-view.c:462
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following task:"
+#, c-format
 msgid "%s through %s has published the following task:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following task:"
+#, c-format
 msgid "%s has published the following task:"
-msgstr "<b>%s</b> ÐÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ:"
+msgstr "%s ÐÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:469
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#, c-format
 msgid "%s requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> ÐÐÑÑÐÐÐ ÐÐ %s ÐÑÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÐÑÑÐÐÐ ÐÐ %s ÐÑÐÑÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has assigned you a task:"
+#, c-format
 msgid "%s through %s has assigned you a task:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐ ÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐ ÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has assigned you a task:"
+#, c-format
 msgid "%s has assigned you a task:"
-msgstr "<b>%s</b> ÐÐÐ ÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÐÐ ÐÐÐÐÑÑÑÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#, c-format
 msgid "%s through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing task:"
+#, c-format
 msgid "%s wishes to add to an existing task:"
-msgstr "<b>%s</b ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÐ ÐÐÐÐÑÐÑ:"
+msgstr "%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:"
+#, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "assigned task:"
 msgstr ""
-"<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ "
-"ÐÐÐÐÑÐÐ:"
+"%s ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../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:"
+#, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
-msgstr ""
-"<b>%s</b> ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has sent back the following assigned task response:"
+#, c-format
 msgid "%s through %s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following assigned task response:"
+#, c-format
 msgid "%s has sent back the following assigned task response:"
-msgstr "<b>%s</b> ÑÐÑÐ ÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÑÐÑÐ ÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#, c-format
 msgid "%s through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following assigned task:"
+#, c-format
 msgid "%s has canceled the following assigned task:"
-msgstr "<b>%s</b> ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:504
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+#, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:506
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+#, c-format
 msgid "%s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐÐÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:510
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+#, c-format
 msgid "%s through %s has declined the following assigned task:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:512
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following assigned task:"
+#, c-format
 msgid "%s has declined the following assigned task:"
-msgstr "<b>%s</b> ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
+msgstr "%s ÐÐÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following memo:"
+#, c-format
 msgid "%s through %s has published the following memo:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:551
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following memo:"
+#, c-format
 msgid "%s has published the following memo:"
-msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ:"
+msgstr "%s ÐÐÑÐÐÑÑÑÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:556
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#, c-format
 msgid "%s through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÑ ÐÐÐÐÑÑÐ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÑ ÐÐÐÐÑÑÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:558
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing memo:"
+#, c-format
 msgid "%s wishes to add to an existing memo:"
-msgstr "<b>%s</b> ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÑ ÐÐÐÐÑÑÐ:"
+msgstr "%s ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÑÐÑÐÑ ÐÐÐÐÑÑÐ:"
 
 #: ../plugins/itip-formatter/itip-view.c:562
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#, c-format
 msgid "%s through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ:"
+msgstr "%s ÐÑÐÐÐ %s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÑ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:564
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following shared memo:"
+#, c-format
 msgid "%s has canceled the following shared memo:"
-msgstr "<b>%s</b> ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ:"
+msgstr "%s ÐÑÐÐÐÑÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐÐÐÑÐÑ:"
 
 #: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
@@ -18355,7 +18027,7 @@ msgstr "ÐÑÐÐÐ ÐÐÐÑÑÐÑÐÐ:"
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
-msgstr "_ÐÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
+msgstr "Ð_ÑÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:854
@@ -18370,10 +18042,8 @@ msgstr "_ÐÐÐÐÑ"
 #: ../plugins/itip-formatter/itip-view.c:863
 #: ../plugins/itip-formatter/itip-view.c:879
 #: ../plugins/itip-formatter/itip-view.c:884
-#, fuzzy
-#| msgid "Accept"
 msgid "A_ccept"
-msgstr "ÐÑÐÑÐÐÑÐ"
+msgstr "_ÐÑÐÑÐÐÑÐ"
 
 #: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
@@ -18391,8 +18061,6 @@ msgid "_Tentative"
 msgstr "ÐÐ _ÑÐÐÐÑÐÐÐ"
 
 #: ../plugins/itip-formatter/itip-view.c:856
-#, fuzzy
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "Ð_ÑÐÑÐÐÑÐ ÑÐÐ"
 
@@ -18451,21 +18119,15 @@ msgstr "_ÐÐÐÐÑÐÐ:"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "ÐÑÐÐÐÐÑÑÐ MIME ÐÐÐÐÐÐ âtext/calendarâ Ñ ÐÐÑÑÐÐÐÐ."
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐ âtext/calendarâ Ñ ÐÐÑÑÐÐÐÐ."
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
-msgstr "Itip ÑÐÑÐÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÐ ÑÐÑÐÐÑÐÑÐÑÐ"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, 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; ?"
+msgstr "â{0}â ÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ â{1}â?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
@@ -18478,78 +18140,62 @@ msgstr "ÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÐ ÐÑÐÑÑÑÐÐ ÑÑÐÑ
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "ÐÐÐÑÐ ÐÐÐ ÐÑÑÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ."
+msgstr "ÐÐÑÑÐ ÐÐÐ ÐÑÑÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "ÐÐÑÑÑÑÑÐ ÐÐÑÑÐÐ D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "ÐÐÑÑÑÑÑÐ ÐÐÐÐÑ Ñ ÐÐÐÐÐÑÑÐÑÐÑ ÐÐÐÑ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "Generates a D-Bus message when new mail messages arrive."
-msgstr "ÐÑÐÐÑÐ D-BUS ÐÐÑÑÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 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:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "ÐÐÐÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
 "ÐÑÑÑÐ ÐÐÑÐ ÑÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÑÑÐÐÐ ÐÐÐÐÐÑÑÐÑÐ "
 "ÑÐÑÐÐÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "ÐÑÐÐÑÑÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÐ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr ""
 "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ ÐÐ ÐÐÐÑ ÐÐÑÑÑ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr ""
 "ÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ, ÑÐÐÐÐÐÐ ÐÐÑÐ ÑÐÑÑÑÐÐÐ "
 "ÐÐÐÐÐÑÑÐÑÐ ÑÐÑÐÐÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐ ÑÐÐÐ"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÑÐ ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÑÑÐ Ð ÐÐÐÐÑ ÐÐÑÑÑÐ ÑÐÐÐ ÐÐ ÐÐÐÐÑÑÐ."
 
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18572,12 +18218,12 @@ msgstr[3] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "ÐÐÑÐÐÐ: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18586,47 +18232,46 @@ msgstr[1] "ÐÑÐÐÐÐÐ ÑÑÐ %d ÐÐÐÐ ÐÐÑÑÐÐ."
 msgstr[2] "ÐÑÐÐÐÐÐ ÑÑÐ %d ÐÐÐÐÑ ÐÐÑÑÐÐ."
 msgstr[3] "ÐÑÐÐÐÐÐ ÑÑÐ ÐÐÐÑ ÐÐÑÑÐÑ."
 
-#: ../plugins/mail-notification/mail-notification.c:443
-#: ../plugins/mail-notification/mail-notification.c:451
-#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:509
-msgid "Show icon in _notification area"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ Ñ _ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
-
-#: ../plugins/mail-notification/mail-notification.c:539
-msgid "Popup _message together with the icon"
-msgstr "ÐÑÐÐÐÐÐ _ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "ÐÑÐÐÐÐÐ %s"
 
-#: ../plugins/mail-notification/mail-notification.c:726
-msgid "_Play sound when new messages arrive"
-msgstr "_ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+#: ../plugins/mail-notification/mail-notification.c:670
+msgid "_Play sound when a new message arrives"
+msgstr "_ÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:700
 msgid "_Beep"
-msgstr "_ÐÐÐÑÐÐ"
+msgstr "_ÐÐÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:769
+#: ../plugins/mail-notification/mail-notification.c:713
 msgid "Use sound _theme"
 msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐ _ÑÐÐÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Play _file:"
 msgstr "ÐÑÑÑÐ _ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ:"
 
-#: ../plugins/mail-notification/mail-notification.c:799
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "Select sound file"
-msgstr "ÐÐÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../plugins/mail-notification/mail-notification.c:857
+#: ../plugins/mail-notification/mail-notification.c:798
 msgid "Notify new messages for _Inbox only"
 msgstr "ÐÐÐÐÐÑÑÐ Ð ÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐÐ ÐÐ _ÐÐÐÐÑÑÐ"
 
-#: ../plugins/mail-notification/mail-notification.c:866
-msgid "Generate a _D-Bus message"
-msgstr "ÐÑÐÐÑÐ _D-Bus ÐÐÑÑÐÑ"
+#: ../plugins/mail-notification/mail-notification.c:808
+msgid "Show _notification when a new message arrives"
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18634,7 +18279,7 @@ msgstr "ÐÐÐÐÐÑÑÐÑÐ Ð ÐÐÑÑÐ"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
-msgstr "ÐÐÐÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
+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:235
@@ -18673,6 +18318,8 @@ msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 msgstr ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:612
 #, c-format
@@ -18680,6 +18327,8 @@ msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 msgstr ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:615
 #, c-format
@@ -18687,12 +18336,12 @@ msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 msgstr ""
+"ÐÐÐÐÑÐÐÐ ÑÑÐ %d ÐÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ñ ÐÐÐÐÑÐÐ. ÐÐ ÐÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÑ "
+"ÐÐÐÐÑÐ?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:634
-#, fuzzy
-#| msgid "Do you wish to overwrite it?"
 msgid "Do you wish to continue converting remaining mails?"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑÐÑÐ?"
+msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÑÐÐ ÐÑÐÐÑÑÐÐÐÑ ÐÐÑÑÐ?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
@@ -18700,24 +18349,24 @@ msgstr "[ÐÐÐ ÑÐÐÐÑÐÐ]"
 
 #: ../plugins/mail-to-task/mail-to-task.c:721
 msgid "Invalid object returned from a server"
-msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:771
 #, c-format
 msgid "An error occurred during processing: %s"
-msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÐÐ: %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐÑ. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:803
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
 msgstr ""
-"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ. "
+"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
 #: ../plugins/mail-to-task/mail-to-task.c:806
@@ -18725,7 +18374,7 @@ msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr ""
-"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ. "
+"ÐÐÐÐÑÐÐÐ ÐÐÐÐÑ ÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÑÐ, ÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐ. "
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐÐÐÑ."
 
 #: ../plugins/mail-to-task/mail-to-task.c:809
@@ -18733,20 +18382,18 @@ 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:1045
 #, c-format
 msgid "Cannot get source list. %s"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐ. %s"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐÑÐ. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1104
-#, fuzzy
-#| msgid "No description available."
 msgid "No writable calendar is available."
-msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÑÐ."
+msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐÐÑÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
@@ -18754,7 +18401,7 @@ msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÑ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1198
 msgid "Create a new event from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
@@ -18762,7 +18409,7 @@ msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐ_Ñ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1205
 msgid "Create a new memo from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
@@ -18770,7 +18417,7 @@ msgstr "ÐÐÐÑÐÐÐ _ÐÐÐÐÑÐÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1212
 msgid "Create a new task from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
@@ -18778,7 +18425,7 @@ msgstr "ÐÐÐÑÐÐÐ _ÑÐÑÑÐÐÐÐ"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
@@ -18790,7 +18437,7 @@ msgstr "ÐÑÐÐÐÐÐ _ÐÑÑÐÐÑ ÐÐÑÑÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÑÑÐÐÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
@@ -18798,7 +18445,7 @@ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð _ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÑÐÑÑÐÑÑ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
@@ -18814,7 +18461,7 @@ msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÑÑÑ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
@@ -18822,15 +18469,15 @@ msgstr "ÐÑÐ_ÑÐÐÐ ÑÐ ÐÐ ÐÐÑÑÑ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÑÐÐÐÑÐ ÑÐ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
-msgstr "Ð_ÐÑÐÐÐ ÑÐ ÐÐÑÑÐ"
+msgstr "Ð_ÐÑÐÐÐ ÑÐ ÑÐ ÐÐÑÑÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "ÐÐÑÐÐÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÑÐ ÐÐÑÐÑ ÐÐÐ ÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
@@ -18883,7 +18530,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ?"
+msgstr "ÐÐ ÐÐÑÐÑÐÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÑÐÑ ÐÐ ÐÐÐÐÑÐÑ ÐÐÑÑÑ?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -18892,7 +18539,7 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"ÐÐÐÑÑ ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÑÐ. ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ ÑÐÐÑÑ ÐÐÑÐ ÑÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ "
+"ÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÑÑÐÐÐ. ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ ÑÐÐÑÑ ÐÐÑÐ ÑÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ "
 "ÑÐÐÑÑ.\n"
 "\n"
 "ÐÐÐÐÐÐÑÐ: {0}"
@@ -18923,7 +18570,7 @@ msgstr "_ÐÐÑÐÑÐ ÐÐÑÑÐÑ"
 
 #: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÑÐ Ð ÐÐÑÑÐÐ Ñ ÐÐÐÑÐÑÑÐÐÐÐÐÐ?"
+msgstr "ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÐÑÐ Ð ÐÐÑÑÐÐ Ñ ÐÐÐÑÐÑÑÐÐÐÐÐÐ?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
@@ -18942,7 +18589,7 @@ msgstr "Ð ÑÑÐÐÑÑÐÐÑ ÑÐÑÑÐÐÐÐ Ð _ÐÐÐÑÐÑÑÐÐÐÐÐÐ"
 msgid "In Current _Folder Only"
 msgstr "ÐÐÐÐ Ñ ÑÑÐÐÑÑÐÐÑ _ÑÐÑÑÐÐÐÐ"
 
-#: ../plugins/mark-all-read/mark-all-read.c:565
+#: ../plugins/mark-all-read/mark-all-read.c:573
 msgid "Mark Me_ssages as Read"
 msgstr "ÐÐÐÐÑÐ ÐÐ_ÑÑÐÐ ÐÐÐ ÐÑÐÑÐÑÐÐÐ"
 
@@ -18965,15 +18612,15 @@ msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐ ÑÐÐÑÑÑ"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
 msgid "View mail messages as plain text, even if they contain HTML content."
-msgstr "ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÑÐÐ ÑÐÐÑÑ, ÑÐÐ Ð ÐÐÐ ÑÐÐÑÐÐ HTML."
+msgstr "ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐ ÐÐÐ ÐÐÐÑÐÐ ÑÐÐÑÑ, ÑÐÐ Ð ÐÐÐ ÑÐÐÑÐÐ ÐÐÐÐ."
 
 #: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Show HTML if present"
-msgstr "ÐÑÐÐÐÐÐ HTML ÐÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐÐ ÐÐÑÑÐÑÐ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
-msgstr "ÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
+msgstr "ÐÑÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
 #: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
@@ -18984,8 +18631,8 @@ msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr ""
-"ÐÑÐÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐ, ÐÐÐ ÐÐÑÑÐÑÐ, ÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐ "
-"ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
+"ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐ ÐÐÐÑÐÐÐ ÑÐÐÑÑÐÐ, ÐÐÐ ÐÐÑÑÐÑÐ, ÐÐÐÑÐ ÐÑÑÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ "
+"ÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐ ÐÑÐÐÐÐ."
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
@@ -19001,55 +18648,51 @@ msgstr ""
 
 #: ../plugins/prefer-plain/prefer-plain.c:290
 msgid "Show s_uppressed HTML parts as attachments"
-msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÑÐÑÐÑÑÐ HTML ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐ ÐÐ_ÑÐÑÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../plugins/prefer-plain/prefer-plain.c:310
 msgid "HTML _Mode"
-msgstr "HTML _ÑÐÐÐÐ"
+msgstr "ÐÐÐÐ _ÑÐÐÐÐ"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
-msgstr "ÐÐÐÐÐ Outlook ÐÐÑÑÐÐ ÐÐ ÐÐÑÐÑÐÐÐ PST"
+msgstr "ÐÐÐÐÐ ÐÑÑÐÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
-msgstr "Outlook PST ÑÐÐÐ"
+msgstr "ÐÑÑÐÑÐ ÐÐÐ ÑÐÐÐ"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Outlook personal folders (.pst)"
-msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ Outlook (.pst)"
+msgstr "ÐÐÑÐÐ ÑÐÑÑÐÐÐÐ ÐÑÑÐÑÐÐ (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "_ÐÐÑÑÐ"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "ÐÐÑÐÐÐÑÐÐ ÑÐÑÑÐÐÐÐ:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "_ÐÐÑÐÑÐÑ"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "ÐÐ_ÐÐÐÐÐÐ"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_ÐÐÐÐÑÐ"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
-msgstr "ÐÐÐÑÐ Ñ _ÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐ _ÐÐÐÐÐÐÐÐ"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
-msgstr "ÐÐÐÐÐÑÐ Outlook ÐÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐ ÐÑÑÐÑÐ ÐÐÐÐÑÐÐ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
@@ -19064,33 +18707,33 @@ msgstr "ÐÐÑÑÐ"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
-msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ."
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐ."
 
 #: ../plugins/publish-calendar/publish-calendar.c:212
 #: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ %s:"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ %s: ÐÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ %s:"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s ÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐÐÐÑÐ ÐÐ %s ÑÐ ÑÑÐÐÑÐÐ ÐÐÐÑÑÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐ %s:"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐ %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -19106,7 +18749,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÑÐÑ
 #. ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐ ÑÐÑÐÑÐÐÑ."
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÑÐÑÐÑÐÐÑ."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
@@ -19122,7 +18765,7 @@ msgstr "ÐÐÐÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:5
 msgid "FTP (with login)"
-msgstr "FTP (ÑÐ ÐÑÐÑÐÐÐÐ)"
+msgstr "ÐÐÐ (ÑÐ ÐÑÐÑÐÐÐÐ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:9
 msgid "Manual (via Actions menu)"
@@ -19134,7 +18777,7 @@ msgstr "_ÐÐÑÑ:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:12
 msgid "Public FTP"
-msgstr "ÐÐÐÐÐ FTP"
+msgstr "ÐÐÐÐÐ ÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
@@ -19146,11 +18789,11 @@ msgstr "ÐÑÐÑÑÐ_ÐÐÑÑ ÐÐÑÐÐÑÐÐÐÑÐ"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:15
 msgid "Secure FTP (SSH)"
-msgstr "ÐÐÐÑÑÐÐ FTP (SSH)"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐ (ÐÐÐ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
-msgstr "ÐÐÐÑÑÐÐ WebDAV (HTTPS)"
+msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÐÐ (ÐÐÐÐÐ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
@@ -19166,7 +18809,7 @@ msgstr "ÐÑÐÐÐ _ÑÑÐÑÐÑÐ:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
+msgstr "ÐÐÐÐÐÐ (ÐÐÐÐ)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Weekly"
@@ -19198,13 +18841,13 @@ msgstr "_ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "iCal"
-msgstr "iCal"
+msgstr "ÐÐÐÐ"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:88
 #: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑ: ÐÐÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐ"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
@@ -19214,62 +18857,6 @@ msgstr "ÐÐÐÐ ÐÐÐÐÑÐÑÐ"
 msgid "Edit Location"
 msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐÑÑ"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ, ÐÐÐ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÐ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "ÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, c-format
-msgid "SpamAssassin child process does not respond, killing..."
-msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ, ÑÐÐÑÐÐ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
-#, c-format
-msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:252
-#, c-format
-msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr "ÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:519
-#, c-format
-msgid "SpamAssassin is not available. Please install it first."
-msgstr "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ."
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
-msgid "This will make SpamAssassin more reliable, but slower"
-msgstr "ÐÐÐ ÑÐ ÑÑÐÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐÐ ÐÐÑÐÐÐÐÐÑÐÐ, ÐÐÐ ÑÐÐÑÐÑÐÐ"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:944
-msgid "I_nclude remote tests"
-msgstr "Ð_ÐÑÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐ ÑÐÐÐÐ."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
-
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
@@ -19277,81 +18864,81 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "ÐÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "ÐÐÐÑÐÐ ÐÐÐÐÐÑÐÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "ÐÐÐÑÐÐÑ ÐÐÑÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "ÐÐÑÐÑÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "ÐÑÐÑ"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "ÐÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "ÐÐÑÑÐÑÐÐ ÐÐÐÑÑÐÐÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "ÐÐÐÑÐÐ ÑÑÐÑÐÐÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
-msgstr "ÐÐ_ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÑÐÑÐÐÑ CSV"
+msgstr "ÐÐ_ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐ ÑÐÑÐÐÑ"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "ÐÑÐÐ ÑÐÑÑÑÐ _ÐÐÐÐÐÐÑÐ"
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "ÐÑÐÐÐÑÐÐÐ _ÐÑÐÐÐÐÑÑÐ:"
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "ÐÑÐÐÐÑÐÐÐ _ÐÐÐÐÑÐ:"
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "_ÐÐÐÐÐÑ ÐÑÐÐÐÐÑÑÐ ÑÐ:"
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
-msgstr "ÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÑÐ (.csv)"
+#: ../plugins/save-calendar/csv-format.c:627
+msgid "Comma separated values (.csv)"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÐÐ (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "ÐÐÐÐÐÐÐÐÑ (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19371,8 +18958,8 @@ msgid "%FT%T"
 msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
-msgstr "RDF ÐÐÐÐÐ (.rdf)"
+msgid "RDF (.rdf)"
+msgstr "ÐÐÐ (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
@@ -19408,6 +18995,9 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
+"ÐÑÐÐÑÑÑÐÐ ÐÐ ÐÐÑÐÐÐÑ ÐÐÑÑÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ ÐÑÐÐÐÐÑÐÐÐ ÐÐÐ ÑÑÐ ÑÑ $ORIG"
+"[ÑÐÐÐ], $ORIG[ÑÐÑÐ], $ORIG[ÐÑÐÐÐ] or $ORIG[ÐÐÑÑÐÐ], ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ "
+"ÐÑÐÐÐÐÑÑÐÐÐ ÐÐ Ð-ÐÐÑÑÐ ÐÐ ÐÐÑÑ ÐÐÐÐÐÐÑÐÑÐ."
 
 #: ../plugins/templates/templates.c:1066
 msgid "No Title"
@@ -19423,57 +19013,57 @@ msgstr "ÐÑÐÐ ÐÐÐ ÑÐÐÐÐÐ"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ TNEF (winmail.dat) ÐÐ ÐÑÐÐÑÐÐÐ Microsoft Outlook."
+msgstr "ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐ (winmail.dat) ÐÐ ÐÐÑÐÑÐÑÐÑÑ ÐÑÑÐÑÐÐ."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
-msgstr "ÐÐÐÐÐÐÑ TNEF"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐ"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
-msgstr "ÐÐÐÑÑÐ Ñ ÐÐÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐ"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
 msgid "Show vCards directly in mail messages."
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÑÑÐ ÐÐÐÐÑÑÐÐÐÐ Ñ ÐÐÑÑÐÐÐÐ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../plugins/vcard-inline/vcard-inline.c:206
+#: ../plugins/vcard-inline/vcard-inline.c:291
 msgid "Show Full vCard"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑ ÐÐÐÑÑÑ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:203
+#: ../plugins/vcard-inline/vcard-inline.c:209
 msgid "Show Compact vCard"
 msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÑÑ ÐÐÐÑÑÑ"
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:270
 msgid "There is one other contact."
 msgstr "ÐÐÑÑÐÑÐ ÑÐÑ ÑÐÐÐÐ ÐÐÐÑÐÐÑ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../plugins/vcard-inline/vcard-inline.c:279
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "ÐÐÑÑÐÑÐ ÑÐÑ %d ÐÐÐÑÐÐÑ."
-msgstr[1] "ÐÐÑÑÐÑÐ ÑÐÑ %d ÐÐÐÑÐÐÑÐ."
+msgstr[1] "ÐÐÑÑÐÑÐ ÑÐÑ %d ÐÐÐÑÐÐÑÐ."
 msgstr[2] "ÐÐÑÑÐÑÐ ÑÐÑ %d ÐÐÐÑÐÐÑÐ."
 msgstr[3] "ÐÐÑÑÐÑÐ ÑÐÑ %d ÐÐÐÑÐÐÑ."
 
-#: ../plugins/vcard-inline/vcard-inline.c:294
+#: ../plugins/vcard-inline/vcard-inline.c:300
 msgid "Save in Address Book"
 msgstr "ÐÐÑÑÐÐÑ Ñ ÐÐÑÐÑÐÑ"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "Add WebDAV contacts to Evolution."
-msgstr "ÐÐÐÐÑÐ WebDAV ÐÐÐÑÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÐÐÐÑÑÐÑÑ."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
-msgstr "WebDAV ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr "ÐÐÐÐÐÐ"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
@@ -19481,7 +19071,7 @@ msgstr "ÐÐÑÐÑÐ :"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_ÐÐÐÐÐÐÐÐÑ IfMatch (ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑÑ < 2.2.8)"
+msgstr "_ÐÐÐÐÐÐÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐ (ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑÑ < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
@@ -19497,7 +19087,7 @@ msgstr "ÐÐÑÐÐÑÐ ÐÐÐÐÑÐÐÐÑÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÑÐÐ ÑÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÑÐÐ ÐÐÐÑÑÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
@@ -19527,7 +19117,7 @@ msgstr "ÐÐÑÑÑÐ ÐÐÑÐÑÐÑÐÐ ÑÐÐÐÐ"
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
-"ÐÐÐÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐ ÐÑÐÑÑÑÐÐ HTTP/ÑÐÐÑÑÐÐ HTTP ÐÑÐÐÐ "
+"ÐÐÐÐÑÑÑÑÐ ÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÐÐ ÐÑÐÑÑÑÐÐ ÐÐÐÐ/ÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐ "
 "ÐÐÑÐÑÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -19536,19 +19126,19 @@ msgstr "ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ ÑÐÐÐÐÑÑÐÐÐÐÑÐ ÐÐ
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
-msgstr "ÐÐÑÑ ÐÐ HTTP"
+msgstr "ÐÐÑÑ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -19561,10 +19151,10 @@ msgid ""
 "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."
+"ÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ, ÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ. "
+"ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÑÐ ÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÑÑÑÐ â/apps/evolution/shell/network_config/"
+"authentication_userâ, Ð ÐÐÐÐÐÐÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐ "
+"ÐÐÐÐÐÐÐ â~/.gnome2_private/Evolutionâ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19576,15 +19166,15 @@ msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÐ GtkFileChooser."
+msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ."
 
 #: ../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â ÑÐ "
-"ÐÑÐÐÐÐÐ Ñ ÑÐÐÑÐÐÐÐÐÐ."
+"ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐÐÐÐ: 0 â ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐ, 1 â ÐÑÐÐÐÐÐ "
+"ÑÐÐÑÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
@@ -19601,27 +19191,27 @@ msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP."
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ SOCKS"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
-msgstr "ÐÐÑÑ ÐÐÑÑÐÐÐÐÐÐ ÐÐ SOCKS"
+msgstr "ÐÐÑÑ ÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
-msgstr "ÐÐÑÑ ÑÐÐÑÑÐÐÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÑÑ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
@@ -19630,21 +19220,21 @@ msgid ""
 "configuration\" and \"use proxy configuration provided in the autoconfig url"
 "\" respectively."
 msgstr ""
-"ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ. ÐÐÐÑÐÐÐÐ ÑÑ ÐÑÐÐÐÐÑÑÐ 0 âÐÐÑÐÑÑÐ "
-"ÑÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐâ, 1 âÐÐÐ ÐÐÑÑÐÐÐÐÐÐâ, 2 âÐÐÑÐÑÑÐ ÑÑÑÐÐ ÐÐÐÐÑÐÐÐÑÐ "
-"ÐÐÑÑÐÐÐÐÐÐâ Ð 3 âÐÐÑÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐâ."
+"ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ. ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÐÑÑÐ ÑÑ: 0 â ÐÐÑÐÑÑÐ "
+"ÑÐÑÑÐÐÑÐÐ ÐÐÑÑÐÐÐÐ, 1 â ÐÐÐ ÐÐÑÑÐÐÐÐÐÐ, 2 â ÐÐÑÐÑÑÐ ÑÑÑÐÐ ÐÐÐÐÑÐÐÐÑÐ "
+"ÐÐÑÑÐÐÐÐÐÐ Ð 3 â ÐÐÑÐÑÑÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Sidebar is visible"
-msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÑÐ ÐÐÐÑÐÐÐ"
+msgstr "ÐÐÑÐÐ ÐÐÐÑÑ ÑÐ ÐÐÐÑÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
-msgstr "ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÑÑÐ ÑÐ ÑÐÐÐÐÑÐÑÐÐ Ð ÑÐÐÐÐÑÑ"
+msgstr "ÐÑÐÑÐÐÐÐÑÐ ÐÑÐÐÐÑÑÐÑÐ ÑÐ ÑÐÐÐÐÑÐÑÐÐ Ð ÑÐÐÐÐÑÑ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
-msgstr "ÐÐÑÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
@@ -19668,15 +19258,15 @@ msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ Y ÐÐÐÑÐÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÑÐ
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ, Ñ ÐÐÐÑÐÐÐÐÐ."
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÑ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÑÐÐ ÑÑÐÐÐ, Ñ ÐÐÐÑÐÐÐÐÐ."
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÐÑÐÐ ÑÑÐÐÐ, Ñ ÑÐÑÐÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
@@ -19688,15 +19278,15 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ ÐÑÐÐ HTTP ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐÐ HTTP ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
-msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÐÑÑÑÐÑÐ socks ÐÐÑÑÐÐÐÐÐÐ."
+msgstr "ÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐ ÑÐÑÐÑ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
@@ -19704,7 +19294,7 @@ msgid ""
 "http_host\" that you proxy through."
 msgstr ""
 "ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐ Ñ â/apps/evolution/shell/network_config/http_hostâ "
-"ÐÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÑÑÑÐ."
+"ÐÑÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÑÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
@@ -19712,7 +19302,7 @@ msgid ""
 "secure_host\" that you proxy through."
 msgstr ""
 "ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐ Ñ â/apps/evolution/shell/network_config/secure_hostâ "
-"ÐÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÑÑÑÐ."
+"ÐÑÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÑÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
@@ -19720,7 +19310,7 @@ msgid ""
 "socks_host\" that you proxy through."
 msgstr ""
 "ÐÐÑÑ ÐÐ ÐÐÑÐÐÐ ÐÐÑÐÑÐÐ Ñ â/apps/evolution/shell/network_config/socks_hostâ "
-"ÐÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÑÑÑÐ."
+"ÐÑÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÑÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
@@ -19739,9 +19329,9 @@ msgid ""
 "(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) Ð "
+"(ÑÐÐÑÑÐÐÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑ *.foo.com), ÐÐ ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ (ÐÐÐ4 Ð ÐÐÐ6) Ð "
 "ÐÑÐÐÐÐ ÐÐÑÐÑÐ ÑÐ ÐÐÑÐÐÐ (ÐÐÑÑÐ ÐÐÐ 192.168.0.0/24)."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:52
@@ -19754,11 +19344,11 @@ msgstr "ÐÐÑÐÑÐ ÑÐ ÐÑÐÐÐÐÑÑÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÐ
 
 #: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
-msgstr "ÐÐÑÐÑÑÐ ÐÐÑÑÐÐÐÐÐÐ ÐÐ HTTP"
+msgstr "ÐÐÑÐÑÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ HTTP."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÑÐÐÑÐÑÐÐÐÑÐÑÑ ÐÑÐÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÐÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19766,30 +19356,30 @@ msgstr "ÐÐ ÐÐ ÑÐ ÑÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐÑÐÐÑÑÐ Ñ ÑÐÐÐÐ
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÑ ÐÑÐÐ ÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÑ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐ ÐÑÐÑÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÐ ÑÑÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐÐ ÐÐÐÑÑ ÐÐÑÐ ÐÐÐÑÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
-msgstr "ÐÐ ÐÐ ÐÐ ÑÑÐÐÐ ÑÑÐÑÑÑÐ ÐÑÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÑÑÐÐÐ ÑÑÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
-msgstr "ÐÐ ÐÐ ÐÐ ÑÑÐÐÐ ÐÐÐÑÐ ÐÑÐÐ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÑÑÐÐÐ ÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:61
 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."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÑÐÑ ÐÐÐÑÐÐÐ."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÐÐÐ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
@@ -19799,11 +19389,11 @@ msgstr "ÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 msgid "Window buttons are visible"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÑ ÐÐÐÑÐÐÐ"
 
-#: ../shell/e-shell-content.c:699 ../shell/e-shell-content.c:700
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-content.c:742
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐÑÑÐÐÑ"
 
@@ -19831,22 +19421,18 @@ msgstr " _Ñ "
 msgid "vCard (.vcf)"
 msgstr "ÐÐÐÑÑÐ (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "ÐÐÐÐÐÐÐÐÑ (.ics)"
-
 #: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ (*)"
 
 #: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
-msgstr ""
+msgstr "ÐÑÐÐÐ ÑÑÐÑÐ ÐÐÑÐÑÐÐÑÐÐÐ ÑÑÑÐÑÐ"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "ÐÐÐÑ ÐÐÑÑÐÑÐÐÐÑ <igor prevod org>\n"
@@ -19854,291 +19440,278 @@ msgstr ""
 "\n"
 "http://prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:921
-#, fuzzy
-#| msgid "Categories List"
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
-msgstr "ÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐÐÑ ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ."
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐÑÑ."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_ÐÐÐÑÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐÑÑÑÑÐÐ"
-
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "ÐÑÐÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÑ ÑÐ ÑÐÑÑÐ ÐÐÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "ÐÐÐÐÑÐÐÐ _ÐÐÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "_ÐÐÐÐÐ..."
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÐ ÐÑÑÐÐÑ ÐÑÐÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "ÐÐÐ Ð_ÑÐÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
-msgstr "ÐÑÐÐÑÐ ÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1528
-#, fuzzy
-#| msgid "Available Fields"
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
-msgstr "ÐÐÑÑÑÐÐÐ ÐÐÑÐ"
+msgstr "ÐÐÑÑÑÐÐÐ _ÐÐÑÐÐÐÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
-msgstr ""
+msgstr "ÐÐÑÐÐÑÐÑÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÐÐÐÑÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
-msgstr "_ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ"
+msgstr "_ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÑÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÑÐÑÐ ÑÐÑÑÐÑÑÑÐ ÐÐÐÐÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
-msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "_ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÐÐÐ..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
-msgstr "ÐÐÑÐÐÑÑ ÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÑÐÐÑ"
+msgstr "ÐÐÑÐÐÑÑÑÐ ÐÐÐÑÐÐÐÐÑÑ ÐÑÐÑÑÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
-msgstr "ÐÑÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_ÐÑÐÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐÑÑÐÐÐ..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
-msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÐÑÐÑÑÐ ÐÐÑÐÐ ÑÐÑÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÑÑÑÑ ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "ÐÑÐ_ÐÐÑÐ ÑÐÐÐ"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
-msgstr "ÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_ÐÐÑÑÐÐÑ ÐÑÐÑÑÐÐÑ..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
-msgstr "ÐÐÑÑÐÐÑ ÑÑÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÐÐÑÐÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð _ÐÑÐÑÑÐ..."
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑ Ð ÐÑÐÑÑÐ ÐÑÐÐÐÐÐÑÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "ÐÐ_Ð ÐÐÐ ÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐÐ ÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_ÐÐÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐ ÐÑÐÐÐ"
+msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÑ Ñ ÑÐÐ ÐÐ ÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_ÐÐÑÐÐÑÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_ÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_ÐÑÐÑÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "ÐÐÐÐÐÐ _ÐÑÐÐÐÑÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "ÐÑÐ_ÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑ _ÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐ _ÐÐÑÐÑ ÐÐÐÑÑ"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÑ ÑÑÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÑ ÐÐÐÑÑ"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÑÑÐÑÑÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ _ÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
-msgstr "ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
-msgstr "ÐÐÐÐ _ÐÐÐÐÐ"
+msgstr "ÐÐÐÐ _ÐÐÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÐÐÐÐÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "ÐÐÐÐ _ÑÐÐÑÑ"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐÐÐ ÑÐ ÑÐÐÑÑÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
-msgstr "ÐÐÐÐÐ _Ð ÑÐÐÑÑ"
+msgstr "ÐÐÐÐÐÑÐ _Ð ÑÐÐÑÑ"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ Ð ÑÐÐÑÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÑÐ ÐÐÐÐÐÑÐÐÐ Ð ÑÐÐÑÑÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "ÐÑÐÐ ÑÑÐ_ÐÐ ÐÐÐÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"ÐÑÐÐÐÐÑÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐÐ ÐÐÑÑÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÑÐÑÐ ÐÐÐÐÑÐÐÐÑÐ ÑÑÐÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÑÐ"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "ÐÐÑÐÐÐ ÐÑÐÐÐÐÐÐ..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
-msgstr "ÐÑÐÐÐ ÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "ÐÐÑÑÐÐÑ ÐÑÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ..."
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
-msgstr "ÐÑÐÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
+msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐÑÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "Ð_ÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
-msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÑÐÐ"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÑÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
-msgstr "ÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÑÑÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÑÑÐÐÐÑÐ ÐÐ ÑÑÐÐÑÑÐÐ ÑÑÐÐÐÐÑ"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "ÐÑÐÑÐ ÐÐ %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
-msgstr "ÐÐÐÑÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
+msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÑÐÑÑÐÐÐ"
 
 #. Translators: This is used for the main window title.
 #: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - ÐÐÐÐÑÑÐÑÐ"
+msgstr "%s â ÐÐÐÐÑÑÐÑÐ"
 
 #: ../shell/e-shell-window.c:442
 msgid "New"
@@ -20146,15 +19719,15 @@ msgstr "ÐÐÐÐ"
 
 #: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÑÐÐ ÐÐÐ ÐÑÐÐÐ..."
 
 #: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ..."
 
 #: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÐÑÐÑ..."
+msgstr "ÐÑÐÐÑÐÐÐÐ ÑÐ ÐÐ ÐÐÐÑÐÐ..."
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:195
@@ -20190,7 +19763,7 @@ msgstr ""
 "ÑÑ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ ÐÐÐ ÐÐÑÑ.\n"
 "\n"
 "ÐÐÐÐÐÐ ÑÐ ÐÐ ÑÐÑÐ ÑÐÐÐÐÑÐ Ñ ÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐ, Ð \n"
-"ÐÐÑÐÐ ÐÑÑÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÑ!\n"
+"ÐÐÑÐÐ ÐÑÑÐÐÑÑÐÐÐ ÐÐÑ ÐÐÐÑÐÐÐÑ!\n"
 
 #: ../shell/main.c:219
 msgid ""
@@ -20211,6 +19784,8 @@ msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
+"ÐÐÐÑÐÑÐ ÐÐÐÐÑÑÐÑÑ ÐÑÐÐÐÐÑÑÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ. ÐÐÑÑÑÐÐÐ ÐÐÑÐÑÐ ÑÑ: "
+"âmailâ, âcalendarâ, âcontactsâ, âtasksâ Ð âmemosâ"
 
 #: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
@@ -20222,7 +19797,7 @@ msgstr "ÐÐÑÐÐ ÑÐÐ ÐÐ ÐÑÐÐÐ"
 
 #: ../shell/main.c:318
 msgid "Ignore network availability"
-msgstr ""
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÑÑÐÐÐÑÑ ÐÑÐÐÐ"
 
 #: ../shell/main.c:320
 msgid "Start in \"express\" mode"
@@ -20238,11 +19813,11 @@ msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ Ð ÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÑ ÐÐÐÐÐÐ 
 
 #: ../shell/main.c:328
 msgid "Disable loading of any plugins."
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÑÐÑÑÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐÐÑ ÐÐÐÐÑÐÐÐ."
 
 #: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ, ÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ."
+msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐ, ÐÐÐÑÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ."
 
 #: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
@@ -20251,11 +19826,11 @@ msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑ ÐÐÐ ÐÑÑÐÑÐ
 # shell:noshell-reason title
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
-msgstr "ÐÐÑÑÐÐÐÑ ÐÑÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
+msgstr "ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐÐÑÑÐÐ ÐÑÐÑÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 #: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
-msgstr "- ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑ Ð-ÐÐÑÑÐ"
+msgstr "â ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÐÐÐ Ð ÐÐÐÑÐÐÑ Ð-ÐÐÑÑÐ"
 
 #: ../shell/main.c:582
 #, c-format
@@ -20263,7 +19838,7 @@ msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: --online Ð --offline ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
+"%s: â--onlineâ Ð â--offlineâ ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
 "  ÐÐÐÑÐÐÐÑÐ â%s --helpâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
 
 #: ../shell/main.c:588
@@ -20272,7 +19847,7 @@ msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: --force-online Ð --force-offline ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
+"%s: â--force-onlineâ Ð â--offlineâ ÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐ.\n"
 "  ÐÐÐÑÐÐÐÑÐ â%s --helpâ ÐÐ ÐÐÑÐ ÐÐÐÐÑÐÐÐ.\n"
 
 #: ../shell/shell.error.xml.h:1
@@ -20282,7 +19857,7 @@ msgstr "ÐÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÐÐÐÐ
 # shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
 msgid "Cannot upgrade directly from version {0}"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐÐÐÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐÑÐ {0}"
+msgstr "ÐÐ ÐÐÐÑ ÐÐÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐ ÑÐ ÐÐÐÐÑÐ {0}"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Continue Anyway"
@@ -20294,8 +19869,9 @@ msgid ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 msgstr ""
-"ÐÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐÑÐ {0}. ÐÐÐ ÑÐÑÐÑÐ ÐÐÐÐÑÐ ÐÐ "
-"ÐÐÐÑÑÐÑÐ ÐÐÐÐÐÑÐÐÑÑ Ñ ÐÐÐÐÑÑÐÑÑ 2, Ð ÑÐÐ ÐÐÐÐ Ñ ÐÐÐÐÑÑÐÑÑ 3."
+"ÐÐÐÐÑÑÐÑÐ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑ ÐÐÐÐÐÑÐÐÑÑ ÑÐ ÐÐÐÐÑÐ {0}. ÐÐÑÑÑÐÐ, ÐÐÐ "
+"ÑÐÑÐÑÐ ÐÐÐÐÑÐ ÐÑÐÐ ÐÐ ÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÑ 2, Ð ÐÐÑÐÐ ÐÐ "
+"ÐÐÐÐÑÑÐÑÑ 3."
 
 #: ../shell/shell.error.xml.h:5
 msgid ""
@@ -20307,11 +19883,11 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:7
 msgid "Quit Now"
-msgstr "ÐÐÐÑÑÑÐ ÐÐÐÐÑ"
+msgstr "ÐÐÐÑÐ"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
-msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐ:"
+msgstr "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐ:"
 
 #: ../shell/shell.error.xml.h:9
 msgid "_Forget"
@@ -20336,7 +19912,7 @@ msgstr "_ÐÑÐÐÐÐ ÑÑÐÐÐÐ"
 
 #: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÑ ÐÑÐÐÐÑ ÑÑÐÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÑ ÑÑÐÐÐÑ"
 
 #: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
@@ -20345,7 +19921,7 @@ msgstr "ÐÑÐÐÐÐ _ÐÐÐÐÑ"
 
 #: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑ"
+msgstr "ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐÑ"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
@@ -20360,7 +19936,7 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ ÐÐÑÐÑÐÐÐ desktop 
 #: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
-msgstr "ÐÐÐÑÐÑÐÑÐ %s"
+msgstr "ÐÐÐÑÐÑÐÐ %s"
 
 #: ../smclient/eggdesktopfile.c:1098
 #, c-format
@@ -20375,7 +19951,7 @@ msgstr "ÐÐÐÑÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ: %d"
 #: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐ ÐÐ desktop ÑÐÐÑ âType=Linkâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐÑÐÐÐÐÑÐ ÐÐ âType=Linkâ ÑÐÐÑ"
 
 #: ../smclient/eggdesktopfile.c:1386
 #, c-format
@@ -20417,7 +19993,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"ÐÐÑÑÐÑÐÐÐÑ â%sâ ÑÐ CA ÑÐÑÑÐÑÐÐÐÑ.\n"
+"ÐÐÐÑÐÑÐ â%sâ ÑÐ CA ÑÐÐÑÐÑÐ.\n"
 "\n"
 "ÐÑÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐÐÐÑÐÑÐ:"
 
@@ -20427,8 +20003,8 @@ msgid ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
-"ÐÐÑÑÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ, ÐÐÐÐ ÐÐÑÑÑÐÑÐ Ð Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ "
-"ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
+"ÐÐÑÑÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ, ÐÐÐÐ ÐÐÑÑÑÐÑÐ Ð Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ "
+"ÑÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
@@ -20436,25 +20012,21 @@ msgid ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
-"ÐÐÑÑÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ, ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐ Ñ "
-"ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
+"ÐÐÑÑÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ, ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÑÐ ÐÐ Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ "
+"ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÑÐÐ ÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
 #: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
-msgstr "ÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
-#, fuzzy
-#| msgid "Or_ganization:"
 msgid "Issued To Organization"
-msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑÐ:"
+msgstr "ÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
-#, fuzzy
-#| msgid "Organizational Unit (OU)"
 msgid "Issued To Organizational Unit"
-msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ (OU)"
+msgstr "ÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÐÐÐÑÐÐÐÐÑ ÑÐÐÐÐÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
@@ -20474,26 +20046,20 @@ msgstr "ÐÐÐÐÑÐ ÐÐ"
 
 #: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
 #: ../smime/gui/certificate-manager.c:117
-#, fuzzy
-#| msgid "Or_ganization:"
 msgid "Issued By Organization"
-msgstr "ÐÑ_ÐÐÐÐÐÐÑÐÑÐ:"
+msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÑÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118
-#, fuzzy
-#| msgid "Organizational Unit (OU)"
 msgid "Issued By Organizational Unit"
-msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ (OU)"
+msgstr "ÐÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:81
 #: ../smime/gui/certificate-manager.c:101
 #: ../smime/gui/certificate-manager.c:119
-#, fuzzy
-#| msgid "Issuer"
 msgid "Issued"
-msgstr "ÐÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐÑÐ"
 
 #: ../smime/gui/certificate-manager.c:82
 #: ../smime/gui/certificate-manager.c:102
@@ -20505,60 +20071,57 @@ msgstr "ÐÑÑÐÑÐ"
 #: ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:121 ../smime/gui/smime-ui.ui.h:29
 msgid "SHA1 Fingerprint"
-msgstr "SHA1 ÐÑÐÑÐÐ"
+msgstr "ÐÐÐ1 ÐÑÐÑÐÐ"
 
 #: ../smime/gui/certificate-manager.c:84
 #: ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
-msgstr "MD5 ÐÑÐÑÐÐ"
+msgstr "ÐÐ5 ÐÑÐÑÐÐ"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
-msgstr "ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+msgid "Email Address"
+msgstr "ÐÐÑÐÑÐ ÐâÐÐÑÑÐ"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:570
 msgid "Select a certificate to import..."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑ ÐÐ ÑÐÐÐ..."
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:583
 msgid "All files"
 msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../smime/gui/certificate-manager.c:622
-#, fuzzy
-#| msgid "Failed to import user's certificate"
+#: ../smime/gui/certificate-manager.c:618
 msgid "Failed to import certificate"
-msgstr "ÐÐÑÑÐÐÐ ÑÐÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÑÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:985
 msgid "All PKCS12 files"
-msgstr "ÐÐÐ PKCS12 ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐ ÐÐÐÐ12 ÐÐÑÐÑÐÐÐ"
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1003
 msgid "All email certificate files"
-msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÑÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐÐÑÐÑÐ ÐÐÑÑÐ"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1021
 msgid "All CA certificate files"
-msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ CA ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
 
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ: %s"
+msgstr "ÐÑÐÐÐÐÐÐÑ ÑÐÐÑÐÑÐ: %s"
 
 #: ../smime/gui/component.c:46
-#, fuzzy, c-format
-#| msgid "Enter the password for `%s'"
+#, c-format
 msgid "Enter the password for '%s'"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ â%sâ"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÑ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÑ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/component.c:71
 msgid "Enter new password"
@@ -20571,7 +20134,7 @@ msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
-"ÐÐÐÐÑÐ:\n"
+"ÐÐÐÐ ÑÐ ÐÐÐÐÑÐ:\n"
 "  ÐÐÑÐÐÐ: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:117
@@ -20580,58 +20143,56 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
-"ÐÐÐÐÐ:\n"
+"ÐÐÐÐÐ ÑÐ:\n"
 "  ÐÐÑÐÐÐ: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
-msgstr "<ÐÐÑÐ ÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ>"
+msgstr "<ÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÐ>"
 
 #: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#, fuzzy
-#| msgid "Backup All"
 msgid "Backup _All"
-msgstr "ÐÐÐÐÑÐÐ ÑÐÐÐÐ"
+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:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
-msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
-msgstr "ÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
-msgstr "ÐÐÑÐÑÐÑÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÑÑÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
-msgstr "ÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
@@ -20639,23 +20200,23 @@ msgstr "ÐÐÑÐÐÐÐÑÐÐ ÐÐÐ (CN)"
 
 #: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
-msgstr "ÐÐÑÑÐÑÐÐÐÑÐ ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
-msgstr "ÐÐ ÐÐÑÑÑ Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐ ÐÐÑÑÑ Ñ ÐÐÑÐÐÐÑÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
-msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐ Ñ ÑÐÑÑÐÑÐÐÐÑÐ Ð-ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐ Ñ ÑÐÐÑÐÑÐ Ð-ÐÐÑÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÑÐÐÐÐÑÐ Ð-ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐ Ð-ÐÐÑÑÐÐ"
 
 #: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐÐÑÐÐÐÐ Ð-ÐÐÑÑÐÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐÐÐÐ Ð-ÐÐÑÑÐÐ"
 
 #: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
@@ -20671,11 +20232,11 @@ msgstr "ÐÑÐÑÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
-msgstr "ÐÐÐÐÑ"
+msgstr "ÐÐÐÐÑÐ ÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
-msgstr "ÐÐÐÐÑÐ ÐÐ"
+msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
@@ -20687,33 +20248,31 @@ msgstr "ÐÑÐÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐÐÐÑÐ (OU)"
 
 #: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ SSL ÐÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐ ÐÐÐÑÐÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ SSL ÑÐÑÐÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:33
 msgid "This certificate has been verified for the following uses:"
-msgstr "ÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑÐÐÐ:"
+msgstr "ÐÐÐ ÑÐÐÑÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÑÑÐÐÐ:"
 
 #: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
-msgstr "ÐÐÑÑÑ Ñ ÐÑÑÐÐÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÑÑ Ñ ÐÐÑÐÐÐÑÑÐÑÐÐÑÑ ÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
-msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ Ð-ÐÐÑÐÑÐ."
+msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ Ð-ÐÐÑÐÑÐ."
 
 #: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
-msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐÑÐ."
+msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐÑÐ."
 
 #: ../smime/gui/smime-ui.ui.h:37
-#, fuzzy
-#| msgid "Trust this CA to identify web sites."
 msgid "Trust this CA to identify websites."
-msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÐ."
+msgstr "ÐÐÑÑÑ ÐÐÐÐ ÐÐÐÐÐÐÐÑÑ ÑÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÐ."
 
 #: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
@@ -20721,35 +20280,33 @@ msgstr "ÐÑÐÑÐÐÐÐÑÑ"
 
 #: ../smime/gui/smime-ui.ui.h:39
 msgid "You have certificates from these organizations that identify you:"
-msgstr "ÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑ ÐÐÑÐÑÑÑÑ:"
+msgstr "ÐÐÑÐÐÑÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÐÑ ÐÑÐÐÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑ ÐÐÑÐÑÑÑÑ:"
 
 #: ../smime/gui/smime-ui.ui.h:40
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "ÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÑÑ ÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ:"
+msgstr "ÐÐÑÐÐÑÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÑÑ ÐÐÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÑÐ:"
 
 #: ../smime/gui/smime-ui.ui.h:41
 msgid "You have certificates on file that identify these people:"
-msgstr "ÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÑÑ ÐÐÐ ÐÑÐÐÐ:"
+msgstr "ÐÐÑÐÐÑÑÐÑÐ ÑÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÑÑÑÑ ÐÐÐ ÐÑÐÐÐ:"
 
 #: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
-msgstr "ÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:44
-#, fuzzy
-#| msgid "Backup"
 msgid "_Backup"
-msgstr "ÐÐÐÐÑÐÐ"
+msgstr "ÐÐÐÑÐÐÐ _ÑÐÐÐÑÐÑ"
 
 #: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
-msgstr "_ÐÑÐÐÐ ÐÐÐÐÑÐÑÐ Ñ CA"
+msgstr "_ÐÑÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
-msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑ ÐÐÑÑÐÑÐ"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑ ÐÐÑÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
@@ -20766,65 +20323,59 @@ msgstr "ÐÐÑÑÑÑ"
 
 #: ../smime/lib/e-cert.c:527
 msgid "Version"
-msgstr "ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:542
 msgid "Version 1"
-msgstr "ÐÐÑÐÐÑÐ 1"
+msgstr "ÐÐÐÐÑÐ 1"
 
 #: ../smime/lib/e-cert.c:545
 msgid "Version 2"
-msgstr "ÐÐÑÐÐÑÐ 2"
+msgstr "ÐÐÐÐÑÐ 2"
 
 #: ../smime/lib/e-cert.c:548
 msgid "Version 3"
-msgstr "ÐÐÑÐÐÑÐ 3"
+msgstr "ÐÐÐÐÑÐ 3"
 
 #: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 ÑÐ RSA ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐ2 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../smime/lib/e-cert.c:633
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 ÑÐ RSA ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐ5 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../smime/lib/e-cert.c:636
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "PKCS #1 SHA-1 ÑÐ RSA ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-1 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../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 ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-256 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../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 ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-384 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../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 ÑÐÑÑÐÐÐÑÐÐ"
+msgstr "ÐÐÐÐ #1 ÐÐÐ-512 ÑÐ ÐÐÐ ÑÐÑÑÐÐÐÑÐÐ"
 
 #: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA ÑÐÑÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐ #1 ÐÐÐ ÑÐÑÑÐÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
-msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÑÑÐÐÐ ÐÑÑÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
-msgstr "Netscape ÑÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐ ÐÐÑÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
-msgstr "ÐÐÑÐÑÐÐÐÑ ÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÑÐÐÐÑ ÐÑÑÑÐ ÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:693
 #, c-format
@@ -20853,7 +20404,7 @@ msgstr "ÐÐÐÐÐ ÐÑÑÑ ÑÑÐÑÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
 msgid "Error: Unable to process extension"
-msgstr "ÐÑÐÑÐÐ: ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+msgstr "ÐÑÐÑÐÐ: ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
@@ -20861,11 +20412,11 @@ msgstr "ÐÐÑÐÐÑÐÐÐ ÐÑÐÐÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
-msgstr "SSL ÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
-msgstr "ÐÐÐÐÐÐÑ ÑÐÑÑÐÑÐÐÐÑÐ Ð-ÐÐÑÑÐ"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÐÑÐÑÐ Ð-ÐÐÑÑÐ"
 
 #: ../smime/lib/e-cert.c:872
 msgid "Signing"
@@ -20889,11 +20440,11 @@ msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÑÑÑÐ"
 
 #: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
-msgstr "ÐÐÑÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÑÐÐÑÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
-msgstr "CRL ÐÐÑÐÐÑÐÐÐ"
+msgstr "ÐÐÐ ÐÐÑÐÐÑÐÐÐ"
 
 #: ../smime/lib/e-cert.c:944
 msgid "Critical"
@@ -20922,11 +20473,11 @@ msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
-msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
-msgstr "ÐÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÑ"
 
 #: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
@@ -20938,19 +20489,19 @@ msgstr "ÐÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐÑÐ"
 
 #: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
-msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÑÐ ÑÐÐÑÐÑÐ"
 
 #: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
-msgstr "PKCS12 ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐ12 ÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
 #: ../smime/lib/e-pkcs12.c:250
 msgid "Enter password for PKCS12 file:"
-msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ PKCS12 ÐÐÑÐÑÐÐÑ:"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐ ÐÐÐÐ12 ÐÐÑÐÑÐÐÑ:"
 
 #: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑ"
+msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -20962,7 +20513,7 @@ msgstr "_ÐÐÑÑÐ ÐÐÑÐÑÐÑÐ"
 
 #: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÐ"
+msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÐÐ"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20982,19 +20533,19 @@ msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÐÐ ÐÐÐÐÑÐ"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐ _ÐÐÑÐÐÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ ÑÐÐÑÐ ÐÐ _ÑÐÑÐÐÐ ÐÑÐÐÐÐ"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
-msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ _ÐÐÑÐÐÑÐ"
+msgstr "ÐÐÐ ÑÐÑÑÐÐÐÐ _ÑÐÐÑÐ"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "ÐÑÐÐÐ Ñ_ÑÐÑÑÑÑ"
+msgstr "ÐÑÐÐÐ Ñ_ÑÐÑÑ"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
-msgstr "ÐÑÐÐÐ ÐÐ_ÑÐÑÐÐÑÑ"
+msgstr "ÐÑÐÐÐ ÐÐÑÐÑÐÐÑ_Ñ"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
@@ -21002,11 +20553,11 @@ msgstr "ÐÑÐÐÐ _ÐÐÑÐÐÐÑ"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ _ÑÐÐÑÐÑÐ"
+msgstr "ÐÑÐÐÐ ÐÐÐÐÑÐ _ÐÑÐÑÐÑÐ"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
-msgstr "ÐÐ _ÐÐÑÐÐÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐ Ñ_ÐÑÐÐÐ ÐÑÐÐÐÐ"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -21022,7 +20573,7 @@ msgstr "ÐÐ _ÑÐÐÐÐ"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "ÐÐ _ÑÑÐÑÑÑÐÐ"
+msgstr "ÐÐ _ÑÑÐÑÐÐ"
 
 # ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐ, ÐÐÐ ÐÐ
 # ÐÐÑÐÐ ÐÐ?
@@ -21033,7 +20584,7 @@ msgstr "ÐÐ _ÑÑÐÑÑÑÐÐ"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
-msgstr "UTC"
+msgstr "ÐÐÐ (UTC)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
@@ -21045,7 +20596,7 @@ msgstr "ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
-msgstr "ÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐÐÑÐÐ ÐÐÐÐ"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
@@ -21058,7 +20609,7 @@ msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
-msgstr "_ÐÐÐÐÐÑ"
+msgstr "_ÐÐÐÐÑ"
 
 #: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-define-views.ui.h:4
@@ -21130,7 +20681,7 @@ msgstr "_ÐÐÐ ÐÐÑÐÑÐÐÐ:"
 
 #: ../widgets/misc/e-attachment-dialog.c:365
 msgid "MIME Type:"
-msgstr "MIME ÑÐÐ:"
+msgstr "ÐÐÐÐ ÑÐÐ:"
 
 #: ../widgets/misc/e-attachment-dialog.c:373
 #: ../widgets/misc/e-attachment-store.c:559
@@ -21139,7 +20690,7 @@ msgstr "_ÐÑÐÐÐÐÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐ ÐÑÐÐÐÐÐ"
 
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÐÑÑÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐÑ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
@@ -21159,7 +20710,7 @@ msgstr "_ÐÐÑÐÑÐ ÐÐ..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
-msgstr "ÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
+msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../widgets/misc/e-attachment-icon-view.c:162
 #: ../widgets/misc/e-attachment-tree-view.c:547
@@ -21204,7 +20755,7 @@ msgstr "attachment.dat"
 
 #: ../widgets/misc/e-attachment-view.c:404
 msgid "Open With Other Application..."
-msgstr ""
+msgstr "ÐÑÐÐÑÐ ÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ..."
 
 #: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
@@ -21220,26 +20771,25 @@ msgstr "_ÐÐÐÑÐÑ"
 
 #: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
-msgstr "Ð_ÐÐÑÐÑ ÑÐÐ"
+msgstr "ÐÐÐ_ÑÐÑ ÑÐÐ"
 
 #: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
-msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÐÐ"
+msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÑÑÐÑ"
 
 #: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐ ÐÑÐÐÐ"
+msgstr "ÐÑÐ_ÐÐÐÐÐÑ ÑÐÐ ÑÐÑÑÐÑ"
 
 #: ../widgets/misc/e-attachment-view.c:803
-#, fuzzy, c-format
-#| msgid "Open with \"%s\""
+#, c-format
 msgid "Open With \"%s\""
-msgstr "ÐÑÐÐÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÑÐ ÐÑÐÐÑÐÐÐÐ â%sâ"
 
 #: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
-msgstr "ÐÑÐÐÑÐ ÐÑÐÐÐÐ ÐÑÐÐÑÐÐÐÐ â%sâ"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÑ ÐÑÐÐÐÐ Ñ â%sâ"
 
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
@@ -21251,31 +20801,31 @@ msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ ÐÐÑ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÑÐÐÐÑÐ ÑÐ ÐÐÑ Ñ ÑÐÐÑ"
 
 #: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
-msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÐÑÐ ÐÐÑ ÑÐ Ñ ÑÐÐÑ"
+msgstr "ÐÐÐÑÐÑÐÑÐ ÑÑÐÐÑÐ ÑÐ ÐÐÑ Ñ ÑÐÐÑ"
 
 #: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ â%sâ"
 
 #: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÑÐÑÐÑÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÐÑÐÐÐÐ"
 
 #: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ â%sâ"
 
 #: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÐ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÐ"
 
 #: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
@@ -21285,17 +20835,17 @@ msgstr "ÐÐÐÑÐÐÑ ÐÑÐÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐ"
 #: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ â%sâ"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ â%sâ"
 
 #: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
-msgstr "ÐÐÑÐ ÐÐÐÑÑÐ ÑÐÑÑÐÐÑÐ ÐÑÐÐÐÐ"
+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
 msgid "Ctrl-click to open a link"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐ ÐÐÐÐ Ð Ctrl ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÑ"
+msgstr "ÐÑÐÑÐÑÐÐÑÐ ÑÐÑÑÐÑ ÐÑÑÐ Ð ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ ÐÐÐÑ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1247
@@ -21318,9 +20868,7 @@ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÑ ÑÑÑÐÐÑ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 msgid "Other..."
 msgstr "ÐÑÑÐÐ..."
 
-#: ../widgets/misc/e-contact-map-window.c:347
-#, fuzzy
-#| msgid "Contacts map"
+#: ../widgets/misc/e-contact-map-window.c:355
 msgid "Contacts Map"
 msgstr "ÐÐÑÑÐ ÐÐÐÑÐÐÐÑÐ"
 
@@ -21334,11 +20882,11 @@ msgstr "ÐÐÐ ÑÐÐÑÑÐ ÐÐ ÑÐÐÑ ÐÐÑÑÐÐ"
 
 #: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
+msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑ"
 
 #: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐ"
 
 #: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
@@ -21384,8 +20932,8 @@ 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:266
 msgid "F_ilename:"
@@ -21423,22 +20971,18 @@ msgid ""
 "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:767
-#, fuzzy
-#| msgid "Cancel"
 msgid "_Cancel Import"
-msgstr "ÐÑÐÐÐÐ"
+msgstr "_ÐÑÐÐÐÐ ÑÐÐÐÐÑÐ"
 
 #: ../widgets/misc/e-import-assistant.c:909
-#, fuzzy
-#| msgid "Preview the message to be printed"
 msgid "Preview data to be imported"
-msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑ ÐÑÐÐ ÑÑÐÐÐÑ"
+msgstr "ÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐ ÐÐÑÐ ÑÐ ÑÐÐÐÐ"
 
 #: ../widgets/misc/e-import-assistant.c:915
 #: ../widgets/misc/e-import-assistant.c:928
@@ -21512,57 +21056,57 @@ msgstr ""
 
 #: ../widgets/misc/e-online-button.c:33
 msgid "Evolution is currently offline because the network is unavailable."
-msgstr "ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ ÑÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
+msgstr "ÐÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÑÐ ÐÐ ÐÑÐÐÐ ÑÐÑ ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ."
 
 #: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÑÑÐÑÐ"
 
 # bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "ÐÐÐÐÐÐÐÑÐ: %d"
 
-#: ../widgets/misc/e-search-bar.c:561
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "ÐÐÑÐÐÑÐ ÑÑÐÐÑ ÐÑÐÑÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:569
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "ÐÑÐ_ÐÐÑÐ:"
 
-#: ../widgets/misc/e-search-bar.c:581
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "ÐÑÐÑÑÐ ÐÑÐÑÑÐÐÑ"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_ÐÑÐÑÑÐÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:611
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
-msgstr "ÐÐÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:624
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_ÐÐÐÐÐÑÐ"
 
-#: ../widgets/misc/e-search-bar.c:630
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
-msgstr "ÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÑÑÐÐÐ"
+msgstr "ÐÐÑÐ ÑÐÐÐÐÑÐ ÐÐÑÐÐÑÐÐÐÑÐ ÐÐÑÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
-msgstr "ÐÐ_ÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
+msgstr "ÐÐ_ÐÐÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
-#: ../widgets/misc/e-search-bar.c:671
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
-msgstr "ÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐ, ÐÐÑÑÐÐÑÐÐÐ ÐÐ ÐÑÑÐ"
+msgstr "ÐÑÐÐÐÐ ÑÐÐ ÐÐ ÐÐÐ ÑÑÑÐÐÐÑÐ, ÐÐÑÑÐÐÑÐÐ ÑÐ ÐÑÑÐ"
 
-#: ../widgets/misc/e-search-bar.c:693
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
-msgstr "ÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐ, ÐÐÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐ"
+msgstr "ÐÑÐÐÐÐ ÑÐÐ ÐÐ ÐÑÑÐ ÑÑÑÐÐÐÑÐ, ÐÐÑÑÐÐÑÐÐ ÑÐ ÐÐÐ"
 
 #: ../widgets/misc/e-send-options.c:543
 msgid "When de_leted:"
@@ -21570,7 +21114,7 @@ msgstr "ÐÐÐÐ ÑÐ ÐÐÑÐ_ÑÐÐÐ:"
 
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
-msgstr "Ð_ÑÑÐÐÐÑÑÐÐ ÐÑÐÑÐ ÐÐÑÐÐÑÑ ÑÑÐÐÐÑ"
+msgstr "Ð_ÑÑÐÐÐÑÑÐÐ ÐÐÑÐÑÐ ÐÐÑÐÐÑÑ ÑÑÐÐÐÑ"
 
 #: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
@@ -21585,43 +21129,33 @@ msgid "Delivery Options"
 msgstr "ÐÐÑÐÑÐ ÐÑÐÐÑÑÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#, fuzzy
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "_ÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#, fuzzy
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_ÐÐÑÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#, fuzzy
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "ÐÐÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#, fuzzy
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "ÐÐ_ÑÑÐÑ"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#, fuzzy
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "ÐÐÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
-msgstr "ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ"
+msgstr "ÐÐÐÐ ÐÐ ÐÐÑÐ ÐÑÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
@@ -21637,7 +21171,7 @@ msgstr "ÐÐÐÑÐÐÑÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
-msgstr "ÐÐÑÑÐÐÐÐ Ð_ÐÐÐÐÐÑ"
+msgstr "ÐÐÑÑÐÐÐÐ ÑÐ Ð_ÐÐÐÐÐÑ"
 
 #: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
@@ -21665,15 +21199,15 @@ msgstr "ÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
-msgstr "ÐÐÐÐ ÑÐ ÐÑÐ_ÑÐÐÑÐÐÐ: "
+msgstr "ÐÐÐÐ ÑÐ _ÐÑÐÑÐÐÑÐÐÐ:"
 
 #: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
-msgstr "ÐÐ ÐÐÐÑÑ_ÐÑÐÑ:"
+msgstr "ÐÐÐ ÑÐ _ÐÐÐÑÑÐÐÐ:"
 
 #: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
-msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐ_ÑÐÐÐ:"
+msgstr "ÐÐÐÐ ÑÐ _ÐÐÐÐÑÐÐÐ:"
 
 #: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
@@ -21693,15 +21227,15 @@ msgstr "_ÐÑÐÐÑÑÑÐÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
-msgstr "_ÐÐÑÑÐÐÐ ÑÐÐ"
+msgstr "ÐÐÑÑÐÐÐ _ÑÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
-msgstr "_ÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+msgstr "ÐÐÐÐ ÑÐ Ð_ÐÐÐÐÐ"
 
 #: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
-msgstr "_ÐÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ:"
+msgstr "ÐÐÐÐ ÑÐ Ð_ÑÐÐÑÐÐÐ:"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -21710,8 +21244,6 @@ msgstr "_ÐÐÐÐ ÑÐ ÐÑÐÐÑÐÐÐ:"
 # is not permitted.
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#, fuzzy
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
@@ -21769,56 +21301,52 @@ msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÐÐ."
 msgid "Click here to go to URL"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_ÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
-msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÑÐÑÐÑÑ"
+msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÐ"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÑ Ñ ÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÑ"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
-msgstr "_ÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÑÐÑ ÐÐÑÐÑÑ"
+msgstr "_ÐÐÐÐÐÐ ÐÐÑÐÑÑ Ð-ÐÐÑÑÐ"
 
-#: ../widgets/misc/e-web-view.c:445
-#, fuzzy
-#| msgid "_No image"
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
-msgstr "_ÐÐÐ ÑÐÐÐÐ"
+msgstr "_ÐÐÐÐÐÐ ÑÐÐÐÑ"
 
-#: ../widgets/misc/e-web-view.c:447
-#, fuzzy
-#| msgid "Copy the link to the clipboard"
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑ Ñ ÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÑ Ñ ÐÑÑÐÐÑ"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "ÐÐÐÐÐÑÐ ÑÐÐ ÑÐÐÑÑ Ð ÑÐÐÐÐ"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ/ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐ"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐÑÐ/ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÑÐ"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
-msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %s"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÑÐÑÐ %s"
 
 #: ../widgets/misc/ea-calendar-item.c:302
 #: ../widgets/misc/ea-calendar-item.c:311
@@ -21864,7 +21392,7 @@ msgstr "ÐÑÐÐÐ ÐÐÑÐ ÐÐÑÐ Ñ ÑÐÑÐÐÑÑ: %s"
 
 #: ../widgets/table/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑ 0 Ð 100"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÑ 0 Ð 100"
 
 #: ../widgets/table/e-table-click-to-add.c:594
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
@@ -21999,14 +21527,13 @@ msgstr ""
 #. Example: "Family name: Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:353
-#, fuzzy, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
+#, c-format
 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 ÑÑÐÐÐÐ)"
+msgstr[0] "%s: %s (%d ÑÑÐÐÐÐ)"
+msgstr[1] "%s: %s (%d ÑÑÐÐÐÐ)"
+msgstr[2] "%s: %s (%d ÑÑÐÐÐÐ)"
+msgstr[3] "%s: %s (ÑÐÐÐÐ ÑÑÐÐÐÐ)"
 
 #. 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.
@@ -22021,7 +21548,7 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d ÑÑÐÐÐÐ)"
 msgstr[1] "%s (%d ÑÑÐÐÐÐ)"
 msgstr[2] "%s (%d ÑÑÐÐÐÐ)"
-msgstr[3] "%s (%d ÑÑÐÐÐÐ)"
+msgstr[3] "%s (ÑÐÐÐÐ ÑÑÐÐÐÐ)"
 
 #: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
@@ -22093,12 +21620,12 @@ msgstr "ÐÐÑÐÑÐ ÑÐÐÐÑÐ"
 #. Translators: description of an "expand" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
-msgstr "ÑÐÐÐÑÐÐÐÐÐ ÑÐÐ Ñ ETree ÐÐÐ ÑÐ ÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÑÐÐÐÑÐÐÐÐÐ ÑÐÐ Ñ ÐÑÑÐÐÐÐ ÐÐÑÐ ÑÐÑÐÐ ÐÐÑ ÑÐÐÐÑÑ"
 
 #. Translators: description of a "collapse" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
-msgstr "ÑÐÑÐÑÐ ÑÐÐ Ñ ETree ÐÐÐ ÑÐ ÑÐÐÐÑÐ ÐÐÐÐÐÐ"
+msgstr "ÑÐÑÐÑÐ ÑÐÐ Ñ ÐÑÑÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐÑ ÑÐÐÐÑÑ"
 
 #: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
@@ -22120,6 +21647,170 @@ msgstr "ÐÐÐÐÐÑÐ ÑÐÐ"
 msgid "Input Methods"
 msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐ"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "ÐÐÐÐÑ ÑÐÑ"
+
+#~ msgid "Add Alarm"
+#~ msgstr "ÐÐÐÐÑ ÐÐÐÑÐ"
+
+#~ msgid "Alarm"
+#~ msgstr "ÐÐÐÑÐ"
+
+#~ msgid "_Alarms"
+#~ msgstr "ÐÐÐ_ÑÐÐ"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "ÐÐÑÑÐ"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÐÑÐ:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_ÐÐÐÑÐ"
+
+#~ msgid "_Group:"
+#~ msgstr "_ÐÑÑÐÐ:"
+
+#~ msgid "It has alarms."
+#~ msgstr "ÐÐÐ ÐÐÐÑÐÐ."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "ÐÐÐ ÐÐÐÑÐÐ"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "ÐÐÐÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÐÐ."
+
+#~ msgid "Alarm programs"
+#~ msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐ"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "ÐÐÐÐ_Ñ ÐÐ ÐÐÐÐÑÑÐÑÑ"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐ ÑÑÑÐÐÐÑÑ ÑÐ ÑÐÑÑÐ ÐÐÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐ"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÑÐÐÑÑÐ ÐÑÐÐÐÑ"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÑÑÐÐÑ ÐÐÐÐÑ"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑÐ ÑÐÐÑÑÐ ÐÑÐÐÐÑ"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "ÐÑÐÑÐÑÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "_ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐ:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ:"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "ÐÐÑÑÐ"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "ÐÐÑÑÑÐÐÐ ÑÐ %s ÐÐÐÐÑÐÐ Ð ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÐÑÑÐÐÐÑÐÐ."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr "ÐÐÐÐÑÐÐ %s ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑ ÐÐÑÑÐÐÐÑÐÐ."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "ÐÐÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÑÐÑÐ"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "ÐÐÐÐÑÐÐÑÐÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÑÐÐÐ %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐÑÐÐÑÐÑÐ ÐÐ ÑÐÐÐÑÑÐ, ÐÐÑÐÐ..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐÑÐÐÑÐÑÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "ÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑÐÑÑ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐÐÑÐÐÑÐÑ"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "ÐÐÐÑÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÑÑ ÐÐÑÐÑÑÐÑÐÐ ÐÐÐÐÑÐÐÑÐÑÐ."
+
+#~ msgid "Use _SSL"
+#~ msgstr "ÐÐÑÐÑÑÐ ÑÐÑÑÐÐÐÐÑ ÐÐÐÑ"
+
+#~ msgid "_Secure connection"
+#~ msgstr "_ÐÐÑÐÑÑÐ ÑÐÐÑÑÐÑ ÐÐÐÑ"
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "ÐÐÑÑÑÑÑÐ ÐÐÑÑÐÐ D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "ÐÑÐÐÑÐ D-BUS ÐÐÑÑÐÑ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐ."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "ÐÑÐÐÑÑÑÐ ÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÐ."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÐ ÐÐÑÑÐÑ ÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐ ÑÑÐÐÐÐ ÐÐÐÐ ÐÐÑÑÐÐ."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ Ñ _ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "ÐÑÐÐÐÐÐ _ÐÐÑÑÐÑ ÐÐÑÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "ÐÑÐÐÑÐ _D-Bus ÐÐÑÑÐÑ"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ, ÐÐÐ: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÐ: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "ÐÑÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐÑÑ: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÐÑÐÐ, ÑÐÐÑÐÐ..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑ ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐÑÐÐÐ, ÐÑÐÐÐÐÐÐ..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "ÐÐÐ ÐÐ ÐÐÐÑÐ ÑÐÐÐÐ ÑÐ ÐÑÐÐÐ, ÐÐÐÐÐÐ ÐÑÐÑÐÐ: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ. ÐÑÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÑÑÐ."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ ÐÐÑÑÐ ÐÐÐÑÐ ÑÐÐÐÐ"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÐ (.ics)"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "ÐÐÐÐÑÑÐÐÑÐÐ ÐÐÑÐÑÐ"
+
 #~ msgid "failed to open book"
 #~ msgstr "ÐÐÑÑÐÐÐÐ ÐÑÐÐÑÐÑÐ ÐÑÐÐÐ"
 
@@ -22392,9 +22083,6 @@ msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐ"
 #~ msgid "Read items marked _private"
 #~ msgstr "ÐÐÑÐÑ ÑÑÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÐÐ _ÐÐÑÐÐ"
 
-#~ msgid "Reminder Notes"
-#~ msgstr "ÐÐÐÑÐÑÐÐÑÐ"
-
 #~ msgid "Subscribe to my _alarms"
 #~ msgstr "ÐÑÐÑÐÐÐ ÑÐ ÐÐ ÐÐÑÐ _ÑÐÐÐÐÑÐÑÐ"
 
@@ -22721,9 +22409,6 @@ msgstr "ÐÐÑÐÐÐ ÑÐÐÑÐ"
 #~ msgid "%s has published meeting information."
 #~ msgstr "<b>%s</b> ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ."
 
-#~ msgid "Meeting Information"
-#~ msgstr "ÐÐÐÐÑÐÐ Ð ÑÐÑÑÐÐÐÑ"
-
 #, fuzzy
 #~| msgid "<b>%s</b> requests the presence of %s at a meeting."
 #~ msgid "%s requests the presence of %s at a meeting."
diff --git a/po/sr latin po b/po/sr latin po
index 901e331..a6db031 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,27 +1,27 @@
 # Serbian translation of evolution
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004, 2005, 2006.
-#
 # This file is distributed under the same license as the evolution package.
-#
 # 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.
-#
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
 #: ../shell/main.c:569
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N\n"
-"POT-Creation-Date: 2011-06-24 14:25+0000\n"
-"PO-Revision-Date: 2010-09-22 15:01+0200\n"
-"Last-Translator: MiloÅ PopoviÄ <gpopac gmail com>\n"
+"POT-Creation-Date: 2011-08-23 13:03+0000\n"
+"PO-Revision-Date: 2011-08-08 08:09+0200\n"
+"Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail 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=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"
+"Language: sr\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"
+"X-Project-Style: gnome\n"
 
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
@@ -41,22 +41,34 @@ msgstr ""
 "istom adresom?"
 
 #: ../addressbook/addressbook.error.xml.h:4
-msgid "Address '{0}' already exists."
-msgstr "Adresa â{0}â veÄ postoji."
+msgid ""
+"A contact list named '{0}' is already in this contact list. Would you like "
+"to add it anyway?"
+msgstr ""
+"Spisak kontakata pod nazivom â{0}â se veÄ nalazi na ovom spisku. Da li ipak "
+"Åelite da ga dodate?"
 
 #: ../addressbook/addressbook.error.xml.h:5
+msgid "Add with duplicates"
+msgstr "Dodaj sa duplikatima"
+
+#: ../addressbook/addressbook.error.xml.h:6
+msgid "Address '{0}' already exists."
+msgstr "Adresa â{0}â veÄ postoji."
+
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Cannot add new contact"
 msgstr "Nije moguÄe dodati novi kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Cannot move contact."
 msgstr "Kontakt nije moguÄe premestiti."
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:9
 msgid "Category editor not available."
 msgstr "UreÄivaÄ kategorija nije dostupan."
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:10
 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; "
@@ -66,89 +78,101 @@ msgstr ""
 "prijave. Ne zaboravite da je veliÄina slova bitna u lozinkama; moÅda su "
 "velika slova ukljuÄena."
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Could not get schema information for LDAP server."
-msgstr "Nije moguÄe dobaviti Åemu podataka sa LDAP servera."
+msgstr "Ne mogu da dobavim Åemu podataka sa LDAP servera."
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Could not remove address book."
-msgstr "Nije moguÄe ukloniti adresar."
+msgstr "Ne mogu da uklonim adresar."
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:13
 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."
+"Trenutno iz Evolucije moÅete pristupiti samo sistemskom adresaru GroupVajza. "
+"Koristite neki drugi GroupVajz klijent za elektronsku poÅtu da dobavite "
+"Äeste kontakte i fascikle sa liÄnim kontaktima GroupVajza."
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:14
 msgid "Delete address book '{0}'?"
-msgstr "Obrisati adresar â{0}â?"
+msgstr "Da obriÅem adresar â{0}â?"
 
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
 #: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
 msgid "Do _Not Delete"
 msgstr "Ne _briÅi"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "Error saving {0} to {1}: {2}"
 msgstr "GreÅka pri Äuvanju {0} u {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Failed to authenticate with LDAP server."
-msgstr "Neuspela autentifikacija na LDAP server."
+msgstr "Nisam uspeo da potvrdim identitet na LDAP serveru."
 
-#: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1272
+#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
 msgid "Failed to delete contact"
-msgstr "Neuspelo brisanje kontakta"
+msgstr "Nisam uspeo da obriÅem kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "GroupWise Address book creation:"
-msgstr "Pravljenje GroupWise adresara:"
+msgstr "Stvaranje GroupVajz adresara:"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP server nije odgovorio ispravnom Åemom podataka."
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
+msgid "List '{0}' is already in this contact list."
+msgstr "Spisak â{0}â je veÄ na ovom spisku kontakata."
+
+#: ../addressbook/addressbook.error.xml.h:22
+msgid "Skip duplicates"
+msgstr "PreskoÄi duplikate"
+
+#: ../addressbook/addressbook.error.xml.h:23
+msgid "Some addresses already exist in this contact list."
+msgstr "Neke adrese veÄ postoje na ovom spisku kontakata."
+
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Some features may not work properly with your current server"
-msgstr "Na tekuÄoj verziji servera neke opcije neÄe ispravno raditi"
+msgstr "Neke opcije neÄe ispravno raditi na vaÅem trenutnom serveru."
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "The Evolution address book has quit unexpectedly."
 msgstr "Evolucijin adresar je neoÄekivano prestao da radi."
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:26
 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?"
+"Slika koju ste izabrali je prevelika. Da li Åelite li da joj promenite "
+"veliÄinu i da je saÄuvate?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:27
 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."
+"Ovaj LDAP server moÅda koristi starije LDAP izdanje koje ne podrÅava ovu "
+"moguÄnost, ili je loÅe podeÅen. Pitajte administratora za podrÅane osnove "
+"pretrage."
 
 # malo aorista ;-)
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This address book could not be opened."
 msgstr "Ovaj adresar nije mogao biti otvoren."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:29
 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:25
+#: ../addressbook/addressbook.error.xml.h:30
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -157,31 +181,31 @@ msgstr ""
 "je mreÅa nedostupna."
 
 # malo aorista ;-)
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "This address book will be removed permanently."
 msgstr "Ovaj adresar Äe biti trajno uklonjen."
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "This server does not support LDAPv3 schema information."
 msgstr "Ovaj server ne podrÅava LDAPv3 Åemu podataka."
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:33
 msgid "Unable to open address book"
-msgstr "NemoguÄe otvaranje adresara"
+msgstr "Ne mogu da otvorim adresar"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:34
 msgid "Unable to perform search."
 msgstr "Pretraga nije moguÄa."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Unable to save {0}."
-msgstr "Nije moguÄe saÄuvati {0}."
+msgstr "Ne mogu da saÄuvam {0}."
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:36
 msgid "Would you like to save your changes?"
-msgstr "Åelite li da saÄuvate promene?"
+msgstr "Da li Åelite li da saÄuvate izmene?"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:37
 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?"
@@ -189,54 +213,62 @@ 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
+#: ../addressbook/addressbook.error.xml.h:38
 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"
+"Povezujete se na nepodrÅan GroupVajz 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
+#: ../addressbook/addressbook.error.xml.h:39
+msgid ""
+"You are trying to add addresses that are part of this list already. Would "
+"you like to add them anyway?"
+msgstr ""
+"PokuÅavate da dodate adrese koje su veÄ deo ove liste. Da li ipak Åelite da "
+"ih dodate?"
+
+#: ../addressbook/addressbook.error.xml.h:40
 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:35
+#: ../addressbook/addressbook.error.xml.h:41
 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?"
+msgstr "Izmenili ste ovaj kontakt. Da li Åelite da saÄuvate ove izmene?"
 
 #. Translators: {0} is replaced with an address book name which will not be available
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:43
 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:38 ../mail/em-vfolder-rule.c:604
+#: ../addressbook/addressbook.error.xml.h:44 ../mail/em-vfolder-rule.c:608
 #: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "_Do not save"
 msgstr "_Ne Äuvaj"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:47
 msgid "_Resize"
 msgstr "P_romeni veliÄinu"
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:48
 msgid "_Use as it is"
 msgstr "_Koristi tako kako je"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:617
+#: ../addressbook/gui/widgets/eab-contact-display.c:710
 #: ../calendar/gui/e-calendar-view.c:2078
 msgid "Anniversary"
 msgstr "_GodiÅnjica:"
@@ -247,7 +279,7 @@ msgstr "_GodiÅnjica:"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
-#: ../addressbook/gui/widgets/eab-contact-display.c:616
+#: ../addressbook/gui/widgets/eab-contact-display.c:709
 #: ../calendar/gui/e-calendar-view.c:2077 ../capplet/anjal-settings-main.c:79
 #: ../shell/main.c:140
 msgid "Birthday"
@@ -259,7 +291,7 @@ msgid "Blog:"
 msgstr "Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 #: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
@@ -274,18 +306,18 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:643
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:663
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2862
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:653
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:675
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2910
 msgid "Contact Editor"
 msgstr "UreÄivaÄ za kontakte"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:358
+#: ../addressbook/gui/merging/eab-contact-merging.c:382
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
-#: ../addressbook/gui/widgets/eab-contact-display.c:911
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:1004
 #: ../smime/lib/e-cert.c:832
 msgid "Email"
 msgstr "E-poÅta"
@@ -300,15 +332,15 @@ msgstr "Puno _ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:198
-#: ../addressbook/gui/widgets/eab-contact-display.c:75
-#: ../addressbook/gui/widgets/eab-contact-display.c:1195
+#: ../addressbook/gui/widgets/eab-contact-display.c:78
+#: ../addressbook/gui/widgets/eab-contact-display.c:1306
 #: ../widgets/misc/e-contact-map.c:295
 msgid "Home"
 msgstr "KuÄa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 msgid "Home Page:"
-msgstr "LiÄna strana:"
+msgstr "MatiÄna strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "Image"
@@ -336,14 +368,13 @@ msgid "Nic_kname:"
 msgstr "Na_dimak:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
-#: ../modules/calendar/e-memo-shell-migrate.c:265
 msgid "Notes"
 msgstr "Napomene"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:199
-#: ../addressbook/gui/widgets/eab-contact-display.c:76
-#: ../addressbook/gui/widgets/eab-contact-display.c:400
+#: ../addressbook/gui/widgets/eab-contact-display.c:79
+#: ../addressbook/gui/widgets/eab-contact-display.c:408
 #: ../calendar/gui/e-calendar-view.c:1783
 msgid "Other"
 msgstr "Drugo"
@@ -370,9 +401,9 @@ msgstr "Veb adrese"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:74
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../addressbook/gui/widgets/eab-contact-display.c:1192
+#: ../addressbook/gui/widgets/eab-contact-display.c:77
+#: ../addressbook/gui/widgets/eab-contact-display.c:690
+#: ../addressbook/gui/widgets/eab-contact-display.c:1303
 #: ../widgets/misc/e-contact-map.c:303
 msgid "Work"
 msgstr "Posao"
@@ -399,7 +430,7 @@ msgstr "_Blog:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 #: ../calendar/gui/dialogs/event-page.c:708
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 #: ../plugins/itip-formatter/itip-view.c:1923
 msgid "_Calendar:"
 msgstr "_Kalendar:"
@@ -479,73 +510,73 @@ msgid "_Zip/Postal Code:"
 msgstr "PoÅ_tanski broj:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/widgets/eab-contact-display.c:652
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Jabber"
 msgstr "DÅaber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
 msgid "Yahoo"
-msgstr "Yahoo"
+msgstr "Jahu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:565
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "ICQ"
-msgstr "ICQ"
+msgstr "ICKu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:184
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "GroupWise"
-msgstr "GroupWise"
+msgstr "GroupVajz"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:659
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:219
-#: ../addressbook/gui/widgets/eab-gui-util.c:446
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:220
+#: ../addressbook/gui/widgets/eab-gui-util.c:451
 msgid "Error adding contact"
 msgstr "GreÅka pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:235
 msgid "Error modifying contact"
 msgstr "GreÅka pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
 msgid "Error removing contact"
 msgstr "GreÅka pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:658
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2856
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:669
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2904
 #, c-format
 msgid "Contact Editor - %s"
-msgstr "UreÄivaÄ za kontakte - %s"
+msgstr "UreÄivaÄ za kontakte â %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3383
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3384
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3612
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -553,43 +584,43 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3719
 #, c-format
 msgid "'%s' has an invalid format"
-msgstr "â%sâ ima nevaÅeÄi format"
+msgstr "â%sâ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3623
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
 #, c-format
 msgid "%s'%s' has an invalid format"
-msgstr "%sâ%sâ ima nevaÅeÄi format"
+msgstr "%sâ%sâ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3635
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3646
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3754
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sâ%sâ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3769
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:411
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:431
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:414
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:434
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:462
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:482
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:473
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:493
 msgid "E_mail"
 msgstr "E-_poÅta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:484
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:504
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
@@ -659,7 +690,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:726
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:740
 msgid "Contact List Editor"
 msgstr "UreÄivaÄ kontakt liste"
 
@@ -676,37 +707,37 @@ msgid "_List name:"
 msgstr "Ime _liste:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:164
+#: ../mail/mail-config.ui.h:163
 msgid "_Select..."
 msgstr "Izab_eri..."
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
+msgstr "_UpiÅite elektronsku adresu ili prevucite kontakt u donju listu:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:851
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:863
 msgid "Contact List Members"
 msgstr "Älanovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1416
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1438
 msgid "Error adding list"
 msgstr "GreÅka pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1430
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1453
 msgid "Error modifying list"
 msgstr "GreÅka pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1444
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1468
 msgid "Error removing list"
 msgstr "GreÅka pri uklanjanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1582
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1599
 msgid "_Members"
 msgstr "_Älanovi"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
-msgstr "Promenjen kontakt:"
+msgstr "Izmenjen kontakt:"
 
 #. Translators: Heading of the contact which has same name or email address in this folder already.
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
@@ -719,16 +750,12 @@ msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-#, fuzzy
-#| msgid ""
-#| "The name or email of this contact already exists in this folder.  Would "
-#| "you like to add it anyway?"
 msgid ""
 "The name or email of this contact already exists in this folder. Would you "
 "like to save the changes anyway?"
 msgstr ""
-"Ime ili elektronska adresa ovog kontakta veÄ postoji u ovoj fascikli.  "
-"Åelite li ipak da ga dodate?"
+"Ime ili elektronska adresa ovog kontakta veÄ postoji u ovoj fascikli.  Da li "
+"Åelite ipak da ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
@@ -744,14 +771,14 @@ msgid ""
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
 "Ime ili elektronska adresa ovog kontakta veÄ postoji\n"
-"u ovoj fascikli.  Åelite li ipak da dodate?"
+"u ovoj fascikli.  Da li Åelite ipak da  ga dodate?"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:304
+#: ../addressbook/gui/merging/eab-contact-merging.c:328
 msgid "_Merge"
 msgstr "_Pripoji"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:287
+#: ../addressbook/gui/merging/eab-contact-merging.c:311
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
@@ -759,9 +786,9 @@ msgstr "Pripoji kontakt"
 #: ../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:1059
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "Any field contains"
 msgstr "Polje koje sadrÅi"
 
@@ -775,11 +802,11 @@ msgstr "E-poÅta poÄinje sa"
 msgid "Name contains"
 msgstr "Ime sadrÅi"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:155
+#: ../addressbook/gui/widgets/e-addressbook-model.c:157
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:159
+#: ../addressbook/gui/widgets/e-addressbook-model.c:161
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -788,13 +815,13 @@ msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 msgstr[3] "%d kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:340
+#: ../addressbook/gui/widgets/e-addressbook-model.c:354
 msgid "Error getting book view"
 msgstr "GreÅka pri uÄitavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:751
+#: ../addressbook/gui/widgets/e-addressbook-model.c:768
 msgid "Search Interrupted"
-msgstr "Pretraga prekinuta"
+msgstr "Pretraga je prekinuta"
 
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:156
 msgid "Error modifying card"
@@ -815,44 +842,41 @@ msgstr "Ubacuje kontakte iz spiska iseÄaka"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:642
 #: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Delete selected contacts"
-msgstr "ObriÅi izabrane kontakte"
+msgstr "BriÅe izabrane kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Select all visible contacts"
 msgstr "OznaÄava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "Sigurno Åelite da obriÅete ove kontakt liste?"
+msgstr "Sigurno Åelite da obriÅete ove liste kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1325
 msgid "Are you sure you want to delete this contact list?"
-msgstr "Sigurno Åelite da obriÅete ovu kontakt listu?"
+msgstr "Sigurno Åelite da obriÅete ovu listu kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Sigurno Åelite da obriÅete ovu kontakt listu (%s) ?"
+msgstr "Sigurno Åelite da obriÅete ovu listu kontakta (%s) ?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1335
 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:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1339
 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:1338
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1343
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno Åelite da obriÅete ovaj kontakt (%s) ?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1487
-#, fuzzy, c-format
-#| msgid ""
-#| "Opening %d contacts will open %d new windows as well.\n"
-#| "Do you really want to display all of these contacts?"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
@@ -860,10 +884,10 @@ msgid_plural ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
-"Otvaranje %d kontakta Äe takoÄe otvoriti %d novih prozora.\n"
+"Otvaranje %d kontakta Äe takoÄe otvoriti %d novi prozor.\n"
 "Da li zaista Åelite da prikaÅete sve ove kontakte?"
 msgstr[1] ""
-"Otvaranje %d kontakta Äe takoÄe otvoriti %d novih prozora.\n"
+"Otvaranje %d kontakta Äe takoÄe otvoriti %d nova prozora.\n"
 "Da li zaista Åelite da prikaÅete sve ove kontakte?"
 msgstr[2] ""
 "Otvaranje %d kontakta Äe takoÄe otvoriti %d novih prozora.\n"
@@ -872,16 +896,16 @@ msgstr[3] ""
 "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:1495
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1506
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1496
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1507
 msgid "Display _All Contacts"
 msgstr "PrikaÅi _sve kontakte"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:681
 msgid "Assistant"
 msgstr "PomoÄnik"
 
@@ -910,7 +934,7 @@ msgid "Car Phone"
 msgstr "Telefon u kolima"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 #: ../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
@@ -918,7 +942,7 @@ msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../addressbook/gui/widgets/eab-contact-display.c:676
 msgid "Company"
 msgstr "PreduzeÄe"
 
@@ -967,22 +991,22 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:680
 msgid "Manager"
 msgstr "Rukovodilac"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:614
+#: ../addressbook/gui/widgets/eab-contact-display.c:707
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/widgets/eab-contact-display.c:645
 msgid "Nickname"
 msgstr "Nadimak"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:733
 msgid "Note"
 msgstr "Napomena"
 
@@ -1017,7 +1041,7 @@ msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:618
+#: ../addressbook/gui/widgets/eab-contact-display.c:711
 msgid "Spouse"
 msgstr "SupruÅnik"
 
@@ -1029,7 +1053,7 @@ msgstr "SupruÅnik"
 #. different and established translation for this in your language.
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "TTYTDD"
-msgstr "TTYTDD"
+msgstr "TTUTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
@@ -1045,7 +1069,7 @@ msgstr "Jedinica"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
-msgstr "Veb strana"
+msgstr "Veb stranica"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:192
 msgid ""
@@ -1069,7 +1093,7 @@ msgstr ""
 "\n"
 "PotraÅite kontakt\n"
 "\n"
-"ili kliknite dvaput ovde za pravljenje novog kontakta."
+"ili kliknite dvaput ovde da napravite novi kontakt."
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
@@ -1155,7 +1179,7 @@ msgstr "Otvori"
 
 #: ../addressbook/gui/widgets/ea-minicard.c:156
 msgid "Contact List: "
-msgstr "Kontakt lista: "
+msgstr "Lista kontakta: "
 
 #: ../addressbook/gui/widgets/ea-minicard.c:157
 msgid "Contact: "
@@ -1165,63 +1189,62 @@ msgstr "Kontakt: "
 msgid "evolution minicard"
 msgstr "minikarta evolucije"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:179
+#: ../addressbook/gui/widgets/eab-contact-display.c:182
 msgid "Copy _Email Address"
 msgstr "UmnoÅi elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:430
+#: ../addressbook/gui/widgets/eab-contact-display.c:184
+#: ../widgets/misc/e-web-view.c:432
 msgid "Copy the email address to the clipboard"
 msgstr "UmnoÅava adrese u spisak iseÄaka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:186
-#: ../widgets/misc/e-web-view.c:435
+#: ../addressbook/gui/widgets/eab-contact-display.c:189
+#: ../widgets/misc/e-web-view.c:437
 msgid "_Send New Message To..."
 msgstr "_PoÅalji poruku za..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:188
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../widgets/misc/e-web-view.c:439
 msgid "Send a mail message to this address"
 msgstr "Åalje poruku na ovu adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:210
-#, fuzzy
-#| msgid "Open"
+#: ../addressbook/gui/widgets/eab-contact-display.c:213
 msgid "Open map"
-msgstr "Otvori"
+msgstr "Otvorite mapu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:465
-#: ../addressbook/gui/widgets/eab-contact-display.c:878
-msgid "List Members"
-msgstr "Älanovi liste"
+#: ../addressbook/gui/widgets/eab-contact-display.c:526
+#: ../addressbook/gui/widgets/eab-contact-display.c:554
+msgid "List Members:"
+msgstr "Älanovi liste:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:584
+#: ../addressbook/gui/widgets/eab-contact-display.c:677
 msgid "Department"
 msgstr "_Odeljenje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
+#: ../addressbook/gui/widgets/eab-contact-display.c:678
 msgid "Profession"
 msgstr "_Zanimanje:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../addressbook/gui/widgets/eab-contact-display.c:679
 msgid "Position"
 msgstr "PoloÅaj"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:589
+#: ../addressbook/gui/widgets/eab-contact-display.c:682
 msgid "Video Chat"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
-#: ../modules/calendar/e-cal-shell-view.c:507
+#: ../addressbook/gui/widgets/eab-contact-display.c:683
+#: ../calendar/gui/dialogs/calendar-setup.c:396
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+#: ../modules/calendar/e-cal-shell-view.c:511
+#: ../modules/online-accounts/e-online-accounts-google.c:294
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 #: ../widgets/misc/e-send-options.c:519
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:684
 #: ../calendar/gui/dialogs/event-editor.c:123
 #: ../calendar/gui/dialogs/event-editor.c:350
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
@@ -1229,25 +1252,25 @@ msgstr "Kalendar"
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
-#: ../addressbook/gui/widgets/eab-contact-display.c:613
+#: ../addressbook/gui/widgets/eab-contact-display.c:685
+#: ../addressbook/gui/widgets/eab-contact-display.c:706
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:686
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../addressbook/gui/widgets/eab-contact-display.c:615
+#: ../addressbook/gui/widgets/eab-contact-display.c:687
+#: ../addressbook/gui/widgets/eab-contact-display.c:708
 msgid "Address"
 msgstr "Adresa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/widgets/eab-contact-display.c:703
 msgid "Home Page"
 msgstr "_LiÄna strana:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/widgets/eab-contact-display.c:704
 msgid "Web Log"
 msgstr "_Veb log:"
 
@@ -1258,33 +1281,37 @@ msgstr "_Veb log:"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:620
-#: ../capplet/settings/mail-capplet-shell.c:350
-#: ../modules/addressbook/e-book-shell-backend.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:713
+#: ../capplet/settings/mail-capplet-shell.c:380
+#: ../modules/addressbook/e-book-shell-backend.c:120
 #: ../modules/addressbook/e-book-shell-migrate.c:144
-#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-backend.c:138
 #: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-memo-shell-backend.c:118
+#: ../modules/calendar/e-memo-shell-backend.c:122
 #: ../modules/calendar/e-memo-shell-migrate.c:120
-#: ../modules/calendar/e-task-shell-backend.c:118
+#: ../modules/calendar/e-task-shell-backend.c:122
 #: ../modules/calendar/e-task-shell-migrate.c:132
 msgid "Personal"
 msgstr "LiÄno"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:896
+#: ../addressbook/gui/widgets/eab-contact-display.c:971
+msgid "List Members"
+msgstr "Älanovi liste"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:989
 msgid "Job Title"
 msgstr "Zvanje na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:933
+#: ../addressbook/gui/widgets/eab-contact-display.c:1026
 msgid "Home page"
 msgstr "LiÄna stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:942
+#: ../addressbook/gui/widgets/eab-contact-display.c:1035
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1135
-#: ../widgets/misc/e-web-view.c:954
+#: ../addressbook/gui/widgets/eab-contact-display.c:1233
+#: ../widgets/misc/e-web-view.c:980
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da poÅaljete %s"
@@ -1305,7 +1332,7 @@ 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 "
+"Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
 "imate prava pristupa."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:153
@@ -1322,8 +1349,8 @@ 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."
+"Ne mogu da otvorim ovaj adresar.  To znaÄi da ste ili uneli pogreÅnu adresu, "
+"ili je server nedostupan."
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Detailed error message:"
@@ -1336,8 +1363,8 @@ msgid ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this address book."
 msgstr ""
-"Broj karti koji odgovara upitu je veÄi od broja na koji je server \n"
-"podeÅen da odgovori ili je Evolucija podeÅena da prikaÅe.\n"
+"Broj karti koje odgovaraju upitu je veÄi od broja na koji je server \n"
+"podeÅen da odgovori ili koji je Evolucija podeÅena da prikaÅe.\n"
 "Preciznije oblikujte upit ili poveÄajte ograniÄenje\n"
 "broja rezultata u postavkama adresara za server direktorijuma."
 
@@ -1349,7 +1376,7 @@ msgid ""
 "preferences for this address book."
 msgstr ""
 "Vreme za izvrÅavanje ovog upita je preko ograniÄenja servera ili\n"
-"ograniÄenja koji ste podesili za ovaj adresar. Preciznije oblikujte\n"
+"ograniÄenja koje ste podesili za ovaj adresar. Preciznije oblikujte\n"
 "upit ili poveÄajte vremensko ograniÄenje u postavkama servera\n"
 "direktorijuma za ovaj adresar."
 
@@ -1385,19 +1412,19 @@ msgstr "Izaberi adresar"
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:524
+#: ../addressbook/gui/widgets/eab-gui-util.c:533
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:526
+#: ../addressbook/gui/widgets/eab-gui-util.c:535
 msgid "Copy contact to"
 msgstr "UmnoÅi kontakt u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:529
+#: ../addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:531
+#: ../addressbook/gui/widgets/eab-gui-util.c:540
 msgid "Copy contacts to"
 msgstr "UmnoÅi kontakte u"
 
@@ -1405,44 +1432,44 @@ msgstr "UmnoÅi kontakte u"
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:740
+#: ../addressbook/importers/evolution-csv-importer.c:741
 #: ../addressbook/importers/evolution-ldif-importer.c:539
 #: ../addressbook/importers/evolution-vcard-importer.c:282
-#: ../calendar/importers/icalendar-importer.c:380
-#: ../calendar/importers/icalendar-importer.c:847
-#: ../calendar/importers/icalendar-importer.c:877 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:401
+#: ../calendar/importers/icalendar-importer.c:868
+#: ../calendar/importers/icalendar-importer.c:907 ../shell/shell.error.xml.h:6
 msgid "Importing..."
-msgstr "UvoÅenje..."
+msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1041
+#: ../addressbook/importers/evolution-csv-importer.c:1040
 msgid "Outlook CSV or Tab (.csv, .tab)"
-msgstr "Outlook CSV ili Tab (.csv, .tab)"
+msgstr "Autluk CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1042
+#: ../addressbook/importers/evolution-csv-importer.c:1041
 msgid "Outlook CSV and Tab Importer"
-msgstr "Outlook CSV i Tab uvoznik"
+msgstr "Autluk CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1050
+#: ../addressbook/importers/evolution-csv-importer.c:1049
 msgid "Mozilla CSV or Tab (.csv, .tab)"
-msgstr "Mozilla CSV ili Tab (.csv, .tab)"
+msgstr "Mozila CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1051
+#: ../addressbook/importers/evolution-csv-importer.c:1050
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozila CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1059
+#: ../addressbook/importers/evolution-csv-importer.c:1058
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolucija CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1060
+#: ../addressbook/importers/evolution-csv-importer.c:1059
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolucijin CSV i Tab uvoznik"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:779
+#: ../addressbook/importers/evolution-ldif-importer.c:777
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:780
+#: ../addressbook/importers/evolution-ldif-importer.c:778
 msgid "Evolution LDIF importer"
 msgstr "Evolucija LDIF uvoznik"
 
@@ -1452,44 +1479,42 @@ msgstr "vKarta (.vcf, .gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:649
 msgid "Evolution vCard Importer"
-msgstr "Evolucijin uvoznik vKarti"
+msgstr "Evolucijin vKart uvoznik"
 
 #. 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:714
+#: ../addressbook/printing/e-contact-print.c:716
 #, c-format
 msgid "Page %d"
-msgstr "%d. stranica"
+msgstr "%d stranica"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:645
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:680
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:53
 msgid "Can not open file"
-msgstr "Datoteka ne moÅe biti otvorena"
+msgstr "Ne mogu da otvorim datoteku"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
-#, fuzzy, c-format
-#| msgid "Couldn't get list of address books"
+#, c-format
 msgid "Couldn't get list of address books: %s"
-msgstr "Lista adresara nije dostupna"
+msgstr "Ne mogu da dobavim listu adresara: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
 #: ../calendar/gui/dialogs/event-page.c:2893
 #: ../calendar/gui/dialogs/memo-page.c:926
-#: ../calendar/gui/dialogs/task-page.c:1810 ../em-format/em-format.c:2313
-#: ../mail/em-folder-tree.c:678 ../mail/mail-ops.c:657
+#: ../calendar/gui/dialogs/task-page.c:1739 ../em-format/em-format.c:2316
+#: ../mail/em-folder-tree.c:695 ../mail/mail-ops.c:658
 #: ../plugins/caldav/caldav-browse-server.c:209
 #: ../plugins/caldav/caldav-browse-server.c:1406 ../plugins/face/face.c:169
-#: ../smime/gui/certificate-manager.c:313
+#: ../smime/gui/certificate-manager.c:312
 msgid "Unknown error"
 msgstr "Nepoznata greÅka"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s'"
+#, c-format
 msgid "Failed to open client '%s': %s"
-msgstr "Nije moguÄe otvaranje kalendara â%sâ"
+msgstr "Nisam uspeo da otvorim â%sâ: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Specify the output file instead of standard output"
@@ -1501,11 +1526,11 @@ msgstr "IZLAZNA-DATOTEKA"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:64
 msgid "List local address book folders"
-msgstr "Spisak fascikli lokalnog adresara"
+msgstr "Navodi fascikle lokalnog adresara"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:67
 msgid "Show cards as vcard or csv file"
-msgstr "PrikaÅi karte kao vkartu ili csv datoteku"
+msgstr "Prikazuje karte kao vkartu ili csv datoteku"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:68
 msgid "[vcard|csv]"
@@ -1513,7 +1538,7 @@ msgstr "[vcard|csv]"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:71
 msgid "Export in asynchronous mode"
-msgstr "Izvezi u neusklaÄenom reÅimu"
+msgstr "Izvozi u neusklaÄenom reÅimu"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:74
 msgid ""
@@ -1521,7 +1546,7 @@ msgid ""
 "100."
 msgstr ""
 "Broj karti u jednoj izlaznoj datoteci u neusklaÄenom reÅimu, podrazumevana "
-"veliÄina 100."
+"veliÄina je 100."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:76
 msgid "NUMBER"
@@ -1531,12 +1556,12 @@ msgstr "BROJ"
 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 "
+"GreÅka u argumentima naredbe, koristite opciju â--helpâ da vidite kako se "
 "koristi."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:152
 msgid "Only support csv or vcard format."
-msgstr "PodrÅava samo csv ili vcard oblik."
+msgstr "PodrÅava samo csv ili vkard oblik."
 
 #: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "In async mode, output must be file."
@@ -1565,80 +1590,80 @@ 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 â{0}â je samo za Äitanje i ne moÅe biti izmenjen. Izaberite drugi "
 "kalendar koji prihvata zakazivanje."
 
 #: ../calendar/calendar.error.xml.h:5
-#, 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."
+"Ako dodate smisaoni saÅetak vaÅem zakazivanju biÄe vam jasnije u vezi Äega je "
+"vaÅ sastanak."
 
 #: ../calendar/calendar.error.xml.h:6
-#, 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."
+"Ako dodate smisaoni saÅetak vaÅem zadatku biÄe vam jasnije u vezi Äega je "
+"vaÅ zadatak."
 
 #: ../calendar/calendar.error.xml.h:7
 msgid "All information in these memos will be deleted and can not be restored."
-msgstr "Svi podaci u ovim beleÅkama biÄe obrisani i neÄe se moÄi povratiti."
+msgstr ""
+"Svi podaci u ovim beleÅkama biÄe obrisani i neÄe biti moguÄ njihov povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:8
 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."
+msgstr ""
+"Svi podaci u ovoj beleÅci biÄe obrisani i neÄe biti moguÄ njihov povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:9
 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."
+msgstr ""
+"Svi podaci o ovim zakazivanjima biÄe obrisani i neÄe biti moguÄ njihov "
+"povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr "Svi podaci o ovim zadacima biÄe uklonjeni i neÄe se moÄi povratiti."
+msgstr ""
+"Svi podaci o ovim zadacima biÄe uklonjeni i neÄe biti moguÄ njihov povraÄaj."
 
 # 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."
+"Svi podaci o ovom zakazivanju biÄe obrisani i neÄe biti moguÄ njihov povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:12
 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."
+msgstr ""
+"Svi podaci o ovom sastanku biÄe uklonjeni i neÄe biti moguÄ njihov povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:13
 msgid "All information on this memo will be deleted and can not be restored."
-msgstr "Svi podaci u ovoj beleÅci Äe biti uklonjeni i neÄe se moÄi povratiti."
+msgstr ""
+"Svi podaci u ovoj beleÅci biÄe uklonjeni i neÄe biti moguÄ njihov povraÄaj."
 
 # calendar:prompt-delete-named-task secondary
 # calendar:prompt-delete-task secondary
 #: ../calendar/calendar.error.xml.h:14
 msgid "All information on this task will be deleted and can not be restored."
-msgstr "Svi podaci o ovom zadatku Äe biti obrisani i neÄe se moÄi povratiti."
+msgstr ""
+"Svi podaci o ovom zadatku biÄe obrisani i neÄe biti moguÄ njihov povraÄaj."
 
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "Sigurno Åelite da obriÅete â{0}â zadatak?"
+msgstr "Sigurno Åelite da obriÅete zadatak â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "Sigurno Åelite da obriÅete zakazivanje nazvano â{0}â?"
+msgstr "Sigurno Åelite da obriÅete zakazivanje nazvano â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
@@ -1646,7 +1671,7 @@ msgstr "Sigurno Åelite da obriÅete sastanak nazvan â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
-msgstr "Sigurno Åelite da obriÅete beleÅku â{0}â ?"
+msgstr "Sigurno Åelite da obriÅete beleÅku â{0}â?"
 
 # bug: plural-forms
 #: ../calendar/calendar.error.xml.h:19
@@ -1676,7 +1701,7 @@ msgstr "Sigurno Åelite da obriÅete ovaj sastanak?"
 #: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this memo?"
-msgstr "Sigurno Åelite da obriÅete ovau beleÅku?"
+msgstr "Sigurno Åelite da obriÅete ovu beleÅku?"
 
 #: ../calendar/calendar.error.xml.h:25
 #: ../calendar/gui/dialogs/delete-comp.c:190
@@ -1685,40 +1710,36 @@ msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno Åelite da obriÅete ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:26
-#, 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?"
+msgstr "Sigurno Åelite da saÄuvate zakazivanje bez saÅetka?"
 
 #: ../calendar/calendar.error.xml.h:27
 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
-#, 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?"
+msgstr "Sigurno Åelite da saÄuvate zadatak bez saÅetka?"
 
 #: ../calendar/calendar.error.xml.h:29
 msgid "Cannot create a new event"
-msgstr "Nije moguÄe napraviti novi dogaÄaj"
+msgstr "Ne mogu da napravim novi dogaÄaj"
 
 #: ../calendar/calendar.error.xml.h:30
 msgid "Cannot save event"
-msgstr "Nije moguÄe saÄuvati dogaÄaj"
+msgstr "Ne mogu da saÄuvam dogaÄaj"
 
 #: ../calendar/calendar.error.xml.h:31
 msgid "Delete calendar '{0}'?"
-msgstr "Obrisati kalendar â{0}â?"
+msgstr "Da obriÅem kalendar â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid "Delete memo list '{0}'?"
-msgstr "Obrisati spisak beleÅki â{0}â?"
+msgstr "Da obriÅem spisak beleÅki â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:33
 msgid "Delete task list '{0}'?"
-msgstr "Obrisati spisak zadataka â{0}â?"
+msgstr "Da obriÅem spisak zadataka â{0}â?"
 
 #: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
@@ -1726,11 +1747,11 @@ msgstr "Ne Åalj_i"
 
 #: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Preuzimanje u toku. Åelite li da saÄuvate zakazivanje?"
+msgstr "Preuzimanje je u toku. Åelite li da saÄuvate zakazivanje?"
 
 #: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
-msgstr "Preuzimanje u toku. Åelite li da saÄuvate zadatak?"
+msgstr "Preuzimanje je u toku. Åelite li da saÄuvate zadatak?"
 
 #: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
@@ -1744,7 +1765,7 @@ msgstr ""
 "Pozivnice e-poÅtom biÄe poslate svim uÄesnicima da bi mogli da prihvate ovaj "
 "zadatak."
 
-# bug: what's RSVP?
+# bug: what's RSVP? - francuski: RÃpondre s'il vous plait - Molim vas odgovorite.
 #: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
@@ -1767,10 +1788,8 @@ msgstr "GreÅka pri uÄitavanju spiska zadataka"
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:46
-#, fuzzy
-#| msgid "Error saving {0} to {1}: {2}"
 msgid "Error on {0}: {1}"
-msgstr "GreÅka pri Äuvanju {0} u {1}: {2}"
+msgstr "GreÅka {0}a: {1}"
 
 #: ../calendar/calendar.error.xml.h:47
 msgid ""
@@ -1802,7 +1821,7 @@ msgid ""
 "calendars up to date."
 msgstr ""
 "Slanje osveÅenih podataka omoguÄava ostalim uÄesnicima da njihov kalendar bude "
-"u toku."
+"osveÅen."
 
 #: ../calendar/calendar.error.xml.h:51
 msgid ""
@@ -1810,15 +1829,15 @@ msgid ""
 "lists up to date."
 msgstr ""
 "Slanje osveÅenih podataka omoguÄava ostalim uÄesnicima da njihov spisak "
-"zadataka bude u toku."
+"zadataka bude osveÅen."
 
 #: ../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."
+"Preuzimanje nekoliko priloga je u toku. Ukoliko sada saÄuvate zakazivanje ovi "
+"prilozi neÄe biti saÄuvani sa njim."
 
 #: ../calendar/calendar.error.xml.h:53
 msgid ""
@@ -1874,7 +1893,7 @@ msgstr "Ovaj spisak zadataka Äe biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:65
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Åelite li da saÄuvate promene u zakazivanju?"
+msgstr "Åelite li da saÄuvate izmene u zakazivanju?"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Would you like to save your changes to this meeting?"
@@ -1882,11 +1901,11 @@ msgstr "Åelite li da saÄuvate izmene na ovom sastanku?"
 
 #: ../calendar/calendar.error.xml.h:67
 msgid "Would you like to save your changes to this memo?"
-msgstr "Åelite li da saÄuvate promene na ovoj beleÅci?"
+msgstr "Åelite li da saÄuvate izmene na ovoj beleÅci?"
 
 #: ../calendar/calendar.error.xml.h:68
 msgid "Would you like to save your changes to this task?"
-msgstr "Åelite li da saÄuvate promene na ovom zadatku?"
+msgstr "Åelite li da saÄuvate izmene na ovom zadatku?"
 
 #: ../calendar/calendar.error.xml.h:69
 msgid "Would you like to send a cancelation notice for this memo?"
@@ -1899,19 +1918,19 @@ msgstr "Åelite li da poÅaljete svim uÄesnicima obaveÅtenje o otkazivanju?"
 
 #: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to send meeting invitations to participants?"
-msgstr "Åelite li da poÅaljete pozive na sastanak uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima pozive na sastanak?"
 
 #: ../calendar/calendar.error.xml.h:72
 msgid "Would you like to send this task to participants?"
-msgstr "Åelite li da poÅaljete ovaj zadatak uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima ovaj zadatak?"
 
 #: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to send updated meeting information to participants?"
-msgstr "Åelite li da poÅaljete osveÅene podatke o sastanku uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima osveÅene podatke o sastanku?"
 
 #: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to send updated task information to participants?"
-msgstr "Åelite li da poÅaljete osveÅene podatke o zadatku uÄesnicima?"
+msgstr "Åelite li da poÅaljete uÄesnicima osveÅene podatke o zadatku?"
 
 #: ../calendar/calendar.error.xml.h:75
 msgid ""
@@ -1919,41 +1938,41 @@ msgid ""
 "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 "
+"Povezujete se na nepodrÅan GroupVajz 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:76
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "Promenili ste ovaj zakazivanje, ali promene joÅ niste saÄuvali."
+msgstr "Izmenili ste ovo zakazivanje, ali joÅ niste saÄuvali."
 
 #: ../calendar/calendar.error.xml.h:77
 msgid "You have changed this meeting, but not yet saved it."
-msgstr "Izmenili ste ovaj sastanak, ali izmene joÅ nisu saÄuvane."
+msgstr "Izmenili ste ovaj sastanak, ali joÅ niste saÄuvali."
 
 #: ../calendar/calendar.error.xml.h:78
 msgid "You have changed this task, but not yet saved it."
-msgstr "Promenili ste ovaj zadatak, ali promene joÅ niste saÄuvali."
+msgstr "Izmenili ste ovaj zadatak, ali joÅ niste saÄuvali."
 
 #: ../calendar/calendar.error.xml.h:79
 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."
+msgstr "Izmenili ste ovu beleÅku, ali joÅ niste saÄuvali."
 
 #: ../calendar/calendar.error.xml.h:80
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr "Kalendari neÄe biti dostupni dok se Evolucija ponovo ne pokrene."
+msgstr "Kalendari neÄe biti dostupni sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:81
 msgid "Your memos will not be available until Evolution is restarted."
-msgstr "BeleÅka neÄe biti dostupna dok se Evolucija ponovo ne pokrene."
+msgstr "BeleÅke neÄe biti dostupne sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:82
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr "Zadaci neÄe biti dostupni dok se Evolucija ponovo ne pokrene."
+msgstr "Zadaci neÄe biti dostupni sve dok ponovo ne pokrenete Evoluciju."
 
 #: ../calendar/calendar.error.xml.h:83
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
-msgstr "_Zanemari promene"
+msgstr "_Odbaci izmene"
 
 #: ../calendar/calendar.error.xml.h:84 ../composer/e-composer-actions.c:317
 msgid "_Save"
@@ -1961,10 +1980,10 @@ msgstr "_SaÄuvaj"
 
 #: ../calendar/calendar.error.xml.h:85
 msgid "_Save Changes"
-msgstr "SaÄuvaj pro_mene"
+msgstr "SaÄuvaj iz_mene"
 
 #: ../calendar/calendar.error.xml.h:86
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:164
+#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:165
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_PoÅalji"
@@ -1994,15 +2013,13 @@ msgstr[3] "sat"
 #. (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/alarm-notify/alarm-notify-dialog.c:129
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
-#, fuzzy
-#| msgid "day"
+#: ../calendar/gui/dialogs/recurrence-page.c:1125
 msgid "day"
 msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dan"
-msgstr[2] "dan"
-msgstr[3] "dan"
+msgstr[0] "dana"
+msgstr[1] "dana"
+msgstr[2] "dana"
+msgstr[3] "dana"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:303
 msgid "Start time"
@@ -2018,8 +2035,8 @@ msgstr "Zanemari _sve"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1734
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1744
 #: ../plugins/itip-formatter/itip-view.c:1045
 msgid "Location:"
 msgstr "Lokacija:"
@@ -2041,11 +2058,9 @@ msgstr "Dre_manje"
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:428
-#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:350
 #: ../plugins/google-account-setup/google-contacts-source.c:379
 #: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#, fuzzy
-#| msgid "days"
 msgid "days"
 msgstr "dana"
 
@@ -2071,49 +2086,50 @@ msgstr "zakazana lokacija"
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1526
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1653
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1586
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1715
 msgid "No summary available."
 msgstr "Nema dostupnog saÅetka."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1535
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1595
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1545
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1605
 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:1589
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1649
 #, fuzzy, c-format
-#| msgid "You have %d alarms"
-msgid "You have %d alarm"
-msgid_plural "You have %d alarms"
-msgstr[0] "Broj postavljenih alarma: %d"
-msgstr[1] "Broj postavljenih alarma: %d"
-msgstr[2] "Broj postavljenih alarma: %d"
-msgstr[3] "Broj postavljenih alarma: %d"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1780
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1813
+#| msgid "You have %d alarm"
+#| msgid_plural "You have %d alarms"
+msgid "You have %d reminder"
+msgid_plural "You have %d reminders"
+msgstr[0] "Imate %d alarm"
+msgstr[1] "Imate %d alarma"
+msgstr[2] "Imate %d alarma"
+msgstr[3] "Imate jedan alarm"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1848
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1882
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1784
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1852
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"Evolucija joÅ ne podrÅava kalendarske podsetnike\n"
-"sa obaveÅtenjima putem e-poÅte, ali je ovaj\n"
-"podsetnik podeÅen da poÅalje poruku. Evolucija Äe\n"
+"Evolucija joÅ uvek ne podrÅava kalendarske podsetnike\n"
+"sa obaveÅtenjima putem e-poÅte, ali ovaj podsetnik\n"
+"je podeÅen da poÅalje poruku. Evolucija Äe\n"
 "umesto toga prikazati normalno prozorÄe."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1819
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1888
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2123,14 +2139,14 @@ msgid ""
 "\n"
 "Are you sure you want to run this program?"
 msgstr ""
-"Podsetnik Evolucija kalendara Äe biti pokrenut. Ovaj podsetnik je podeÅen da "
+"Podsetnik kalendara Evolucije Äe biti pokrenut. Ovaj podsetnik je podeÅen da "
 "pokrene sledeÄi program:\n"
 "\n"
 "        %s\n"
 "\n"
-"Sigurno Åelite da pokrenete ovaj program?"
+"Da li ste sigurni da Åelite da pokrenete ovaj program?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1834
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1903
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -2147,7 +2163,7 @@ msgid_plural "%d hours"
 msgstr[0] "%d sat"
 msgstr[1] "%d sata"
 msgstr[2] "%d sati"
-msgstr[3] "%d sat"
+msgstr[3] "Jedan 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:402
@@ -2158,7 +2174,7 @@ msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
-msgstr[3] "%d minut"
+msgstr[3] "Jedan 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"
@@ -2171,7 +2187,7 @@ msgid_plural "%d seconds"
 msgstr[0] "%d sekunda"
 msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
-msgstr[3] "%d sekunda"
+msgstr[3] "Jedna sekunda"
 
 #: ../calendar/gui/calendar-view-factory.c:116
 msgid "Day View"
@@ -2203,7 +2219,7 @@ msgstr "Prilozi"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 #: ../calendar/gui/tasktypes.xml.h:6
 msgid "Attendee"
-msgstr "_UÄesnik"
+msgstr "UÄesnik"
 
 #: ../calendar/gui/caltypes.xml.h:5 ../calendar/gui/memotypes.xml.h:4
 #: ../calendar/gui/tasktypes.xml.h:8
@@ -2215,7 +2231,7 @@ msgid "Classification"
 msgstr "Razvrstavanje"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:759 ../calendar/gui/e-task-table.c:492
+#: ../calendar/gui/e-cal-model.c:774 ../calendar/gui/e-task-table.c:495
 #: ../calendar/gui/memotypes.xml.h:6 ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Poverljivo"
@@ -2247,7 +2263,7 @@ msgstr "Postoji"
 #: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
 #: ../plugins/publish-calendar/publish-calendar.c:835
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Mesto"
 
@@ -2257,14 +2273,14 @@ msgid "Organizer"
 msgstr "Organizator"
 
 #: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:239
-#: ../calendar/gui/e-cal-model.c:757 ../calendar/gui/e-task-table.c:491
+#: ../calendar/gui/e-cal-model.c:772 ../calendar/gui/e-task-table.c:494
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "LiÄno"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:238
-#: ../calendar/gui/e-cal-model.c:748 ../calendar/gui/e-cal-model.c:755
-#: ../calendar/gui/e-task-table.c:490 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:763 ../calendar/gui/e-cal-model.c:770
+#: ../calendar/gui/e-task-table.c:493 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "Javno"
 
@@ -2280,7 +2296,7 @@ msgstr "UÄestalost"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:372
 msgid "Summary"
 msgstr "SaÅetak"
 
@@ -2310,8 +2326,10 @@ msgid "is not"
 msgstr "nije"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:626
-msgid "Edit Alarm"
-msgstr "Navij sat"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Edit Reminder"
+msgstr "Podsetnik!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:817
 #: ../calendar/gui/e-alarm-list.c:438
@@ -2334,37 +2352,43 @@ msgid "Send an email"
 msgstr "Åalje elektronsku poruku"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "Add Alarm"
-msgstr "Dodaj alarm"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Add Reminder"
+msgstr "Podsetnik!"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-editor.c:360
-msgid "Alarm"
-msgstr "Alarm"
+msgid "Custom _message"
+msgstr "Proizvoljna _poruka"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "Custom _message"
-msgstr "PrilagoÄena _poruka"
+#, fuzzy
+#| msgid "Custom alarm sound"
+msgid "Custom reminder sound"
+msgstr "Proizvoljan zvuk alarma"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-msgid "Custom alarm sound"
-msgstr "PrilagoÄen zvuk alarma"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:75
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5 ../mail/mail-config.ui.h:75
 msgid "Options"
 msgstr "Opcije"
 
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../calendar/gui/dialogs/event-editor.c:360
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminder"
+msgstr "Podsetnik!"
+
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Repeat"
 msgstr "Ponovi"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
-msgstr "Izaberite datoteku"
+msgstr "Izaberi datoteku"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
@@ -2379,7 +2403,9 @@ msgid "_Program:"
 msgstr "_Program:"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the alarm"
+#, fuzzy
+#| msgid "_Repeat the alarm"
+msgid "_Repeat the reminder"
 msgstr "Po_novi alarm"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
@@ -2402,7 +2428,7 @@ msgstr "dan(i)"
 msgid "end of appointment"
 msgstr "kraj sastanka"
 
-#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence: 'Repeat the reminder %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"
@@ -2429,87 +2455,90 @@ msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/event-page.ui.h:1
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
-msgid "Alarms"
-msgstr "Alarmi"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../modules/calendar/e-calendar-preferences.ui.h:24
+#, fuzzy
+#| msgid "Reminder!"
+msgid "Reminders"
+msgstr "Podsetnik!"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:159
+#: ../calendar/gui/dialogs/calendar-setup.c:164
 msgid "Type:"
 msgstr "Tip:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:175
-#: ../modules/addressbook/addressbook-config.c:511
+#: ../calendar/gui/dialogs/calendar-setup.c:180
+#: ../modules/addressbook/addressbook-config.c:516
 msgid "_Type:"
 msgstr "_Tip:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:232 ../mail/mail-config.ui.h:156
+#: ../calendar/gui/dialogs/calendar-setup.c:242 ../mail/mail-config.ui.h:155
 #: ../modules/addressbook/ldap-config.ui.h:26
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:284
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:276
+#: ../calendar/gui/dialogs/calendar-setup.c:291
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "_UmnoÅava sadrÅaj kalendara lokalno za rad van mreÅe"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:278
+#: ../calendar/gui/dialogs/calendar-setup.c:293
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "_UmnoÅava sadrÅaj spiska zadataka lokalno za rad van mreÅe"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:280
+#: ../calendar/gui/dialogs/calendar-setup.c:295
 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:352
+#: ../calendar/gui/dialogs/calendar-setup.c:372
 msgid "Colo_r:"
 msgstr "Boj_a:"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:375
-#: ../calendar/gui/dialogs/calendar-setup.c:386
-#: ../calendar/gui/dialogs/calendar-setup.c:397
-#: ../mail/em-folder-properties.c:232 ../mail/mail-config.ui.h:52
-#: ../modules/addressbook/addressbook-config.c:1012
+#: ../calendar/gui/dialogs/calendar-setup.c:395
+#: ../calendar/gui/dialogs/calendar-setup.c:406
+#: ../calendar/gui/dialogs/calendar-setup.c:417
+#: ../mail/em-folder-properties.c:233 ../mail/mail-config.ui.h:52
+#: ../modules/addressbook/addressbook-config.c:1052
+#: ../modules/addressbook/autocompletion-config.c:218
 #: ../modules/calendar/e-calendar-preferences.ui.h:19
-#: ../plugins/itip-formatter/itip-formatter.c:2946
+#: ../plugins/itip-formatter/itip-formatter.c:3001
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
 msgstr "OpÅte"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:387
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:407
+#: ../modules/calendar/e-calendar-preferences.ui.h:41
 msgid "Task List"
 msgstr "Spisak zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:398
+#: ../calendar/gui/dialogs/calendar-setup.c:418
 msgid "Memo List"
 msgstr "Spisak beleÅki"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:483
+#: ../calendar/gui/dialogs/calendar-setup.c:506
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:539
+#: ../calendar/gui/dialogs/calendar-setup.c:565
 msgid "New Task List"
-msgstr "No_vi spisak zadataka"
+msgstr "Novi spisak zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:595
+#: ../calendar/gui/dialogs/calendar-setup.c:624
 msgid "New Memo List"
-msgstr "Novi spisak zadataka"
+msgstr "Novi spisak beleÅke"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -2526,372 +2555,366 @@ msgstr "Ova beleÅka je obrisana."
 #: ../calendar/gui/dialogs/changed-comp.c:76
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  NaÄinili ste promene. Zanemariti ih i zatvoriti ureÄivaÄ?"
+msgstr ""
+"%s  NaÄinili ste izmene. Da zanemarim te izmene i da zatvorim ureÄivaÄ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Niste naÄinili promene, zatvoriti ureÄivaÄ?"
+msgstr "%s  Niste naÄinili izmene, da zatvorim ureÄivaÄ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:83
 msgid "This event has been changed."
-msgstr "Ovaj dogaÄaj je promenjen."
+msgstr "Ovaj dogaÄaj je izmenjen."
 
 #: ../calendar/gui/dialogs/changed-comp.c:87
 msgid "This task has been changed."
-msgstr "Ovaj zadatak je promenjen."
+msgstr "Ovaj zadatak je izmenjen."
 
 #: ../calendar/gui/dialogs/changed-comp.c:91
 msgid "This memo has been changed."
-msgstr "Ova beleÅka je promenjena."
+msgstr "Ova beleÅka je izmenjena."
 
 #: ../calendar/gui/dialogs/changed-comp.c:100
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  NaÄinili ste promene. Zanemariti ih i osveÅiti ureÄivaÄ?"
+msgstr "%s  NaÄinili ste izmene. Da zanemarim te izmene i da osveÅim ureÄivaÄ?"
 
 #: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Niste naÄinili promene, osveÅiti ureÄivaÄ?"
+msgstr "%s  Niste naÄinili izmene, da osveÅim ureÄivaÄ?"
 
 #: ../calendar/gui/dialogs/comp-editor-page.c:458
 #, c-format
 msgid "Validation error: %s"
 msgstr "GreÅka provere: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:267
+#: ../calendar/gui/dialogs/comp-editor.c:273
 msgid "Could not save attachments"
-msgstr "Nije moguÄe saÄuvati priloge"
+msgstr "Ne mogu da saÄuvam priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:588
+#: ../calendar/gui/dialogs/comp-editor.c:611
 msgid "Could not update object"
-msgstr "Nije moguÄe osveÅiti objekat"
+msgstr "Ne mogu da osveÅim objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:714
+#: ../calendar/gui/dialogs/comp-editor.c:739
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:721
+#: ../calendar/gui/dialogs/comp-editor.c:746
 #, c-format
 msgid "Meeting - %s"
-msgstr "Sastanak - %s"
+msgstr "Sastanak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:723
+#: ../calendar/gui/dialogs/comp-editor.c:748
 #, c-format
 msgid "Appointment - %s"
-msgstr "Zakazivanje - %s"
+msgstr "Zakazivanje â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:729
+#: ../calendar/gui/dialogs/comp-editor.c:754
 #, c-format
 msgid "Assigned Task - %s"
-msgstr "Dodeljen zadatak - %s"
+msgstr "Dodeljen zadatak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:731
+#: ../calendar/gui/dialogs/comp-editor.c:756
 #, c-format
 msgid "Task - %s"
-msgstr "Zadatak - %s"
+msgstr "Zadatak â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:736
+#: ../calendar/gui/dialogs/comp-editor.c:761
 #, c-format
 msgid "Memo - %s"
-msgstr "BeleÅka - %s"
+msgstr "BeleÅka â %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:752
+#: ../calendar/gui/dialogs/comp-editor.c:777
 msgid "No Summary"
 msgstr "Bez saÅetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:873
+#: ../calendar/gui/dialogs/comp-editor.c:898
 msgid "Keep original item?"
 msgstr "ZadrÅati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-msgid "Click here to close the current window"
-msgstr "Pritisnite ovde da zatvorite tekuÄi prozor"
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+msgid "Close the current window"
+msgstr "Zatvorite trenutni prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1077 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1106 ../mail/e-mail-browser.c:141
+#: ../shell/e-shell-window-actions.c:1455
 #: ../widgets/misc/e-focus-tracker.c:117 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:457 ../widgets/misc/e-web-view.c:1280
+#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
 msgid "Copy the selection"
-msgstr "UmnoÅi izabrano"
+msgstr "UmnoÅite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1084 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../calendar/gui/dialogs/comp-editor.c:1113 ../mail/e-mail-browser.c:148
+#: ../shell/e-shell-window-actions.c:1462
 #: ../widgets/misc/e-focus-tracker.c:110 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:1274
+#: ../widgets/misc/e-web-view.c:1300
 msgid "Cut the selection"
-msgstr "Iseci izabrano"
+msgstr "Isecite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1091
-#: ../shell/e-shell-window-actions.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1120
+#: ../shell/e-shell-window-actions.c:1469
 #: ../widgets/misc/e-focus-tracker.c:131 ../widgets/misc/e-focus-tracker.c:565
 msgid "Delete the selection"
-msgstr "ObriÅi izbor"
+msgstr "ObriÅite izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1098
-msgid "Click here to view help available"
-msgstr "Pritisnite ovde za dostupnu pomoÄ"
+#: ../calendar/gui/dialogs/comp-editor.c:1127
+msgid "View help"
+msgstr "Pogledaj pomoÄ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1105 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1523
+#: ../calendar/gui/dialogs/comp-editor.c:1134 ../mail/e-mail-browser.c:155
+#: ../shell/e-shell-window-actions.c:1497
 #: ../widgets/misc/e-focus-tracker.c:124 ../widgets/misc/e-focus-tracker.c:560
-#: ../widgets/misc/e-web-view.c:1286
+#: ../widgets/misc/e-web-view.c:1312
 msgid "Paste the clipboard"
-msgstr "Ubaci iz spiska iseÄaka"
+msgstr "Ubacite iz spiska iseÄaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-msgid "Click here to save the current window"
-msgstr "Pritisnite ovde da saÄuvate tekuÄi prozor"
+#: ../calendar/gui/dialogs/comp-editor.c:1155
+msgid "Save current changes"
+msgstr "SaÄuvajte tekuÄe izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1133 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1162 ../mail/e-mail-browser.c:162
+#: ../shell/e-shell-window-actions.c:1574
 #: ../widgets/misc/e-focus-tracker.c:138 ../widgets/misc/e-focus-tracker.c:570
 msgid "Select all text"
-msgstr "Izaberi sav tekst"
+msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1140
+#: ../calendar/gui/dialogs/comp-editor.c:1169
 msgid "_Classification"
 msgstr "Ozna_ka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1176
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:176
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1602
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_UreÄivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1154 ../mail/e-mail-browser.c:169
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1183 ../mail/e-mail-browser.c:169
+#: ../shell/e-shell-window-actions.c:1609
 #: ../widgets/misc/e-signature-editor.c:221
 msgid "_File"
 msgstr "Dato_teka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1161
-#: ../shell/e-shell-window-actions.c:1642
+#: ../calendar/gui/dialogs/comp-editor.c:1190
+#: ../shell/e-shell-window-actions.c:1616
 msgid "_Help"
 msgstr "_PomoÄ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1168
+#: ../calendar/gui/dialogs/comp-editor.c:1197
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1175
+#: ../calendar/gui/dialogs/comp-editor.c:1204
 #: ../composer/e-composer-actions.c:340
 msgid "_Options"
 msgstr "_Opcije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1182 ../mail/e-mail-browser.c:183
-#: ../shell/e-shell-window-actions.c:1677 ../smime/gui/smime-ui.ui.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1211 ../mail/e-mail-browser.c:183
+#: ../shell/e-shell-window-actions.c:1651 ../smime/gui/smime-ui.ui.h:46
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../composer/e-composer-actions.c:289
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1194
-msgid "Click here to attach a file"
-msgstr "Pritisnite ovde da priloÅite dokument"
+#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../composer/e-composer-actions.c:291
+#: ../widgets/misc/e-attachment-view.c:439
+msgid "Attach a file"
+msgstr "PriloÅite datoteku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1202
+#: ../calendar/gui/dialogs/comp-editor.c:1231
 msgid "_Categories"
 msgstr "Ka_tegorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1204
+#: ../calendar/gui/dialogs/comp-editor.c:1233
 msgid "Toggles whether to display categories"
-msgstr "Bira da li da prikaÅe kategorije"
+msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1210
+#: ../calendar/gui/dialogs/comp-editor.c:1239
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../calendar/gui/dialogs/comp-editor.c:1241
 msgid "Toggles whether the time zone is displayed"
-msgstr "Bira da li da prikaÅe vremensku zonu"
+msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1221
+#: ../calendar/gui/dialogs/comp-editor.c:1250
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1223
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "Classify as public"
-msgstr "OznaÄi kao javno"
+msgstr "OznaÄite kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1228
+#: ../calendar/gui/dialogs/comp-editor.c:1257
 msgid "_Private"
 msgstr "L_iÄno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1230
+#: ../calendar/gui/dialogs/comp-editor.c:1259
 msgid "Classify as private"
-msgstr "OznaÄi kao liÄno"
+msgstr "OznaÄite kao liÄno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/comp-editor.c:1264
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237
+#: ../calendar/gui/dialogs/comp-editor.c:1266
 msgid "Classify as confidential"
-msgstr "OznaÄi kao poverljivo"
+msgstr "OznaÄite kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245
+#: ../calendar/gui/dialogs/comp-editor.c:1274
 msgid "R_ole Field"
-msgstr "_Uloga polje"
+msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1247
+#: ../calendar/gui/dialogs/comp-editor.c:1276
 msgid "Toggles whether the Role field is displayed"
-msgstr "Bira da li je polje Uloga prikazano"
+msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1253
+#: ../calendar/gui/dialogs/comp-editor.c:1282
 msgid "_RSVP"
-msgstr "_RSVP"
+msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
+#: ../calendar/gui/dialogs/comp-editor.c:1284
 msgid "Toggles whether the RSVP field is displayed"
-msgstr "Bira da li je polje RSVP prikazano"
+msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1261
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Status Field"
-msgstr "_Stanje polje"
+msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether the Status field is displayed"
-msgstr "Bira da li da prikaÅe polje statusa"
+msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "_Type Field"
-msgstr "_Tip polja"
+msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Bira da li je prikazan tip prisutnih"
+msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1295
+#: ../calendar/gui/dialogs/comp-editor.c:1324
 #: ../composer/e-composer-private.c:77
 msgid "Recent _Documents"
 msgstr "SkoraÅnji _dokumenti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2017
+#: ../calendar/gui/dialogs/comp-editor.c:2053
 #: ../composer/e-composer-actions.c:508
 msgid "Attach"
 msgstr "PriloÅi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2353
-#: ../calendar/gui/dialogs/comp-editor.c:2516
-#: ../calendar/gui/dialogs/comp-editor.c:3494
+#: ../calendar/gui/dialogs/comp-editor.c:2389
+#: ../calendar/gui/dialogs/comp-editor.c:2552
+#: ../calendar/gui/dialogs/comp-editor.c:3533
 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"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3458
+#: ../calendar/gui/dialogs/comp-editor.c:3497
 #: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3526
+#: ../calendar/gui/dialogs/comp-editor.c:3565
 msgid "Unable to use current version!"
-msgstr "Nije moguÄe koriÅÄenje tekuÄe verzije!"
+msgstr "Ne mogu da koristim trenutno izdanje!"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:111
 msgid "Could not open destination"
-msgstr "Nije moguÄe otvaranje odrediÅta"
+msgstr "Ne mogu da otvorim odrediÅte"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:123
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "OdrediÅte je samo za Äitanje"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:157
-#, fuzzy
-#| msgid "Cannot create a new event"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 msgid "Cannot create object"
-msgstr "Nije moguÄe napraviti novi dogaÄaj"
+msgstr "Ne mogu da napravim objekat"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:183
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
-msgstr "Nije moguÄe otvaranje izvora"
+msgstr "Ne mogu da otvorim izvor"
 
 #: ../calendar/gui/dialogs/delete-comp.c:210
 msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "_IbriÅi ovu stavku iz svih ostalih poÅtanskih sanduÄiÄa primaoca?"
+msgstr ""
+"Da li da _izbriÅem ovu stavku iz svih ostalih poÅtanskih sanduÄiÄa primaoca?"
 
 #: ../calendar/gui/dialogs/delete-comp.c:213
 msgid "_Retract comment"
-msgstr ""
+msgstr "_Uvuci komentar"
 
 #. 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"
+#, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "DogaÄaj nije mogao biti obrisan usled greÅke"
+msgstr "DogaÄaj ne moÅe biti obrisan zbog dbas greÅke: %s"
 
 #. 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"
+#, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Zadatak nije mogao biti obrisan usled greÅke"
+msgstr "Zadatak ne moÅe biti obrisan zbog dbas greÅke: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
 #: ../calendar/gui/dialogs/delete-error.c:64
-#, fuzzy, c-format
-#| msgid "The memo could not be deleted due to an error"
+#, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "BeleÅka nije mogla biti obrisana usled greÅke"
+msgstr "BeleÅka ne moÅe biti obrisana zbog dbas greÅke: %s"
 
 #. 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"
+#, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Stavka nije mogla biti obrisana usled greÅke"
+msgstr "Stavka ne moÅe biti obrisana zbog dbas greÅke: %s"
 
 #: ../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"
+msgstr "DogaÄaj ne moÅe biti obrisan jer je odbijena dozvola"
 
 #: ../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"
+msgstr "Zadatak ne moÅe biti obrisan jer je odbijena dozvola"
 
 #: ../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"
+msgstr "BeleÅka ne moÅe biti obrisana jer je odbijena dozvola"
 
 #: ../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"
+msgstr "Stavka ne moÅe biti obrisana jer je odbijena dozvola"
 
 #. 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"
+#, c-format
 msgid "The event could not be deleted due to an error: %s"
-msgstr "DogaÄaj nije mogao biti obrisan usled greÅke"
+msgstr "DogaÄaj ne moÅe biti obrisan zbog greÅke: %s"
 
 #. 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"
+#, c-format
 msgid "The task could not be deleted due to an error: %s"
-msgstr "Zadatak nije mogao biti obrisan usled greÅke"
+msgstr "Zadatak ne moÅe biti obrisan zbog greÅke: %s"
 
 #. 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"
+#, c-format
 msgid "The memo could not be deleted due to an error: %s"
-msgstr "BeleÅka nije mogla biti obrisana usled greÅke"
+msgstr "BeleÅka ne moÅe biti obrisana zbog greÅke: %s"
 
 #. 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"
+#, c-format
 msgid "The item could not be deleted due to an error: %s"
-msgstr "Stavka nije mogla biti obrisana usled greÅke"
+msgstr "Stavka ne moÅe biti obrisana zbog greÅke: %s"
 
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
@@ -2906,12 +2929,16 @@ msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
 #: ../calendar/gui/dialogs/event-editor.c:212
-msgid "_Alarms"
-msgstr "Ala_rmi"
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminders"
+msgstr "Podsetnik!"
 
 #: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Click here to set or unset alarms for this event"
-msgstr "Pritisnite ovde da postavite ili iskljuÄite alarm za ovaj dogaÄaj"
+#, fuzzy
+#| msgid "Set or unset alarms for this event"
+msgid "Set or unset reminders for this event"
+msgstr "Postavi ili iskljuÄi alarm za ovaj dogaÄaj"
 
 #: ../calendar/gui/dialogs/event-editor.c:222
 msgid "Show Time as _Busy"
@@ -2919,7 +2946,7 @@ msgstr "PrikaÅi vreme kao _zauzeto"
 
 #: ../calendar/gui/dialogs/event-editor.c:224
 msgid "Toggles whether to show time as busy"
-msgstr "Bira da li da prikaÅe vreme kao zauzeto"
+msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
 #: ../calendar/gui/dialogs/event-editor.c:233
 msgid "_Recurrence"
@@ -2937,7 +2964,7 @@ msgstr "Opcije slanja"
 #: ../calendar/gui/dialogs/event-editor.c:242
 #: ../calendar/gui/dialogs/task-editor.c:128
 msgid "Insert advanced send options"
-msgstr "Umetni napredne opcije slanja"
+msgstr "Umetnite napredne opcije slanja"
 
 #: ../calendar/gui/dialogs/event-editor.c:250
 msgid "All _Day Event"
@@ -2955,21 +2982,19 @@ msgstr "S_lobodno/zauzeto:"
 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:314 ../calendar/gui/print.c:3185
+#: ../calendar/gui/dialogs/event-editor.c:314 ../calendar/gui/print.c:3184
 msgid "Appointment"
 msgstr "Zakazivanje"
 
 #: ../calendar/gui/dialogs/event-editor.c:384
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 #: ../calendar/gui/e-meeting-list-view.c:160
 msgid "Attendees"
 msgstr "UÄesnici"
 
 #: ../calendar/gui/dialogs/event-editor.c:582
-#, fuzzy
-#| msgid "Print this message"
 msgid "Print this event"
-msgstr "Åtampaj ovu poruku"
+msgstr "Åtampajte ovu poruku"
 
 #: ../calendar/gui/dialogs/event-page.c:556
 msgid "Event's start time is in the past"
@@ -2986,11 +3011,13 @@ msgstr "DogaÄaj nije moguÄe potpuno urediti, poÅto niste organizator"
 
 #: ../calendar/gui/dialogs/event-page.c:649
 #: ../calendar/gui/dialogs/event-page.c:3021
-msgid "This event has alarms"
+#, fuzzy
+#| msgid "This event has alarms"
+msgid "This event has reminders"
 msgstr "Ovaj dogaÄaj ima alarme"
 
 #: ../calendar/gui/dialogs/event-page.c:716
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:7
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
@@ -3005,7 +3032,7 @@ msgstr "DogaÄaj bez datuma zavrÅetka"
 
 #: ../calendar/gui/dialogs/event-page.c:1430
 #: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:843
+#: ../calendar/gui/dialogs/task-page.c:811
 msgid "Start date is wrong"
 msgstr "Datum poÄetka je pogreÅan"
 
@@ -3023,12 +3050,12 @@ msgstr "Vreme zavrÅetka je pogreÅno"
 
 #: ../calendar/gui/dialogs/event-page.c:1635
 #: ../calendar/gui/dialogs/memo-page.c:736
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/task-page.c:865
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
 #: ../calendar/gui/dialogs/event-page.c:1669
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/task-page.c:899
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan uÄesnik je potreban."
 
@@ -3041,10 +3068,9 @@ msgid "Atte_ndees"
 msgstr "UÄ_esnici"
 
 #: ../calendar/gui/dialogs/event-page.c:2891
-#, fuzzy, c-format
-#| msgid "Unable to open the calendar '%s'."
+#, c-format
 msgid "Unable to open the calendar '%s': %s"
-msgstr "Nije moguÄe otvaranje kalendara â%sâ."
+msgstr "Ne mogu da otvorim kalendar â%sâ : %s"
 
 #. Translators: This string is used when we are creating an Event
 #. (meeting or appointment)  on behalf of some other user
@@ -3054,7 +3080,7 @@ msgstr "Nije moguÄe otvaranje kalendara â%sâ."
 #. on behalf of some other user
 #: ../calendar/gui/dialogs/event-page.c:2939
 #: ../calendar/gui/dialogs/memo-page.c:967
-#: ../calendar/gui/dialogs/task-page.c:1855
+#: ../calendar/gui/dialogs/task-page.c:1784
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "Delujete u ime %s"
@@ -3095,47 +3121,53 @@ msgstr "Prilagodi"
 # 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.
-#. Translators: "None" for "No alarm set"
+#. Translators: "None" for "No reminder set"
 #: ../calendar/gui/dialogs/event-page.c:3287
-msgctxt "cal-alarms"
+#, fuzzy
+#| msgid "None"
+msgctxt "cal-reminders"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 #: ../calendar/gui/dialogs/task-page.ui.h:1
 #: ../calendar/gui/e-meeting-time-sel.c:563
 msgid "Atte_ndees..."
 msgstr "UÄ_esnici..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgid "Custom Alarm:"
-msgstr "PrilagoÄen alarm:"
+#: ../calendar/gui/dialogs/event-page.ui.h:5
+#, fuzzy
+#| msgid "Custom Header"
+msgid "Custom Reminder:"
+msgstr "PrilagoÄeno zaglavlje"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/event-page.ui.h:6
 msgid "Event Description"
 msgstr "Opis dogaÄaja"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:9
-#: ../modules/calendar/e-calendar-preferences.ui.h:44
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgid "_Alarm"
-msgstr "_Alarm"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/event-page.ui.h:11
 #: ../calendar/gui/dialogs/memo-page.ui.h:6
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../widgets/misc/e-attachment-dialog.c:347
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../plugins/calendar-weather/calendar-weather.c:366
 msgid "_Location:"
 msgstr "_Lokacija:"
 
+#: ../calendar/gui/dialogs/event-page.ui.h:13
+#, fuzzy
+#| msgid "Reminder!"
+msgid "_Reminder"
+msgstr "Podsetnik!"
+
 #: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Summary:"
 msgstr "_SaÅetak:"
@@ -3145,42 +3177,32 @@ msgstr "_SaÅetak:"
 msgid "_Time:"
 msgstr "_Vreme:"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:17
-#, fuzzy
-#| msgid "1 day before appointment"
 msgctxt "eventpage"
 msgid "1 day before appointment"
 msgstr "1 dan pre zakazanog sastanka"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:19
-#, fuzzy
-#| msgid "1 hour before appointment"
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 sat pre zakazanog sastanka"
 
-#. TRANSLATORS: Predefined alarm's description
+#. TRANSLATORS: Predefined reminder's description
 #: ../calendar/gui/dialogs/event-page.ui.h:21
-#, fuzzy
-#| msgid "15 minutes before appointment"
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "15 minuta pre zakazanog sastanka"
 
 #. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
 #: ../calendar/gui/dialogs/event-page.ui.h:23
-#, fuzzy
-#| msgid "for"
 msgctxt "eventpage"
 msgid "for"
 msgstr "za"
 
 #. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#, fuzzy
-#| msgid "until"
 msgctxt "eventpage"
 msgid "until"
 msgstr "do"
@@ -3234,7 +3256,7 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Select _Today"
 msgstr "Izaberi _danaÅnji dan"
 
@@ -3242,15 +3264,13 @@ msgstr "Izaberi _danaÅnji dan"
 msgid "September"
 msgstr "Septembar"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3189
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3188
 msgid "Memo"
 msgstr "BeleÅka"
 
 #: ../calendar/gui/dialogs/memo-editor.c:156
-#, fuzzy
-#| msgid "Print the list of memos"
 msgid "Print this memo"
-msgstr "Åtampaj spisak beleÅki"
+msgstr "Åtampajte ovu beleÅku"
 
 #: ../calendar/gui/dialogs/memo-page.c:393
 msgid "Memo's start date is in the past"
@@ -3265,15 +3285,14 @@ 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:924
-#, fuzzy, c-format
-#| msgid "Unable to open memos in '%s'."
+#, c-format
 msgid "Unable to open memos in '%s': %s"
-msgstr "Nije moguÄe otvaranje beleÅki u â%sâ."
+msgstr "Ne mogu da otvorim beleÅke u â%sâ : %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:284
-#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2478
-#: ../mail/em-format-html.c:2543 ../mail/em-format-html.c:2567
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1099 ../em-format/em-format-quote.c:319
+#: ../em-format/em-format.c:1056 ../mail/em-format-html.c:2573
+#: ../mail/em-format-html.c:2638 ../mail/em-format-html.c:2662
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:74
 msgid "To"
 msgstr "Prima"
 
@@ -3294,8 +3313,10 @@ msgstr "_Prima:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:7
 #: ../calendar/gui/dialogs/task-page.c:331
 #: ../calendar/gui/dialogs/task-page.ui.h:9
-msgid "_Group:"
-msgstr "_Grupa:"
+#, fuzzy
+#| msgid "_Last:"
+msgid "_List:"
+msgstr "_Prezime:"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
@@ -3333,76 +3354,76 @@ msgstr "Ovaj i buduÄe unose"
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:563
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 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:894
+#: ../calendar/gui/dialogs/recurrence-page.c:904
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:944
 msgid "End time of the recurrence was before event's start"
-msgstr "Vreme zavrÅetka ponavljanja je ispred poÄetka dogaÄaja"
+msgstr "Vreme zavrÅetka ponavljanja je pre 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:964
+#: ../calendar/gui/dialogs/recurrence-page.c:974
 msgid "on"
-msgstr "na"
+msgstr "u"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [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:1022
+#: ../calendar/gui/dialogs/recurrence-page.c:1032
 msgid "first"
-msgstr "prvoj"
+msgstr "prvom"
 
 #. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
 #. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]'
 #. * (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:1028
+#: ../calendar/gui/dialogs/recurrence-page.c:1038
 msgid "second"
-msgstr "drugoj"
+msgstr "drugom"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]'
 #. * (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:1033
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "third"
-msgstr "treÄoj"
+msgstr "treÄem"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]'
 #. * (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:1038
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 msgid "fourth"
-msgstr "Äetvrtoj"
+msgstr "Äetvrtom"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 msgid "fifth"
-msgstr "peti"
+msgstr "petom"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "last"
-msgstr "poslednjoj"
+msgstr "poslednjem"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1082
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -3410,7 +3431,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:1078
+#: ../calendar/gui/dialogs/recurrence-page.c:1088
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -3418,7 +3439,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:1084
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -3426,73 +3447,73 @@ 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:1090
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 #: ../modules/calendar/e-calendar-preferences.ui.h:22
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../modules/calendar/e-calendar-preferences.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1129
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Thursday"
 msgstr "Äetvrtak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/recurrence-page.c:1130
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../modules/calendar/e-calendar-preferences.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
+#: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../modules/calendar/e-calendar-preferences.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Sunday"
 msgstr "Nedelja"
 
 #. 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:1244
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1418
+#: ../calendar/gui/dialogs/recurrence-page.c:1428
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2128
+#: ../calendar/gui/dialogs/recurrence-page.c:2140
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2181
 msgid "Could not get a selection to modify."
-msgstr "Ne moÅe da naÄe izbor radi menjanja."
+msgstr "Ne mogu da naÄem izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2175
+#: ../calendar/gui/dialogs/recurrence-page.c:2187
 msgid "Modify exception"
-msgstr "Izmeni izuzetak"
+msgstr "Izmenite izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2219
+#: ../calendar/gui/dialogs/recurrence-page.c:2231
 msgid "Could not get a selection to delete."
-msgstr "Ne moÅe da naÄe izbor radi brisanja."
+msgstr "Ne mogu da naÄem izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2353
+#: ../calendar/gui/dialogs/recurrence-page.c:2365
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -3514,62 +3535,50 @@ msgstr "Ovo zakazivanje se po_navlja"
 
 #. 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:8
-#, fuzzy
-#| msgid "day(s)"
 msgctxt "recurrpage"
 msgid "day(s)"
 msgstr "dan(i)"
 
 #. 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:10
-#, fuzzy
-#| msgid "for"
 msgctxt "recurrpage"
 msgid "for"
 msgstr "za"
 
 #. 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
-#, fuzzy
-#| msgid "forever"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "uvek"
 
 #. 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
-#, fuzzy
-#| msgid "month(s)"
 msgctxt "recurrpage"
 msgid "month(s)"
 msgstr "mesec(i)"
 
 #. 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:16
-#, fuzzy
-#| msgid "until"
 msgctxt "recurrpage"
 msgid "until"
 msgstr "do"
 
 #. 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
-#, fuzzy
-#| msgid "week(s)"
 msgctxt "recurrpage"
 msgid "week(s)"
 msgstr "nedelja(e)"
 
 #. 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
-#, fuzzy
-#| msgid "year(s)"
 msgctxt "recurrpage"
 msgid "year(s)"
 msgstr "godina(e)"
 
 #: ../calendar/gui/dialogs/send-comp.c:192
-msgid "Send my alarms with this event"
+#, fuzzy
+#| msgid "Send my alarms with this event"
+msgid "Send my reminders with this event"
 msgstr "PoÅalji moje alarme sa ovim dogaÄajem"
 
 #: ../calendar/gui/dialogs/send-comp.c:194
@@ -3587,11 +3596,11 @@ 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:298
+#: ../calendar/gui/e-cal-component-preview.c:300
 #: ../calendar/gui/e-cal-model-tasks.c:439
 #: ../calendar/gui/e-cal-model-tasks.c:713 ../calendar/gui/e-task-table.c:210
-#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:594
-#: ../calendar/gui/print.c:3275 ../mail/em-sync-stream.c:152
+#: ../calendar/gui/e-task-table.c:225 ../calendar/gui/e-task-table.c:597
+#: ../calendar/gui/print.c:3274 ../mail/em-sync-stream.c:152
 #: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
 #, c-format
 msgid "Canceled"
@@ -3600,61 +3609,61 @@ 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:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:437
 #: ../calendar/gui/e-cal-model-tasks.c:711
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 #: ../calendar/gui/e-task-table.c:208 ../calendar/gui/e-task-table.c:223
-#: ../calendar/gui/e-task-table.c:593 ../calendar/gui/print.c:3272
-#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:374
+#: ../calendar/gui/e-task-table.c:596 ../calendar/gui/print.c:3271
+#: ../calendar/gui/tasktypes.xml.h:9 ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
 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:317
-#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:14
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:14
 #: ../mail/message-list.c:1224 ../widgets/misc/e-send-options.ui.h:13
 msgid "High"
-msgstr "Visoka"
+msgstr "Visok"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:292
+#: ../calendar/gui/e-cal-component-preview.c:294
 #: ../calendar/gui/e-cal-model-tasks.c:435
 #: ../calendar/gui/e-cal-model-tasks.c:709
 #: ../calendar/gui/e-cal-model-tasks.c:786 ../calendar/gui/e-task-table.c:206
-#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:592
-#: ../calendar/gui/print.c:3269
+#: ../calendar/gui/e-task-table.c:221 ../calendar/gui/e-task-table.c:595
+#: ../calendar/gui/print.c:3268
 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:321
-#: ../calendar/gui/e-task-table.c:516 ../calendar/gui/tasktypes.xml.h:16
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-task-table.c:519 ../calendar/gui/tasktypes.xml.h:16
 #: ../mail/message-list.c:1222 ../widgets/misc/e-send-options.ui.h:14
 msgid "Low"
-msgstr "Mala"
+msgstr "Nizak"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:13
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../calendar/gui/e-cal-model.c:1518 ../calendar/gui/e-task-table.c:515
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model.c:1533 ../calendar/gui/e-task-table.c:518
 #: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1223
 #: ../widgets/misc/e-send-options.ui.h:16
 msgid "Normal"
-msgstr "ObiÄna"
+msgstr "ObiÄan"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:15
-#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-component-preview.c:304
 #: ../calendar/gui/e-cal-model-tasks.c:433
 #: ../calendar/gui/e-cal-model-tasks.c:707 ../calendar/gui/e-task-table.c:204
-#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:591
-#: ../calendar/gui/print.c:3266 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-task-table.c:219 ../calendar/gui/e-task-table.c:594
+#: ../calendar/gui/print.c:3265 ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
-msgstr "Nije zapoÄeto"
+msgstr "Nije zapoÄet"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
@@ -3678,10 +3687,10 @@ msgstr "Status"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:517 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:520 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:27
 msgid "Undefined"
-msgstr "NeodreÄena"
+msgstr "NeodreÄen"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
@@ -3702,26 +3711,24 @@ msgstr "Det_alji statusa"
 
 #: ../calendar/gui/dialogs/task-editor.c:118
 msgid "Click to change or view the status details of the task"
-msgstr "Klikni za promenu ili detaljan pregled statusa zadatka"
+msgstr "Kliknite da izmenite ili da pregledate detalje statusa zadatka"
 
 #: ../calendar/gui/dialogs/task-editor.c:126
 msgid "_Send Options"
-msgstr "Mog_uÄnosti kod slanja"
+msgstr "Mog_uÄnosti slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:319 ../calendar/gui/print.c:3187
+#: ../calendar/gui/dialogs/task-editor.c:321 ../calendar/gui/print.c:3186
 #: ../widgets/misc/e-send-options.c:526
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:322
+#: ../calendar/gui/dialogs/task-editor.c:324
 msgid "Task Details"
 msgstr "Detalji zadatka"
 
-#: ../calendar/gui/dialogs/task-editor.c:364
-#, fuzzy
-#| msgid "Print the list of tasks"
+#: ../calendar/gui/dialogs/task-editor.c:366
 msgid "Print this task"
-msgstr "Åtampaj spisak zadataka"
+msgstr "OdÅtampajte ovaj zadatak"
 
 #: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
@@ -3737,22 +3744,21 @@ msgstr "Zadatak nije moguÄe ureÄivati, poÅto je izabrani spisak samo za Äita
 
 #: ../calendar/gui/dialogs/task-page.c:288
 msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Zadatak nije moguÄe potpuno urediti, poÅto niste organizator"
+msgstr "Zadatak nije moguÄe potpuno urediti, zato Åto niste organizator"
 
 #: ../calendar/gui/dialogs/task-page.c:339
 #: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
 
-#: ../calendar/gui/dialogs/task-page.c:816
+#: ../calendar/gui/dialogs/task-page.c:793
 msgid "Due date is wrong"
-msgstr "Datum za zavrÅetak je pogreÅan"
+msgstr "Krajnji rok je pogreÅan"
 
-#: ../calendar/gui/dialogs/task-page.c:1808
-#, fuzzy, c-format
-#| msgid "Unable to open tasks in '%s'."
+#: ../calendar/gui/dialogs/task-page.c:1737
+#, c-format
 msgid "Unable to open tasks in '%s': %s"
-msgstr "Nije moguÄe otvaranje zadatka u â%sâ."
+msgstr "Ne mogu da otvorim zadatke u â%sâ : %s"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
@@ -3795,49 +3801,49 @@ msgstr "IzvrÅiÄe se nepoznata radnja"
 #: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the start of the appointment"
-msgstr "%s %s pre zakazanog poÄetka"
+msgstr "%s %s pre poÄetka sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the start of the appointment"
-msgstr "%s %s nakon zakazanog poÄetka"
+msgstr "%s %s nakon poÄetka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s at the start of the appointment"
-msgstr "%s na zakazanom poÄetku"
+msgstr "%s na poÄetku sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:489
 #, c-format
 msgid "%s %s before the end of the appointment"
-msgstr "%s %s pre zakazanog kraja"
+msgstr "%s %s pre kraja sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
-msgstr "%s %s nakon zakazanog zavrÅetka"
+msgstr "%s %s nakon zavrÅetka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:501
 #, c-format
 msgid "%s at the end of the appointment"
-msgstr "%s na zakazanom kraju"
+msgstr "%s na kraju sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
 #: ../calendar/gui/e-alarm-list.c:525
 #, c-format
 msgid "%s at %s"
-msgstr "%s na %s"
+msgstr "%s u %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
@@ -3846,49 +3852,49 @@ 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:669
+#: ../calendar/gui/e-cal-component-preview.c:194 ../filter/e-filter-rule.c:669
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-preview.c:198
+#: ../calendar/gui/e-cal-component-preview.c:200
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:237
+#: ../calendar/gui/e-cal-component-preview.c:239
 msgid "Summary:"
 msgstr "SaÅetak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-component-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:249
+#: ../calendar/gui/e-cal-component-preview.c:263
 msgid "Start Date:"
 msgstr "Datum poÄetka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:275
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
-msgstr "Datum za zavrÅetak:"
+msgstr "Krajnji rok:"
 
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../calendar/gui/e-cal-component-preview.c:290
 #: ../plugins/itip-formatter/itip-view.c:1076
 msgid "Status:"
 msgstr "Status:"
 
-#: ../calendar/gui/e-cal-component-preview.c:315
+#: ../calendar/gui/e-cal-component-preview.c:317
 msgid "Priority:"
 msgstr "VaÅnost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:340 ../mail/mail-config.ui.h:37
+#: ../calendar/gui/e-cal-component-preview.c:342 ../mail/mail-config.ui.h:37
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:371
+#: ../calendar/gui/e-cal-component-preview.c:373
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Created"
 msgstr "Napravljeno"
 
@@ -3900,7 +3906,7 @@ msgstr "Datum zavrÅetka"
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Last modified"
-msgstr "Poslednje menjano"
+msgstr "Poslednje izmene"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:5
@@ -3908,12 +3914,12 @@ msgid "Start Date"
 msgstr "Datum poÄetka"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:568
+#: ../calendar/gui/e-task-table.c:571
 msgid "Free"
 msgstr "Slobodno"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:546 ../calendar/gui/e-task-table.c:572
 msgid "Busy"
 msgstr "Zauzeto"
 
@@ -3938,51 +3944,51 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:201
 #: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:188
 #: ../calendar/gui/e-meeting-store.c:1028
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1524
+#: ../calendar/gui/e-cal-model-tasks.c:1061 ../calendar/gui/e-cal-model.c:1539
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:190
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:761 ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-cal-model.c:776 ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-list-view.c:191
 #: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:171
 #: ../calendar/gui/e-meeting-store.c:234 ../calendar/gui/print.c:1098
 #: ../calendar/gui/print.c:1115 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 #: ../plugins/itip-formatter/itip-formatter.c:462
-#: ../plugins/itip-formatter/itip-formatter.c:2608
+#: ../plugins/itip-formatter/itip-formatter.c:2658
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1520
+#: ../calendar/gui/e-cal-model.c:1535
 msgid "Recurring"
 msgstr "Ponovno"
 
-#: ../calendar/gui/e-cal-model.c:1522
+#: ../calendar/gui/e-cal-model.c:1537
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:2629
+#: ../calendar/gui/e-cal-model.c:2811
 #, c-format
 msgid "Opening %s"
-msgstr "Otvaranje %s"
+msgstr "Otvaram â%sâ"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
-msgstr "% ZavrÅeno"
+msgstr "% je zavrÅeno"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
-msgstr "Kliknite za novi zadatak"
+msgstr "Kliknite da dodate zadatak"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
@@ -3994,11 +4000,11 @@ msgstr "Datum zavrÅetka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
-msgstr "Datum za zavrÅetak"
+msgstr "Krajnji rok"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Priority"
 msgstr "VaÅnost"
 
@@ -4033,24 +4039,24 @@ msgstr "BriÅe izabrane dogaÄaje"
 #: ../calendar/gui/e-calendar-view.c:457 ../calendar/gui/e-memo-table.c:182
 #: ../calendar/gui/e-task-table.c:260
 msgid "Deleting selected objects"
-msgstr "Brisanje izabranih objekata"
+msgstr "BriÅem izabrane objekte"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/e-task-table.c:1082
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-task-table.c:1086
 msgid "Updating objects"
-msgstr "AÅuriranje objekata"
+msgstr "AÅuriram objekat"
 
 #: ../calendar/gui/e-calendar-view.c:1778
 #: ../calendar/gui/e-meeting-list-view.c:213
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../plugins/itip-formatter/itip-formatter.c:2596
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Accepted"
 msgstr "PrihvaÄeno"
 
 #: ../calendar/gui/e-calendar-view.c:1779
 #: ../calendar/gui/e-meeting-list-view.c:214
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../plugins/itip-formatter/itip-formatter.c:2602
+#: ../plugins/itip-formatter/itip-formatter.c:2652
 msgid "Declined"
 msgstr "Odbijeno"
 
@@ -4064,7 +4070,7 @@ msgstr "Sa rezervom"
 #: ../calendar/gui/e-calendar-view.c:1781
 #: ../calendar/gui/e-meeting-list-view.c:216
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../plugins/itip-formatter/itip-formatter.c:2605
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 msgid "Delegated"
 msgstr "Delegirano"
 
@@ -4075,8 +4081,8 @@ 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:1926 ../calendar/gui/e-memo-table.c:537
-#: ../calendar/gui/e-task-table.c:758
+#: ../calendar/gui/e-calendar-view.c:1926 ../calendar/gui/e-memo-table.c:539
+#: ../calendar/gui/e-task-table.c:761
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -4084,14 +4090,14 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:542
-#: ../calendar/gui/e-task-table.c:762
+#: ../calendar/gui/e-calendar-view.c:1930 ../calendar/gui/e-memo-table.c:544
+#: ../calendar/gui/e-task-table.c:765
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3221
+#: ../calendar/gui/e-calendar-view.c:1946 ../calendar/gui/print.c:3220
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
@@ -4149,16 +4155,16 @@ msgstr "PrikaÅi drugu vremensku zonu"
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
-#: ../modules/calendar/e-calendar-preferences.c:178
-#: ../modules/calendar/e-calendar-preferences.c:227
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:228
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "NiÅta"
 
 #: ../calendar/gui/e-day-view-time-item.c:876
 #: ../calendar/gui/e-timezone-entry.c:319
-#: ../modules/calendar/e-calendar-preferences.c:254
+#: ../modules/calendar/e-calendar-preferences.c:255
 msgid "Select..."
 msgstr "Izaberi..."
 
@@ -4192,7 +4198,7 @@ msgstr "%A %d %B"
 #: ../calendar/gui/e-day-view-top-item.c:852 ../calendar/gui/e-day-view.c:1810
 #: ../calendar/gui/e-week-view-main-item.c:224
 #: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1016
+#: ../modules/calendar/e-cal-shell-view-private.c:1053
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
@@ -4208,7 +4214,7 @@ msgstr "%a %d %b"
 #: ../calendar/gui/e-day-view-top-item.c:856 ../calendar/gui/e-day-view.c:1826
 #: ../calendar/gui/e-week-view-main-item.c:238
 #: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../modules/calendar/e-cal-shell-view-private.c:1052
+#: ../modules/calendar/e-cal-shell-view-private.c:1089
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -4217,20 +4223,20 @@ msgstr "%d. %b"
 #: ../calendar/gui/print.c:926 ../calendar/gui/print.c:945
 #: ../calendar/gui/print.c:2372 ../calendar/gui/print.c:2392
 msgid "am"
-msgstr "am"
+msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1005 ../calendar/gui/e-week-view.c:759
 #: ../calendar/gui/print.c:931 ../calendar/gui/print.c:947
 #: ../calendar/gui/print.c:2377 ../calendar/gui/print.c:2394
 msgid "pm"
-msgstr "pm"
+msgstr "pop"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
 #: ../calendar/gui/e-day-view.c:2606
 #, c-format
 msgid "Week %d"
-msgstr "%d. nedelja"
+msgstr "%d nedelja"
 
 #: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
@@ -4317,21 +4323,21 @@ msgstr "RSVP"
 msgid "In Process"
 msgstr "U toku"
 
-#: ../calendar/gui/e-meeting-store.c:1834
-#, fuzzy, c-format
-#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#: ../calendar/gui/e-meeting-store.c:1841
+#, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
-msgstr "Unesite lozinku za korisnika <b>%s</b> na serveru <b>%s</b>"
+msgstr ""
+"Unesite lozinku da pristupite podacima âslobodan/zauzetâ na serveru â%sâ kao "
+"korisnik â%sâ"
 
-#: ../calendar/gui/e-meeting-store.c:1844
-#, fuzzy, c-format
-#| msgid "Failed to create thread: %s"
+#: ../calendar/gui/e-meeting-store.c:1851
+#, c-format
 msgid "Failure reason: %s"
-msgstr "Nije uspelo pravljenje niza: %s"
+msgstr "Razlog neuspeha: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1849
+#: ../calendar/gui/e-meeting-store.c:1856
 #: ../plugins/caldav/caldav-browse-server.c:920
-#: ../plugins/google-account-setup/google-source.c:444
+#: ../plugins/google-account-setup/google-source.c:448
 #: ../plugins/publish-calendar/publish-calendar.c:332
 #: ../smime/gui/component.c:49
 msgid "Enter password"
@@ -4454,53 +4460,53 @@ msgstr "Jezik"
 msgid "Member"
 msgstr "Älan"
 
-#: ../calendar/gui/e-memo-table.c:418
-#: ../modules/calendar/e-cal-shell-content.c:473
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../calendar/gui/e-memo-table.c:420
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 #: ../modules/calendar/e-memo-shell-view.c:293
 #: ../plugins/caldav/caldav-browse-server.c:437
 msgid "Memos"
 msgstr "BeleÅke"
 
-#: ../calendar/gui/e-memo-table.c:499 ../calendar/gui/e-task-table.c:721
+#: ../calendar/gui/e-memo-table.c:501 ../calendar/gui/e-task-table.c:724
 msgid "* No Summary *"
 msgstr "* Bez saÅetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:584 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:586 ../calendar/gui/e-task-table.c:806
 msgid "Start: "
 msgstr "PoÄetak:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:603 ../calendar/gui/e-task-table.c:821
+#: ../calendar/gui/e-memo-table.c:605 ../calendar/gui/e-task-table.c:824
 msgid "Due: "
-msgstr "Do: "
+msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:717
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
-msgstr "SeÄe izabranue beleÅke u spisak iseÄaka"
+msgstr "SeÄe izabrane beleÅke u spisak iseÄaka"
 
-#: ../calendar/gui/e-memo-table.c:723
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
-msgstr "UmnoÅava izabranue beleÅke u spisak iseÄaka"
+msgstr "UmnoÅava izabrane beleÅke u spisak iseÄaka"
 
-#: ../calendar/gui/e-memo-table.c:729
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleÅke iz spiska iseÄaka"
 
-#: ../calendar/gui/e-memo-table.c:735
-#: ../modules/calendar/e-memo-shell-view-actions.c:573
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Delete selected memos"
-msgstr "ObriÅi izabrane beleÅke"
+msgstr "BriÅe izabrane beleÅke"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleÅke"
 
 #: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
-msgstr "Pritisnite da dodate beleÅku"
+msgstr "Kliknite da dodate beleÅku"
 
 # Don't use any other specifiers.
 # strftime format %d = day of month, %b = abbreviated
@@ -4510,47 +4516,46 @@ msgstr "Pritisnite da dodate beleÅku"
 #. %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:543
-#, fuzzy, c-format
-#| msgid "%d %b"
+#: ../calendar/gui/e-task-table.c:546
+#, c-format
 msgid "%d%%"
-msgstr "%d. %b"
+msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:640 ../calendar/gui/print.c:2168
+#: ../calendar/gui/e-task-table.c:643 ../calendar/gui/print.c:2168
 #: ../calendar/importers/icalendar-importer.c:85
-#: ../calendar/importers/icalendar-importer.c:971
-#: ../modules/calendar/e-cal-shell-content.c:434
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../calendar/importers/icalendar-importer.c:1003
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 #: ../modules/calendar/e-task-shell-view.c:448
 #: ../plugins/caldav/caldav-browse-server.c:435
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:947
+#: ../calendar/gui/e-task-table.c:951
 msgid "Cut selected tasks to the clipboard"
 msgstr "SeÄe izabrane zadatke u spisak iseÄaka"
 
-#: ../calendar/gui/e-task-table.c:953
+#: ../calendar/gui/e-task-table.c:957
 msgid "Copy selected tasks to the clipboard"
 msgstr "UmnoÅava izabrane zadatke u spisak iseÄaka"
 
-#: ../calendar/gui/e-task-table.c:959
+#: ../calendar/gui/e-task-table.c:963
 msgid "Paste tasks from the clipboard"
-msgstr "Ubaci zadatke iz spiska iseÄaka"
+msgstr "Ubacuje zadatke iz spiska iseÄaka"
 
-#: ../calendar/gui/e-task-table.c:965
-#: ../modules/calendar/e-task-shell-view-actions.c:697
+#: ../calendar/gui/e-task-table.c:969
+#: ../modules/calendar/e-task-shell-view-actions.c:711
 msgid "Delete selected tasks"
-msgstr "ObriÅi izabrane zadatke"
+msgstr "BriÅe izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:971
+#: ../calendar/gui/e-task-table.c:975
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
 #: ../calendar/gui/e-timezone-entry.c:330
 msgid "Select Timezone"
-msgstr "Izaberite vremensku zonu"
+msgstr "Izaberi vremensku zonu"
 
 # month name. You can change the order but don't
 # change the specifiers or add anything.
@@ -4562,8 +4567,10 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #: ../calendar/gui/ea-cal-view-event.c:290
-msgid "It has alarms."
-msgstr "Ima alarme."
+#, fuzzy
+#| msgid "It has recurrences."
+msgid "It has reminders."
+msgstr "Ima ponavljanja."
 
 #: ../calendar/gui/ea-cal-view-event.c:293
 msgid "It has recurrences."
@@ -4588,7 +4595,7 @@ msgstr "dogaÄaj pregleda kalendara"
 
 #: ../calendar/gui/ea-cal-view-event.c:557
 msgid "Grab Focus"
-msgstr "Uhvati fokus"
+msgstr "Fokusiraj"
 
 #: ../calendar/gui/ea-cal-view.c:303
 msgid "New Appointment"
@@ -4656,21 +4663,21 @@ msgstr "pregled kalendara za jedan ili viÅe dana"
 
 #: ../calendar/gui/ea-gnome-calendar.c:50
 #: ../calendar/gui/ea-gnome-calendar.c:58
-#: ../calendar/importers/icalendar-importer.c:1003
+#: ../calendar/importers/icalendar-importer.c:1035
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1012
+#: ../modules/calendar/e-cal-shell-view-private.c:1049
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1025
-#: ../modules/calendar/e-cal-shell-view-private.c:1028
+#: ../modules/calendar/e-cal-shell-view-private.c:1056
+#: ../modules/calendar/e-cal-shell-view-private.c:1062
+#: ../modules/calendar/e-cal-shell-view-private.c:1065
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -4678,10 +4685,10 @@ msgstr "%a %d %b %Y."
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1045
-#: ../modules/calendar/e-cal-shell-view-private.c:1056
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1082
+#: ../modules/calendar/e-cal-shell-view-private.c:1093
+#: ../modules/calendar/e-cal-shell-view-private.c:1100
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -4711,44 +4718,44 @@ msgstr "pregled kalendara za mesec"
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili viÅe nedelja"
 
-#: ../calendar/gui/gnome-cal.c:2215
+#: ../calendar/gui/gnome-cal.c:2235
 msgid "Purging"
 msgstr "Brisanje"
 
-#: ../calendar/gui/itip-utils.c:503 ../calendar/gui/itip-utils.c:558
-#: ../calendar/gui/itip-utils.c:661
+#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:565
+#: ../calendar/gui/itip-utils.c:668
 msgid "An organizer must be set."
 msgstr "Organizator mora biti odreÄen."
 
-#: ../calendar/gui/itip-utils.c:550
+#: ../calendar/gui/itip-utils.c:557
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan uÄesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:747 ../calendar/gui/itip-utils.c:908
+#: ../calendar/gui/itip-utils.c:754 ../calendar/gui/itip-utils.c:915
 msgid "Event information"
-msgstr "Podatak o dogaÄaju"
+msgstr "Podaci o dogaÄaju"
 
-#: ../calendar/gui/itip-utils.c:750 ../calendar/gui/itip-utils.c:911
+#: ../calendar/gui/itip-utils.c:757 ../calendar/gui/itip-utils.c:918
 msgid "Task information"
-msgstr "Podatak o zadatku"
+msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:753 ../calendar/gui/itip-utils.c:914
+#: ../calendar/gui/itip-utils.c:760 ../calendar/gui/itip-utils.c:921
 msgid "Memo information"
 msgstr "Podaci o beleÅci"
 
-#: ../calendar/gui/itip-utils.c:756 ../calendar/gui/itip-utils.c:932
+#: ../calendar/gui/itip-utils.c:763 ../calendar/gui/itip-utils.c:939
 msgid "Free/Busy information"
-msgstr "Slobodno/zauzeto podatak"
+msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:766
 msgid "Calendar information"
-msgstr "Podatak o kalendaru"
+msgstr "Podaci o kalendaru"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:803
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "PrihvaÄeno"
@@ -4757,7 +4764,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:803
+#: ../calendar/gui/itip-utils.c:810
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄeno s rezervom"
@@ -4769,7 +4776,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:810 ../calendar/gui/itip-utils.c:858
+#: ../calendar/gui/itip-utils.c:817 ../calendar/gui/itip-utils.c:865
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -4778,7 +4785,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:817
+#: ../calendar/gui/itip-utils.c:824
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -4786,7 +4793,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:830
+#: ../calendar/gui/itip-utils.c:837
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "OsveÅeno"
@@ -4794,7 +4801,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:837
+#: ../calendar/gui/itip-utils.c:844
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "OtkaÅi"
@@ -4802,7 +4809,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:844
+#: ../calendar/gui/itip-utils.c:851
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "OsveÅi"
@@ -4810,29 +4817,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:851
+#: ../calendar/gui/itip-utils.c:858
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:929
+#: ../calendar/gui/itip-utils.c:936
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr "Slobodno/zauzeto vreme (%s do %s)"
+msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:937
+#: ../calendar/gui/itip-utils.c:944
 msgid "iCalendar information"
-msgstr "iKalendar podatak"
+msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:969
 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."
+msgstr "Ne mogu da saÄuvam unos, novi dogaÄaj se sukobljava sa nekim drugim."
 
-#: ../calendar/gui/itip-utils.c:966
+#: ../calendar/gui/itip-utils.c:973
 msgid "Unable to book a resource, error: "
-msgstr "Nije moguÄe saÄuvati unos, greÅka:"
+msgstr "Ne mogu da saÄuvam unos, greÅka:"
 
-#: ../calendar/gui/itip-utils.c:1127
+#: ../calendar/gui/itip-utils.c:1134
 msgid "You must be an attendee of the event."
 msgstr "Morate biti uÄesnik dogaÄaja."
 
@@ -4991,78 +4998,78 @@ msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3014
+#: ../calendar/gui/print.c:3013
 msgid " to "
-msgstr " za "
+msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3024
+#: ../calendar/gui/print.c:3023
 msgid " (Completed "
-msgstr " (ZavrÅeno "
+msgstr " (ZavrÅeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3030
+#: ../calendar/gui/print.c:3029
 msgid "Completed "
-msgstr "ZavrÅeno "
+msgstr "ZavrÅeno je "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3040
+#: ../calendar/gui/print.c:3039
 msgid " (Due "
-msgstr " (Do "
+msgstr " (Rok "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3047
+#: ../calendar/gui/print.c:3046
 msgid "Due "
-msgstr "Do "
+msgstr "Rok "
 
-#: ../calendar/gui/print.c:3212
+#: ../calendar/gui/print.c:3211
 #, c-format
 msgid "Summary: %s"
 msgstr "SaÅetak: %s"
 
-#: ../calendar/gui/print.c:3239
+#: ../calendar/gui/print.c:3238
 msgid "Attendees: "
 msgstr "Prisutni:"
 
-#: ../calendar/gui/print.c:3282
+#: ../calendar/gui/print.c:3281
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: ../calendar/gui/print.c:3297
+#: ../calendar/gui/print.c:3296
 #, c-format
 msgid "Priority: %s"
 msgstr "VaÅnost: %s"
 
-#: ../calendar/gui/print.c:3315
+#: ../calendar/gui/print.c:3314
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak zavrÅenog: %i"
 
-#: ../calendar/gui/print.c:3326
+#: ../calendar/gui/print.c:3325
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:3339
+#: ../calendar/gui/print.c:3338
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3350
+#: ../calendar/gui/print.c:3349
 msgid "Contacts: "
 msgstr "Kontakti: "
 
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
-msgstr "% zavrÅeno"
+msgstr "% je zavrÅeno"
 
 #: ../calendar/gui/tasktypes.xml.h:7
 msgid "Cancelled"
@@ -5084,190 +5091,184 @@ msgstr "je manje od"
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:407
-#: ../calendar/importers/icalendar-importer.c:817
-#: ../plugins/itip-formatter/itip-formatter.c:2085
+#: ../calendar/importers/icalendar-importer.c:421
+#: ../calendar/importers/icalendar-importer.c:834
+#: ../plugins/itip-formatter/itip-formatter.c:2135
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:547
+#: ../calendar/importers/icalendar-importer.c:561
 msgid "iCalendar files (.ics)"
-msgstr "iKalendar datoteke (.ics)"
+msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:548
+#: ../calendar/importers/icalendar-importer.c:562
 msgid "Evolution iCalendar importer"
-msgstr "Evolucija iKalendar uvoznik"
+msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:636
+#: ../calendar/importers/icalendar-importer.c:650
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:716
-#, fuzzy
-#| msgid "vCalendar files (.vcf)"
+#: ../calendar/importers/icalendar-importer.c:730
 msgid "vCalendar files (.vcs)"
-msgstr "vKalendar datoteke (.vcf)"
+msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:717
+#: ../calendar/importers/icalendar-importer.c:731
 msgid "Evolution vCalendar importer"
-msgstr "Evolucija vKalendar uvoznik"
+msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:966
+#: ../calendar/importers/icalendar-importer.c:998
 msgid "Calendar Events"
-msgstr "Kalendarski dogaÄaji"
+msgstr "DogaÄaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1004
+#: ../calendar/importers/icalendar-importer.c:1036
 msgid "Evolution Calendar intelligent importer"
-msgstr "Evolucija kalendar inteligentni uvoznik"
+msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../calendar/importers/icalendar-importer.c:1069
-#: ../calendar/importers/icalendar-importer.c:1386
+#: ../calendar/importers/icalendar-importer.c:1101
+#: ../calendar/importers/icalendar-importer.c:1418
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "DogaÄaj"
 
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../calendar/importers/icalendar-importer.c:1387
+#: ../calendar/importers/icalendar-importer.c:1104
+#: ../calendar/importers/icalendar-importer.c:1419
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/importers/icalendar-importer.c:1075
-#: ../calendar/importers/icalendar-importer.c:1388
+#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1420
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "BeleÅka"
 
-#: ../calendar/importers/icalendar-importer.c:1084
+#: ../calendar/importers/icalendar-importer.c:1116
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1089
-#, fuzzy
-#| msgid "This and Prior Instances"
+#: ../calendar/importers/icalendar-importer.c:1121
 msgctxt "iCalImp"
 msgid "is an instance"
-msgstr "Ovaj i prethodne unose"
+msgstr "je primerak"
 
-#: ../calendar/importers/icalendar-importer.c:1094
+#: ../calendar/importers/icalendar-importer.c:1126
+#, fuzzy
+#| msgid "Sh_ow a reminder"
 msgctxt "iCalImp"
-msgid "has alarms"
-msgstr "ima alarme"
+msgid "has reminders"
+msgstr "Pri_kaÅi podsetnik"
 
-#: ../calendar/importers/icalendar-importer.c:1099
-#, fuzzy
-#| msgid "%s attachment"
+#: ../calendar/importers/icalendar-importer.c:1131
 msgctxt "iCalImp"
 msgid "has attachments"
-msgstr "%s prilog"
+msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1112
+#: ../calendar/importers/icalendar-importer.c:1144
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1147
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "LiÄno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1150
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1122
+#: ../calendar/importers/icalendar-importer.c:1154
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../calendar/importers/icalendar-importer.c:1127
-#: ../calendar/importers/icalendar-importer.c:1427
+#: ../calendar/importers/icalendar-importer.c:1159
+#: ../calendar/importers/icalendar-importer.c:1459
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "SaÅetak"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1133
+#: ../calendar/importers/icalendar-importer.c:1165
 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:1141
-#: ../calendar/importers/icalendar-importer.c:1423
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1455
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "PoÄetak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1152
-#, fuzzy
-#| msgid "Due"
+#: ../calendar/importers/icalendar-importer.c:1184
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1164
+#: ../calendar/importers/icalendar-importer.c:1196
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1206
 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:1198
+#: ../calendar/importers/icalendar-importer.c:1230
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "ZavrÅeno"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1238
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1217
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1249
+#: ../calendar/importers/icalendar-importer.c:1252
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1240
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1272
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "UÄesnici"
 
-#: ../calendar/importers/icalendar-importer.c:1257
+#: ../calendar/importers/icalendar-importer.c:1289
 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:1419
+#: ../calendar/importers/icalendar-importer.c:1451
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Tip"
@@ -5424,7 +5425,7 @@ msgstr "Afrika/Libervil"
 
 #: ../calendar/zones.h:57
 msgid "Africa/Lome"
-msgstr "Afrika/Lomi"
+msgstr "Afrika/Lome"
 
 #: ../calendar/zones.h:58
 msgid "Africa/Luanda"
@@ -5456,7 +5457,7 @@ msgstr "Afrika/Mbabane"
 
 #: ../calendar/zones.h:65
 msgid "Africa/Mogadishu"
-msgstr "Afrika/MogadiÅ"
+msgstr "Afrika/MogadiÅo"
 
 #: ../calendar/zones.h:66
 msgid "Africa/Monrovia"
@@ -5464,7 +5465,7 @@ msgstr "Afrika/Monrovija"
 
 #: ../calendar/zones.h:67
 msgid "Africa/Nairobi"
-msgstr "Afrika/Nairobi"
+msgstr "Afrika/Najrobi"
 
 #: ../calendar/zones.h:68
 msgid "Africa/Ndjamena"
@@ -5480,7 +5481,7 @@ msgstr "Afrika/NuakÅot"
 
 #: ../calendar/zones.h:71
 msgid "Africa/Ouagadougou"
-msgstr "Afrika/Ugadugu"
+msgstr "Afrika/Uagadugu"
 
 #: ../calendar/zones.h:72
 msgid "Africa/Porto-Novo"
@@ -5504,7 +5505,7 @@ msgstr "Afrika/Tunis"
 
 #: ../calendar/zones.h:77
 msgid "Africa/Windhoek"
-msgstr "Afrika/Vindek"
+msgstr "Afrika/Vindoek"
 
 #: ../calendar/zones.h:78
 msgid "America/Adak"
@@ -5532,7 +5533,7 @@ msgstr "Amerika/Aruba"
 
 #: ../calendar/zones.h:84
 msgid "America/Asuncion"
-msgstr "Amerika/Asankon"
+msgstr "Amerika/Asansjon"
 
 #: ../calendar/zones.h:85
 msgid "America/Barbados"
@@ -5556,7 +5557,7 @@ msgstr "Amerika/Bogota"
 
 #: ../calendar/zones.h:90
 msgid "America/Boise"
-msgstr "Amerika/Boz"
+msgstr "Amerika/Buaz"
 
 #: ../calendar/zones.h:91
 msgid "America/Buenos_Aires"
@@ -5592,7 +5593,7 @@ msgstr "Amerika/Äikago"
 
 #: ../calendar/zones.h:99
 msgid "America/Chihuahua"
-msgstr "Amerika/Äihuahua"
+msgstr "Amerika/Äiuaua"
 
 #: ../calendar/zones.h:100
 msgid "America/Cordoba"
@@ -5604,7 +5605,7 @@ msgstr "Amerika/Kostarika"
 
 #: ../calendar/zones.h:102
 msgid "America/Cuiaba"
-msgstr "Amerika/Kulaba"
+msgstr "Amerika/Kujaba"
 
 #: ../calendar/zones.h:103
 msgid "America/Curacao"
@@ -5672,7 +5673,7 @@ msgstr "Amerika/Grenada"
 
 #: ../calendar/zones.h:119
 msgid "America/Guadeloupe"
-msgstr "Amerika/Gvadalup"
+msgstr "Amerika/Gvadalupa"
 
 #: ../calendar/zones.h:120
 msgid "America/Guatemala"
@@ -6617,7 +6618,7 @@ msgstr "Evropa/Zagreb"
 
 #: ../calendar/zones.h:355
 msgid "Europe/Zaporozhye"
-msgstr "Evropa/Zaropozje"
+msgstr "Evropa/ZaporoÅje"
 
 #: ../calendar/zones.h:356
 msgid "Europe/Zurich"
@@ -6665,7 +6666,7 @@ msgstr "Indijski/Majot"
 
 #: ../calendar/zones.h:367
 msgid "Indian/Reunion"
-msgstr "Indijski/Rejunion"
+msgstr "Indijski/Riunion"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Apia"
@@ -6827,11 +6828,6 @@ msgstr "Pacifik/Jap"
 msgid "Save as..."
 msgstr "SaÄuvaj kao..."
 
-#: ../composer/e-composer-actions.c:291
-#: ../widgets/misc/e-attachment-view.c:439
-msgid "Attach a file"
-msgstr "PrilaÅe datoteku"
-
 #: ../composer/e-composer-actions.c:296
 #: ../widgets/misc/e-signature-editor.c:207
 msgid "_Close"
@@ -6839,7 +6835,7 @@ msgstr "_Zatvori"
 
 #: ../composer/e-composer-actions.c:298
 msgid "Close the current file"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "Zatvorite trenutnu datoteku"
 
 #: ../composer/e-composer-actions.c:303
 msgid "New _Message"
@@ -6849,13 +6845,13 @@ msgstr "Nova _poruka"
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1537
+#: ../composer/e-composer-actions.c:312 ../shell/e-shell-window-actions.c:1511
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
 #: ../composer/e-composer-actions.c:319
 msgid "Save the current file"
-msgstr "Äuva trenutnu datoteku"
+msgstr "SaÄuvajte trenutnu datoteku"
 
 #: ../composer/e-composer-actions.c:324
 msgid "Save _As..."
@@ -6863,7 +6859,7 @@ msgstr "SaÄuvaj _kao..."
 
 #: ../composer/e-composer-actions.c:326
 msgid "Save the current file with a different name"
-msgstr "Äuva trenutnu datoteku pod drugim imenom"
+msgstr "SaÄuvajte trenutnu datoteku pod drugim imenom"
 
 #: ../composer/e-composer-actions.c:333
 msgid "Character _Encoding"
@@ -6883,7 +6879,7 @@ msgstr "SaÄuvaj kao _nacrt"
 
 #: ../composer/e-composer-actions.c:366
 msgid "Save as draft"
-msgstr "Äuva kao nacrt"
+msgstr "SaÄuvajte kao nacrt"
 
 #: ../composer/e-composer-actions.c:371 ../composer/e-composer-private.c:352
 msgid "S_end"
@@ -6891,7 +6887,7 @@ msgstr "PoÅ_alji"
 
 #: ../composer/e-composer-actions.c:373
 msgid "Send this message"
-msgstr "Åalje ovu poruku"
+msgstr "PoÅaljite ovu poruku"
 
 #: ../composer/e-composer-actions.c:381
 msgid "PGP _Encrypt"
@@ -6899,7 +6895,7 @@ msgstr "PGP _Åifruj"
 
 #: ../composer/e-composer-actions.c:383
 msgid "Encrypt this message with PGP"
-msgstr "Åifruje ovu poruku pomoÄu PGP-a"
+msgstr "Åifrujte ovu poruku pomoÄu PGP-a"
 
 #: ../composer/e-composer-actions.c:389
 msgid "PGP _Sign"
@@ -6907,15 +6903,15 @@ msgstr "PGP _potpiÅi"
 
 #: ../composer/e-composer-actions.c:391
 msgid "Sign this message with your PGP key"
-msgstr "Potpisuje ovu poruku pomoÄu PGP kljuÄa"
+msgstr "PotpiÅite ovu poruku pomoÄu PGP kljuÄa"
 
 #: ../composer/e-composer-actions.c:397
 msgid "_Picture Gallery"
-msgstr ""
+msgstr "Galerija _slika"
 
 #: ../composer/e-composer-actions.c:399
 msgid "Show a collection of pictures that you can drag to your message"
-msgstr ""
+msgstr "Prikazuje zbirku slika koje moÅete da prevuÄete u vaÅu poruku"
 
 #: ../composer/e-composer-actions.c:405
 msgid "_Prioritize Message"
@@ -6939,7 +6935,7 @@ msgstr "S/MIME _Åifruj"
 
 #: ../composer/e-composer-actions.c:423
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "Åifruje ovu poruku pomoÄu S/MIME sertifikata za Åifrovanje"
+msgstr "Åifruje ovu poruku pomoÄu S/MIME uverenja za Åifrovanje"
 
 #: ../composer/e-composer-actions.c:429
 msgid "S/MIME Sig_n"
@@ -6947,7 +6943,7 @@ msgstr "S/MIME _potpiÅi"
 
 #: ../composer/e-composer-actions.c:431
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Potpisuje ovu poruku S/MIME sertifikatom"
+msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
 #: ../composer/e-composer-actions.c:437
 msgid "_Bcc Field"
@@ -6955,7 +6951,7 @@ msgstr "_Bcc polje"
 
 #: ../composer/e-composer-actions.c:439
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Bira da li je polje BCC prikazano"
+msgstr "Bira da li je polje Bcc prikazano"
 
 #: ../composer/e-composer-actions.c:445
 msgid "_Cc Field"
@@ -6967,7 +6963,7 @@ msgstr "Bira da li je polje CC prikazano"
 
 #: ../composer/e-composer-actions.c:453
 msgid "_Reply-To Field"
-msgstr "Odgo_vor-za polje"
+msgstr "Polje Odgo_vor-za"
 
 #: ../composer/e-composer-actions.c:455
 msgid "Toggles whether the Reply-To field is displayed"
@@ -6983,17 +6979,17 @@ msgstr "Unesite primaoce poruke"
 
 #: ../composer/e-composer-header-table.c:42
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Unesite adrese koje Äe primiti kopiju (cc) poruke"
+msgstr "Unesite adrese koje Äe primiti grafitnu kopiju (cc) poruke"
 
 #: ../composer/e-composer-header-table.c:45
 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"
+"Unesite adrese koje Äe primiti grafitnu kopiju poruke bez pojavljivanja u "
+"listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:1020
+#: ../composer/e-composer-header-table.c:1021
 msgid "Fr_om:"
 msgstr "Å_alje:"
 
@@ -7001,31 +6997,31 @@ 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:1029
+#: ../composer/e-composer-header-table.c:1030
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:1033
+#: ../composer/e-composer-header-table.c:1034
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:1038
+#: ../composer/e-composer-header-table.c:1039
 msgid "_Cc:"
-msgstr "_Kopija (Cc):"
+msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:1043
+#: ../composer/e-composer-header-table.c:1044
 msgid "_Bcc:"
-msgstr "_Nevidljiva kopija (Bcc):"
+msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:1048
+#: ../composer/e-composer-header-table.c:1049
 msgid "_Post To:"
-msgstr "S_lanje na:"
+msgstr "Objavi _na:"
 
-#: ../composer/e-composer-header-table.c:1052
+#: ../composer/e-composer-header-table.c:1053
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:1061
+#: ../composer/e-composer-header-table.c:1062
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
@@ -7055,39 +7051,34 @@ msgstr "PretraÅuje i zamenjuje tekst"
 
 #: ../composer/e-composer-private.c:372
 msgid "Save draft"
-msgstr "SaÄuvaj nacrt"
+msgstr "SaÄuvajte nacrt"
 
-#: ../composer/e-msg-composer.c:791
+#: ../composer/e-msg-composer.c:808
 #, 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 "
+"Nije moguÄe potpisivanje odlazeÄe poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:800
+#: ../composer/e-msg-composer.c:817
 #, 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"
+"Nije moguÄe Åifrovanje odlazeÄe poruke: nije postavljeno uverenje za Åifrovanje "
+"za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1695 ../composer/e-msg-composer.c:2079
+#: ../composer/e-msg-composer.c:1691 ../composer/e-msg-composer.c:2075
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4159
-#, fuzzy
-#| msgid ""
-#| "<b>(The composer contains a non-text message body, which cannot be "
-#| "edited.)</b>"
+#: ../composer/e-msg-composer.c:4213
 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>"
+msgstr "SastavljaÄ u telu poruke ne sadrÅi tekst, Åto ne moÅe biti izmenjeno."
 
-#: ../composer/e-msg-composer.c:4864
+#: ../composer/e-msg-composer.c:4918
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
@@ -7104,32 +7095,26 @@ msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
 #: ../composer/mail-composer.error.xml.h:3
-#, fuzzy
-#| msgid "Error occurred while spawning %s: %s."
 msgid "An error occurred while saving to your Drafts folder."
-msgstr "DoÅlo je do greÅke u pripremi %s: %s."
+msgstr "DoÅlo je do greÅke tokom Äuvanja u vaÅoj fascikli Nacrti."
 
 #: ../composer/mail-composer.error.xml.h:4
-#, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while saving to your Outbox folder."
-msgstr "DoÅlo je do greÅke u Åtampi"
+msgstr "DoÅlo je do greÅke tokom Äuvanja u vaÅoj fascikli Za slanje."
 
 #: ../composer/mail-composer.error.xml.h:5
-#, fuzzy
-#| msgid "An error occurred while printing"
 msgid "An error occurred while sending. How do you want to proceed?"
-msgstr "DoÅlo je do greÅke u Åtampi"
+msgstr "DoÅlo je do greÅke tokom slanja. Kako Åelite da nastavite?"
 
 #: ../composer/mail-composer.error.xml.h:6
 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?"
+msgstr "Sigurno Åelite da odbacite poruku, naslovljenu â{0}â, koju sastavljate?"
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "Zbog &quot;{0}&quot;, moÅda bude potrebno drugaÄije podesiti poÅtu."
+msgstr "Zbog â{0}â, moÅda bude potrebno drugaÄije podesiti poÅtu."
 
 # mail-composer:no-sig-file secondary
 # mail:no-create-tmp-path secondary
@@ -7138,7 +7123,7 @@ msgstr "Zbog &quot;{0}&quot;, moÅda bude potrebno drugaÄije podesiti poÅtu."
 # system:no-load-file secondary
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Because &quot;{1}&quot;."
-msgstr "Zbog &quot;{1}&quot;."
+msgstr "Zbog â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid ""
@@ -7146,6 +7131,9 @@ msgid ""
 "Outbox folder. When you are back online you can send the message by clicking "
 "the Send/Receive button in Evolution's toolbar."
 msgstr ""
+"Zato Åto radite van mreÅe, poruka Äe biti saÄuvana u vaÅoj lokalnoj fascikli "
+"Za slanje. Kada se vratite na mreÅu moÅete poslati poruku klikom na dugme "
+"PoÅalji/Primi na liniji alata Evolucije."
 
 #: ../composer/mail-composer.error.xml.h:10
 msgid ""
@@ -7153,37 +7141,37 @@ msgid ""
 "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 "
+"Zatvaranjem ovog prozora za sastavljanje trajno Äete odbaciti poruku, osim ako "
 "odluÄite da saÄuvate poruku u fascikli Nacrti. Ovo Äe omoguÄiti da nastavite "
 "poruku kasnije."
 
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not create message."
-msgstr "Nije moguÄe pravljenje poruke."
+msgstr "Ne mogu da napravim poruku."
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "Nije moguÄe Äitanje datoteke potpisa &quot;{0}&quot;."
+msgstr "Ne mogu da proÄitam datoteku potpisa â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "Nije moguÄe dobiti poruke za prilaganje od {0}."
+msgstr "Ne mogu da dobijem poruke za prilaganje â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Could not save to autosave file &quot;{0}&quot;."
-msgstr "Nije moguÄe Äuvanje u samoÄuvajuÄu datoteku &quot;{0}&quot;."
+msgstr "Ne mogu da saÄuvam u samoÄuvajuÄu datoteku â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Do you want to recover unfinished messages?"
-msgstr "Åelite li da spasite nedovrÅene poruke?"
+msgstr "Da li Åelite da spasite nedovrÅene poruke?"
 
 #: ../composer/mail-composer.error.xml.h:16
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "Preuzimanje u toku. Åelite li da poÅaljete poruku?"
+msgstr "Preuzimanje je u toku. Da li Åelite da poÅaljete poruku?"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "Error saving to autosave because &quot;{1}&quot;."
-msgstr "GreÅka u Äuvanju samoÄuvajuÄe datoteke zbog &quot;{1}&quot;."
+msgstr "GreÅka u Äuvanju samoÄuvajuÄe datoteke zbog â{1}â."
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
@@ -7194,89 +7182,76 @@ msgstr ""
 "Äe omoguÄiti da nastavite gde ste stali."
 
 #: ../composer/mail-composer.error.xml.h:19
-#, fuzzy
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to Outbox."
-msgstr "Äuvanje poruke u fasciklu â%sâ"
+msgstr "Äuvam poruku u fascikli Za slanje."
 
 #: ../composer/mail-composer.error.xml.h:20
-#, 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."
+msgstr "Datoteka â{0}â nije regularna i ne moÅe biti poslata u poruci."
 
-#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:123
-#, fuzzy
-#| msgid "Bad regular expression &quot;{0}&quot;."
+#: ../composer/mail-composer.error.xml.h:21 ../mail/mail.error.xml.h:124
 msgid "The reported error was &quot;{0}&quot;."
-msgstr "LoÅ regularan izraz &quot;{0}&quot;."
+msgstr "Prijavljena greÅka bejaÅe â{0}â."
 
 #: ../composer/mail-composer.error.xml.h:22
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
-msgstr ""
+msgstr "Prijavljena greÅka bejaÅe â{0}â. Poruka najverovatnije nije saÄuvana."
 
 #: ../composer/mail-composer.error.xml.h:23
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
-msgstr ""
+msgstr "Prijavljena greÅka bejaÅe â{0}â. Poruka nije poslata."
 
 #: ../composer/mail-composer.error.xml.h:24
-#, fuzzy
-#| msgid "You cannot attach the file `{0}' to this message."
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
-msgstr "Ne moÅete priloÅiti datoteku â{0}â ovoj poruci."
+msgstr "Ne moÅete priloÅiti datoteku â{0}â ovoj poruci."
 
 #: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
 #: ../composer/mail-composer.error.xml.h:26
-#, fuzzy
-#| msgid "An error occurred during processing: %s"
 msgid "Your message was sent, but an error occurred during post-processing."
-msgstr "Javila se greÅka u obradi: %s"
+msgstr "VaÅa poruka je poslata, ali je doÅlo do greÅke tokom post-obrade."
 
 #. Response codes were chosen somewhat arbitrarily.
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Continue Editing"
-msgstr "_Nastavi ureÄivanje"
+msgstr "Nastavi _ureÄivanje"
 
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Do not Recover"
-msgstr "Ne spaÅa_vaj"
+msgstr "N_e spaÅavaj"
 
 #: ../composer/mail-composer.error.xml.h:31
 msgid "_Recover"
-msgstr "Spa_si"
+msgstr "_Spasi"
 
 #: ../composer/mail-composer.error.xml.h:32
 msgid "_Save Draft"
-msgstr "_SaÄuvaj nacrt"
+msgstr "SaÄuvaj _nacrt"
 
 #: ../composer/mail-composer.error.xml.h:33
-#, fuzzy
-#| msgid "_Save as mbox..."
 msgid "_Save to Outbox"
-msgstr "_SaÄuvaj kao mbox..."
+msgstr "SaÄuvaj _u âZa slanjeâ"
 
 #: ../composer/mail-composer.error.xml.h:35
 msgid "_Try Again"
-msgstr ""
+msgstr "_PokuÅaj opet"
 
 #. TRANSLATORS: don't translate the terms in brackets
 #: ../capplet/anjal-settings-main.c:153
 msgid "ID of the socket to embed in"
-msgstr "IB soketa za umetanje"
+msgstr "IB prikljuÄka za umetanje"
 
 #: ../capplet/anjal-settings-main.c:154
 msgid "socket"
-msgstr "soket"
+msgstr "prikljuÄak"
 
 #: ../capplet/settings/mail-account-view.c:77
 msgid "Please enter your full name."
-msgstr "Unesite VaÅe puno ime."
+msgstr "Unesite vaÅe puno ime."
 
 #: ../capplet/settings/mail-account-view.c:78
 msgid "Please enter your email address."
@@ -7291,283 +7266,265 @@ msgid "Please enter your password."
 msgstr "Unesite vaÅu lozinku."
 
 #: ../capplet/settings/mail-account-view.c:259
-#: ../plugins/caldav/caldav-source.c:68
+#: ../plugins/caldav/caldav-source.c:67
 msgid "CalDAV"
-msgstr "CalDAV"
+msgstr "KolDAV"
 
 #: ../capplet/settings/mail-account-view.c:361
 #: ../capplet/settings/mail-account-view.c:413
+#: ../modules/online-accounts/e-online-accounts-google.c:287
+#: ../modules/online-accounts/e-online-accounts-google.c:359
 #: ../plugins/google-account-setup/google-contacts-source.c:55
-#: ../plugins/google-account-setup/google-source.c:83
+#: ../plugins/google-account-setup/google-source.c:87
 msgid "Google"
-msgstr "Google"
+msgstr "Gugl"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../capplet/settings/mail-account-view.c:463
+#: ../capplet/settings/mail-account-view.c:480
 msgid "Personal details:"
 msgstr "LiÄni podaci:"
 
-#: ../capplet/settings/mail-account-view.c:470
+#: ../capplet/settings/mail-account-view.c:487
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../capplet/settings/mail-account-view.c:479
+#: ../capplet/settings/mail-account-view.c:496
 msgid "Email address:"
 msgstr "Adresa e-poÅte:"
 
-#: ../capplet/settings/mail-account-view.c:489
-#, fuzzy
-#| msgid "Details"
+#: ../capplet/settings/mail-account-view.c:506
 msgid "Details:"
-msgstr "Detalji"
+msgstr "Detalji:"
 
-#: ../capplet/settings/mail-account-view.c:497
-#, fuzzy
-#| msgid "Receiving mail"
+#: ../capplet/settings/mail-account-view.c:514
 msgid "Receiving"
-msgstr "Primanje poÅte"
+msgstr "Primanje"
 
-#: ../capplet/settings/mail-account-view.c:504
+#: ../capplet/settings/mail-account-view.c:521
 msgid "Server type:"
 msgstr "Tip servera: "
 
-#: ../capplet/settings/mail-account-view.c:513
+#: ../capplet/settings/mail-account-view.c:530
 msgid "Server address:"
 msgstr "Adresa servera:"
 
-#: ../capplet/settings/mail-account-view.c:522
+#: ../capplet/settings/mail-account-view.c:539
 msgid "Username:"
 msgstr "KorisniÄkoime:"
 
-#: ../capplet/settings/mail-account-view.c:531
+#: ../capplet/settings/mail-account-view.c:548
 msgid "Use encryption:"
 msgstr "Koristi Åifrovanje:"
 
-#: ../capplet/settings/mail-account-view.c:536
-#: ../capplet/settings/mail-account-view.c:571
+#: ../capplet/settings/mail-account-view.c:553
+#: ../capplet/settings/mail-account-view.c:588
 msgid "never"
 msgstr "nikada"
 
-#: ../capplet/settings/mail-account-view.c:548
-#, fuzzy
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:565
 msgid "Sending"
-msgstr "RastuÄe"
+msgstr "Slanje"
 
-#: ../capplet/settings/mail-account-view.c:590
+#: ../capplet/settings/mail-account-view.c:607
 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."
+"Da koristite program za poÅtu potrebno je da podesite nalog. Unesite adresu "
+"e-poÅte i lozinku da pokuÅamo da prepoznamo postavke. Ukoliko to nije moguÄe "
+"automatski, moraÄete da dodate i podatke o serveru."
 
-#: ../capplet/settings/mail-account-view.c:592
+#: ../capplet/settings/mail-account-view.c:609
 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."
+"PokuÅali smo da sa podacima koje ste uneli zapoÄnemo podeÅavanje, ali moÅda "
+"Äe biti potrebno da ih izmenite."
 
-#: ../capplet/settings/mail-account-view.c:594
+#: ../capplet/settings/mail-account-view.c:611
 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:596
+#: ../capplet/settings/mail-account-view.c:613
 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."
+"Sada su nam potrebne postavke za slanje poÅte. PokuÅali smo da pogodimo "
+"postavke, ali je potrebno da ih proverite."
 
-#: ../capplet/settings/mail-account-view.c:597
+#: ../capplet/settings/mail-account-view.c:614
 msgid "You can specify your default settings for your account."
 msgstr "MoÅete odrediti podrazumevane postavke naloga."
 
-#: ../capplet/settings/mail-account-view.c:598
+#: ../capplet/settings/mail-account-view.c:615
 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."
+"Vreme je da proverimo postavke pre nego Åto pokuÅamo da se poveÅemo na "
+"server da bismo dobavili vaÅu poÅtu."
 
-#: ../capplet/settings/mail-account-view.c:613
-#: ../mail/em-account-editor.c:2180 ../mail/em-account-editor.c:2301
+#: ../capplet/settings/mail-account-view.c:630
+#: ../mail/em-account-editor.c:2233 ../mail/em-account-editor.c:2366
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../capplet/settings/mail-account-view.c:613
+#: ../capplet/settings/mail-account-view.c:630
 msgid "Next - Receiving mail"
-msgstr "Napred - Primanje poÅte"
+msgstr "Napred â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Receiving mail"
 msgstr "Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:614
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:631
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Next - Sending mail"
-msgstr "Napred - Slanje poÅte"
+msgstr "Napred â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Back - Identity"
-msgstr "Nazad - Identitet"
+msgstr "Nazad â Identitet"
 
-#: ../capplet/settings/mail-account-view.c:614
+#: ../capplet/settings/mail-account-view.c:631
 msgid "Next - Receiving options"
-msgstr "Napred - Opcije za primanje"
+msgstr "Napred â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:615
+#: ../capplet/settings/mail-account-view.c:632
 msgid "Receiving options"
 msgstr "Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:615
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:632
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving mail"
-msgstr "Nazad - Primanje poÅte"
+msgstr "Nazad â Primanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Sending mail"
 msgstr "Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:617
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:634
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Next - Review account"
-msgstr "Napred - Pregled postavki naloga"
+msgstr "Napred â Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Next - Defaults"
-msgstr "Napred - Podrazumevano"
+msgstr "Napred â Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:617
+#: ../capplet/settings/mail-account-view.c:634
 msgid "Back - Receiving options"
-msgstr "Nazad - Opcije za primanje"
+msgstr "Nazad â Opcije za primanje"
 
-#: ../capplet/settings/mail-account-view.c:618
-#: ../mail/em-account-editor.c:3140
+#: ../capplet/settings/mail-account-view.c:635
+#: ../mail/em-account-editor.c:3226
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: ../capplet/settings/mail-account-view.c:618
+#: ../capplet/settings/mail-account-view.c:635
 msgid "Back - Sending mail"
-msgstr "Nazad - Slanje poÅte"
+msgstr "Nazad â Slanje poÅte"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Review account"
 msgstr "Pregled postavki naloga"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Finish"
 msgstr "ZavrÅetak"
 
-#: ../capplet/settings/mail-account-view.c:620
+#: ../capplet/settings/mail-account-view.c:637
 msgid "Back - Sending"
-msgstr "Nazad - Slanje"
+msgstr "Nazad â Slanje"
 
-#: ../capplet/settings/mail-account-view.c:740
-#, fuzzy
-#| msgid "Add WebDAV contacts to Evolution."
+#: ../capplet/settings/mail-account-view.c:757
 msgid "Setup Google contacts with Evolution"
-msgstr "Dodaje WebDAV kontakte u Evoluciju."
+msgstr "Podesite Gugl kontakte sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:741
-#, fuzzy
-#| msgid "Add Google Calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:758
 msgid "Setup Google calendar with Evolution"
-msgstr "Dodaje Google kalendare u Evoluciju."
+msgstr "Podesite Gugl kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:746
+#: ../capplet/settings/mail-account-view.c:763
 msgid "You may need to enable IMAP access."
-msgstr "MoÅda je potrebno omoguÄiti IMAP pristup."
+msgstr "MoÅda Äete morati da omoguÄite IMAP pristup."
 
-#: ../capplet/settings/mail-account-view.c:754
-#, fuzzy
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:771
 msgid "Google account settings:"
-msgstr "IzraÄuje rezervnu kopiju naloga i postavke Evolucije"
+msgstr "PodeÅavanja Gugl naloga:"
 
-#: ../capplet/settings/mail-account-view.c:780
-#, fuzzy
-#| msgid "Add weather calendars to Evolution."
+#: ../capplet/settings/mail-account-view.c:797
 msgid "Setup Yahoo calendar with Evolution"
-msgstr "Dodaje kalendare za vreme u Evoluciju."
+msgstr "Podesite Jahu kalendar sa Evolucijom"
 
-#: ../capplet/settings/mail-account-view.c:784
+#: ../capplet/settings/mail-account-view.c:801
 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 "
+"Jahu 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:793
-#, fuzzy
-#| msgid "Backing Evolution accounts and settings"
+#: ../capplet/settings/mail-account-view.c:810
 msgid "Yahoo account settings:"
-msgstr "IzraÄuje rezervnu kopiju naloga i postavke Evolucije"
+msgstr "PodeÅavanja Jahu naloga:"
 
-#: ../capplet/settings/mail-account-view.c:807
-#, fuzzy
-#| msgid "Choose calendar file"
+#: ../capplet/settings/mail-account-view.c:824
 msgid "Yahoo Calendar name:"
-msgstr "Izaberite datoteku kalendara"
+msgstr "Ime Jahu kalendara:"
 
-#: ../capplet/settings/mail-account-view.c:1079
+#: ../capplet/settings/mail-account-view.c:1094
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../capplet/settings/mail-account-view.c:1130
+#: ../capplet/settings/mail-account-view.c:1145
 #: ../capplet/settings/mail-settings-view.c:248
 msgid "Close Tab"
 msgstr "Zatvori jeziÄak"
 
-#: ../capplet/settings/mail-account-view.c:1140
+#: ../capplet/settings/mail-account-view.c:1155
 msgid "Account Wizard"
 msgstr "Äarobnjak naloga"
 
-#: ../capplet/settings/mail-capplet-shell.c:209
+#: ../capplet/settings/mail-capplet-shell.c:212
 msgid "Evolution account assistant"
 msgstr "PomoÄnik naloga Evolucije"
 
 # On This Computer is always first and VFolders is always last
 #. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:744
-#: ../mail/e-mail-store.c:234 ../mail/em-folder-tree-model.c:146
-#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
-#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:161
-#: ../mail/em-folder-tree-model.c:163 ../mail/mail-vfolder.c:235
-#: ../mail/message-list.c:1714
-#: ../modules/addressbook/e-book-shell-backend.c:96
+#: ../capplet/settings/mail-capplet-shell.c:372 ../mail/e-mail-local.c:81
+#: ../mail/e-mail-migrate.c:744 ../mail/em-folder-tree-model.c:149
+#: ../mail/em-folder-tree-model.c:152 ../mail/em-folder-tree-model.c:155
+#: ../mail/em-folder-tree-model.c:157 ../mail/em-folder-tree-model.c:164
+#: ../mail/em-folder-tree-model.c:166
+#: ../modules/addressbook/e-book-shell-backend.c:100
 #: ../modules/addressbook/e-book-shell-migrate.c:136
-#: ../modules/calendar/e-cal-shell-backend.c:109
+#: ../modules/calendar/e-cal-shell-backend.c:113
 #: ../modules/calendar/e-cal-shell-migrate.c:154
-#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-backend.c:102
 #: ../modules/calendar/e-memo-shell-migrate.c:109
-#: ../modules/calendar/e-task-shell-backend.c:98
+#: ../modules/calendar/e-task-shell-backend.c:102
 #: ../modules/calendar/e-task-shell-migrate.c:121
 msgid "On This Computer"
 msgstr "Na ovom raÄunaru"
 
 #: ../capplet/settings/mail-settings-view.c:145
-#, fuzzy, c-format
-#| msgid "Modify"
+#, c-format
 msgid "Modify %s..."
-msgstr "Izmeni"
+msgstr "Izmeni %s..."
 
 #: ../capplet/settings/mail-settings-view.c:147
 msgid "Add a new account"
-msgstr "Dodaj novi nalog"
+msgstr "Dodajte novi nalog"
 
 #: ../capplet/settings/mail-settings-view.c:183
 msgid "Account management"
@@ -7579,7 +7536,7 @@ msgstr "Postavke"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Calendar event notifications"
-msgstr "ObaveÅtenja o kalendarskim dogaÄajima"
+msgstr "ObaveÅtenja o dogaÄajima kalendara"
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:2
 msgid "Evolution Alarm Notify"
@@ -7593,18 +7550,18 @@ msgstr "Evolucija"
 
 #: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
-msgstr "PoÅta i kalendar Evolucije"
+msgstr "Evolucija â poÅta i kalendar"
 
 # 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:657
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:654
 msgid "Groupware Suite"
-msgstr "Paket Groupware"
+msgstr "Paket grupe"
 
 #: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
-msgstr "Upravlja poÅtom, kontaktima i obavezama"
+msgstr "Upravljajte vaÅom poÅtom, kontaktima i obavezama"
 
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Configure email accounts"
@@ -7630,20 +7587,19 @@ msgstr "%s (zavrÅeno)"
 #: ../e-util/e-activity.c:233
 #, c-format
 msgid "%s (waiting)"
-msgstr ""
+msgstr "%s (Äekam)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
 #: ../e-util/e-activity.c:237
-#, fuzzy, c-format
-#| msgid "%s (cancelled)"
+#, c-format
 msgid "%s (cancelling)"
-msgstr "%s (otkazano)"
+msgstr "%s (otkazujem)"
 
 #: ../e-util/e-activity.c:239
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: ../e-util/e-activity.c:244
 #, c-format
@@ -7652,39 +7608,39 @@ msgstr "%s (%d%% zavrÅeno)"
 
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
-msgstr "arapski"
+msgstr "Arapski"
 
 #: ../e-util/e-charset.c:54
 msgid "Baltic"
-msgstr "BaltiÄka"
+msgstr "BaltiÄki"
 
 #: ../e-util/e-charset.c:55
 msgid "Central European"
-msgstr "Centralnoevropska"
+msgstr "Centralnoevropski"
 
 #: ../e-util/e-charset.c:56
 msgid "Chinese"
-msgstr "Kineska"
+msgstr "Kineski"
 
 #: ../e-util/e-charset.c:57
 msgid "Cyrillic"
-msgstr "ÄiriliÄna"
+msgstr "ÄiriliÄni"
 
 #: ../e-util/e-charset.c:58
 msgid "Greek"
-msgstr "GrÄka"
+msgstr "GrÄki"
 
 #: ../e-util/e-charset.c:59
 msgid "Hebrew"
-msgstr "Hebrejska"
+msgstr "Hebrejski"
 
 #: ../e-util/e-charset.c:60
 msgid "Japanese"
-msgstr "Japanska"
+msgstr "Japanski"
 
 #: ../e-util/e-charset.c:61
 msgid "Korean"
-msgstr "Korejska"
+msgstr "Korejski"
 
 #: ../e-util/e-charset.c:62
 msgid "Thai"
@@ -7692,7 +7648,7 @@ msgstr "Tajvanski"
 
 #: ../e-util/e-charset.c:63
 msgid "Turkish"
-msgstr "Turska"
+msgstr "Turski"
 
 #: ../e-util/e-charset.c:64
 msgid "Unicode"
@@ -7700,36 +7656,36 @@ msgstr "Unikod"
 
 #: ../e-util/e-charset.c:65
 msgid "Western European"
-msgstr "Zapadnoevropska"
+msgstr "Zapadnoevropski"
 
 #: ../e-util/e-charset.c:66
 msgid "Western European, New"
-msgstr "Zapadnoevropska, nova"
+msgstr "Zapadnoevropski, novi"
 
 #. 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"
+msgstr "Tradicionalni"
 
 #. 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"
+msgstr "Pojednostavljeni"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
 #: ../e-util/e-charset.c:101
 msgid "Ukrainian"
-msgstr "Ukrajinska"
+msgstr "Ukrajinski"
 
 #. Translators: Character set "Hebrew, Visual"
 #: ../e-util/e-charset.c:105
 msgid "Visual"
-msgstr "Vizuelna"
+msgstr "Vizuelni"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:199
-#: ../modules/calendar/e-cal-shell-view-actions.c:1823
+#: ../modules/calendar/e-cal-shell-view-actions.c:1855
 #: ../plugins/itip-formatter/itip-view.c:191
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
@@ -7748,76 +7704,62 @@ msgstr "JuÄe"
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:220
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Mon"
-msgstr "SledeÄe"
+msgstr "SledeÄeg %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:226
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Tue"
-msgstr "_SledeÄa rasprava"
+msgstr "SledeÄeg %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:232
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Wed"
-msgstr "_SledeÄa rasprava"
+msgstr "SledeÄe %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:238
-#, fuzzy
-#| msgid "Next _Thread"
 msgctxt "DateFmt"
 msgid "Next Thu"
-msgstr "_SledeÄa rasprava"
+msgstr "SledeÄeg %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:244
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Fri"
-msgstr "SledeÄe"
+msgstr "SledeÄeg %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:250
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Sat"
-msgstr "SledeÄe"
+msgstr "SledeÄe %a"
 
 #. Translators: This is used for abbreviated days in the future.
 #. You can use strftime modifiers here too, like "Next %a", to avoid
 #. repeated translation of the abbreviated day name.
 #: ../e-util/e-datetime-format.c:256
-#, fuzzy
-#| msgid "Next"
 msgctxt "DateFmt"
 msgid "Next Sun"
-msgstr "SledeÄe"
+msgstr "SledeÄe %a"
 
 #: ../e-util/e-datetime-format.c:338 ../e-util/e-datetime-format.c:348
 #: ../e-util/e-datetime-format.c:357
 msgid "Use locale default"
-msgstr "Koristi podrazumevan lokalitet"
+msgstr "Koristi podrazumevani lokalitet"
 
 #: ../e-util/e-datetime-format.c:554
 msgid "Format:"
@@ -7831,14 +7773,14 @@ msgstr "(Nepoznato ime datoteke)"
 #: ../e-util/e-file-utils.c:155
 #, c-format
 msgid "Writing \"%s\""
-msgstr "Upisivanje â%sâ"
+msgstr "Upisujem â%sâ"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
 #: ../e-util/e-file-utils.c:160
 #, c-format
 msgid "Writing \"%s\" to %s"
-msgstr "Upisivanje â%sâ u %s"
+msgstr "Upisujem â%sâ u %s"
 
 #: ../e-util/e-plugin-util.c:429 ../filter/filter.ui.h:22
 #: ../plugins/google-account-setup/google-contacts-source.c:380
@@ -7848,16 +7790,16 @@ msgstr "nedelje"
 
 #: ../e-util/e-print.c:161
 msgid "An error occurred while printing"
-msgstr "DoÅlo je do greÅke u Åtampi"
+msgstr "DoÅlo je do greÅke za vreme Åtampanja"
 
 #: ../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:"
+msgstr "Sistem za Åtampanje je izvestio sledeÄe detalje o greÅci:"
 
 #: ../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."
+msgstr "Sistem za Åtampanje nije ponudio nikakve dodatne detalje o greÅci."
 
 #: ../e-util/e-signature.c:707
 msgid "Autogenerated"
@@ -7874,11 +7816,11 @@ msgstr "Zbog â{1}â."
 
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file \"{0}\"."
-msgstr "Nije moguÄe otvoriti datoteku â{0}â."
+msgstr "Ne mogu da otvorim datoteku â{0}â."
 
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file \"{0}\"."
-msgstr "Nije moguÄe saÄuvati datoteku â{0}â."
+msgstr "Ne mogu da saÄuvam datoteku â{0}â."
 
 #: ../e-util/e-system.error.xml.h:4
 msgid "Do you wish to overwrite it?"
@@ -7888,125 +7830,123 @@ 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:163
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:164
 msgid "_Overwrite"
 msgstr "_PrepiÅi"
 
 #: ../e-util/e-util.c:117
 msgid "Could not open the link."
-msgstr "Nije moguÄe otvoriti vezu."
+msgstr "Ne mogu da otvorim vezu."
 
 #: ../e-util/e-util.c:164
 msgid "Could not display help for Evolution."
-msgstr "Nije moguÄe prikazati pomoÄ za Evoluciju."
+msgstr "Ne mogu da prikaÅem pomoÄ za Evoluciju."
 
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1332
 #, c-format
 msgid "GConf error: %s"
-msgstr "GConf greÅka: %s"
+msgstr "Gkonf greÅka: %s"
 
-#: ../e-util/gconf-bridge.c:1329
+#: ../e-util/gconf-bridge.c:1343
 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:284 ../em-format/em-format.c:1054
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1054
 #: ../mail/e-mail-tag-editor.c:325 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "From"
 msgstr "Åalje"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1055
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1055
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1057
-#: ../mail/em-format-html.c:2479 ../mail/em-format-html.c:2547
-#: ../mail/em-format-html.c:2570 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1057
+#: ../mail/em-format-html.c:2574 ../mail/em-format-html.c:2642
+#: ../mail/em-format-html.c:2665 ../modules/mail/em-mailer-prefs.c:75
 msgid "Cc"
-msgstr "Kopija (Cc)"
+msgstr "Cc"
 
-#: ../em-format/em-format-quote.c:284 ../em-format/em-format.c:1058
-#: ../mail/em-format-html.c:2480 ../mail/em-format-html.c:2551
-#: ../mail/em-format-html.c:2573 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format-quote.c:319 ../em-format/em-format.c:1058
+#: ../mail/em-format-html.c:2575 ../mail/em-format-html.c:2646
+#: ../mail/em-format-html.c:2668 ../modules/mail/em-mailer-prefs.c:76
 msgid "Bcc"
-msgstr "Nevidljiva kopija (Bcc)"
+msgstr "Bcc"
 
-#: ../em-format/em-format-quote.c:428 ../em-format/em-format.c:1059
+#: ../em-format/em-format-quote.c:463 ../em-format/em-format.c:1059
 #: ../mail/e-mail-tag-editor.c:330 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:75
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:77
 #: ../smime/lib/e-cert.c:1142
 msgid "Subject"
 msgstr "Naslov"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:439 ../mail/em-format-html.c:2667
-#: ../modules/mail/em-mailer-prefs.c:1124
+#: ../em-format/em-format-quote.c:474 ../mail/em-format-html.c:2767
+#: ../modules/mail/em-mailer-prefs.c:1008
 msgid "Mailer"
 msgstr "PoÅiljalac"
 
-#: ../em-format/em-format-quote.c:520 ../mail/em-composer-utils.c:1190
+#: ../em-format/em-format-quote.c:564 ../mail/em-composer-utils.c:1199
 msgid "-------- Forwarded Message --------"
 msgstr "-------- ProsleÄena poruka --------"
 
 #: ../em-format/em-format.c:1060 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:523
+#: ../modules/mail/em-mailer-prefs.c:78 ../widgets/misc/e-dateedit.c:523
 #: ../widgets/misc/e-dateedit.c:545
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1061 ../modules/mail/em-mailer-prefs.c:79
 msgid "Newsgroups"
-msgstr "Grupe za vesti"
+msgstr "Grupe vesti"
 
-#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1062 ../modules/mail/em-mailer-prefs.c:80
 #: ../plugins/face/org-gnome-face.eplug.xml.h:2
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/em-format.c:1465
+#: ../em-format/em-format.c:1466
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../em-format/em-format.c:1576
+#: ../em-format/em-format.c:1577
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nije moguÄa obrada S/MIME poruke: nepoznata greÅka"
+msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greÅka"
 
-#: ../em-format/em-format.c:1768 ../em-format/em-format.c:1994
+#: ../em-format/em-format.c:1771 ../em-format/em-format.c:1997
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nije moguÄa obrada MIME poruke. Prikazivanje izvora."
+msgstr "Ne mogu da obradim MIME poruku. Prikazivanje izvora."
 
-#: ../em-format/em-format.c:1779
+#: ../em-format/em-format.c:1782
 msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "NepodrÅani tip Åifre za multipart/encrypted"
+msgstr "NepodrÅani tip Åifre za viÅedelni/Åifrovan (multipart/encrypted)"
 
-#: ../em-format/em-format.c:1799
+#: ../em-format/em-format.c:1802
 msgid "Could not parse PGP/MIME message"
-msgstr "Nije moguÄa obrada PGP/MIME poruke"
+msgstr "Ne mogu da analiziram PGP/MIME poruku"
 
-#: ../em-format/em-format.c:1800
+#: ../em-format/em-format.c:1803
 msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Nije moguÄa obrada PGP/MIME poruke: nepoznata greÅka"
+msgstr "Ne mogu da analiziram PGP/MIME poruku: nepoznata greÅka"
 
-#: ../em-format/em-format.c:2019
+#: ../em-format/em-format.c:2022
 msgid "Unsupported signature format"
 msgstr "NepodrÅan oblik potpisa"
 
-#: ../em-format/em-format.c:2032 ../em-format/em-format.c:2214
+#: ../em-format/em-format.c:2035 ../em-format/em-format.c:2217
 msgid "Error verifying signature"
 msgstr "GreÅka pri proveri potpisa"
 
-#: ../em-format/em-format.c:2033 ../em-format/em-format.c:2199
-#: ../em-format/em-format.c:2215
+#: ../em-format/em-format.c:2036 ../em-format/em-format.c:2202
+#: ../em-format/em-format.c:2218
 msgid "Unknown error verifying signature"
 msgstr "Nepoznata greÅka pri proveri potpisa"
 
-#: ../em-format/em-format.c:2307
-#, fuzzy
-#| msgid "Could not parse PGP message"
+#: ../em-format/em-format.c:2310
 msgid "Could not parse PGP message: "
-msgstr "Nije moguÄa obrada PGP poruke."
+msgstr "Ne mogu da analiziram PGP poruku:"
 
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
@@ -8114,8 +8054,8 @@ msgstr[3] "pre %d mesec"
 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[1] "%d meseca u buduÄnosti"
+msgstr[2] "%d meseci u buduÄnost"
 msgstr[3] "%d mesec u buduÄnosti"
 
 #: ../filter/e-filter-datespec.c:78
@@ -8206,7 +8146,9 @@ msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
 #: ../filter/e-filter-rule.c:759
-msgid "I_nclude threads"
+#, fuzzy
+#| msgid "I_nclude threads"
+msgid "I_nclude threads:"
 msgstr "U_kljuÄi niti"
 
 #: ../filter/e-filter-rule.c:784
@@ -8232,15 +8174,15 @@ msgstr "Uredi pravilo"
 
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
-msgstr "LoÅ regularan izraz &quot;{0}&quot;."
+msgstr "LoÅ regularan izraz â{0}â."
 
 #: ../filter/filter.error.xml.h:2
 msgid "Could not compile regular expression &quot;{1}&quot;."
-msgstr "Nije moguÄe prevoÄenje regularnog izraza &quot;{1}&quot;."
+msgstr "Ne mogu da prevedem regularan izraz â{1}â."
 
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
-msgstr "Datoteka &quot;{0}&quot; ne postoji ili nije regularna."
+msgstr "Datoteka â{0}â ne postoji ili nije regularna."
 
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
@@ -8251,13 +8193,13 @@ msgid "Missing file name."
 msgstr "Nedostaje ime datoteke."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:89
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:90
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
 #: ../filter/filter.error.xml.h:7
 msgid "Name &quot;{0}&quot; already used."
-msgstr "Ime &quot;{0}&quot; je veÄ upotrebljeno."
+msgstr "Ime â{0}âje veÄ upotrebljeno."
 
 #: ../filter/filter.error.xml.h:8
 msgid "Please choose another name."
@@ -8346,8 +8288,138 @@ msgstr "vreme koje odredite"
 msgid "years"
 msgstr "godine"
 
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
+#: ../mail/em-account-editor.c:845 ../widgets/misc/e-signature-combo-box.c:75
+msgctxt "mail-signature"
+msgid "None"
+msgstr "NiÅta"
+
+#: ../mail/em-account-editor.c:926
+msgid "Never"
+msgstr "Nikada"
+
+#: ../mail/em-account-editor.c:927
+msgid "Always"
+msgstr "Uvek"
+
+#: ../mail/em-account-editor.c:928
+msgid "Ask for each message"
+msgstr "Pitaj za svaku poruku"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
+#: ../mail/em-account-editor.c:1786 ../widgets/misc/e-account-tree-view.c:131
+msgctxt "mail-receiving"
+msgid "None"
+msgstr "NiÅta"
+
+#: ../mail/em-account-editor.c:2230
+msgid "Mail Configuration"
+msgstr "PodeÅavanje poÅte"
+
+#: ../mail/em-account-editor.c:2231
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Continue\" to begin."
+msgstr ""
+"DobrodoÅli u PomoÄnika podeÅavanja poÅte Evolucije.\n"
+"\n"
+"Kliknite âNastaviâ da zapoÄnete. "
+
+#: ../mail/em-account-editor.c:2234
+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 ime i elektronsku adresu. âNeobaveznaâ polja ne moraju biti popunjena, "
+"osim ako ne Åelite da ove podatke ukljuÄite u poruke koje Åaljete."
+
+#: ../mail/em-account-editor.c:2236 ../mail/em-account-editor.c:2425
+msgid "Receiving Email"
+msgstr "Primanje poÅte"
+
+#: ../mail/em-account-editor.c:2237
+msgid "Please configure the following account settings."
+msgstr "Podesite sledeÄe postavke naloga."
+
+#: ../mail/em-account-editor.c:2239 ../mail/em-account-editor.c:3022
+msgid "Sending Email"
+msgstr "Slanje poÅte"
+
+#: ../mail/em-account-editor.c:2240
+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 dostavljaÄa Internet usluga."
+
+#: ../mail/em-account-editor.c:2242 ../mail/mail-config.ui.h:1
+msgid "Account Information"
+msgstr "Podaci o nalogu"
+
+#: ../mail/em-account-editor.c:2243
+msgid ""
+"Please enter a descriptive name for this account below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"Unesite opisno ime za ovaj nalog.\n"
+"Ovo ime Äe biti koriÅÄeno samo za prikaz."
+
+#: ../mail/em-account-editor.c:2247
+msgid "Done"
+msgstr "UraÄeno"
+
+#: ../mail/em-account-editor.c:2248
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"Äestitamo, podeÅavanje poÅte je zavrÅeno.\n"
+"\n"
+"Sada ste spremni koristite Evoluciju za slanje i primanje poÅte.\n"
+"\n"
+"Kliknite âPrimeniâ da saÄuvate postavke."
+
+#: ../mail/em-account-editor.c:2784
+msgid "Check for _new messages every"
+msgstr "Proveri za _novu poÅtu svakih"
+
+# bug: plural-forms
+#: ../mail/em-account-editor.c:2792
+msgid "minu_tes"
+msgstr "minu_ta"
+
+#: ../mail/em-account-editor.c:3365 ../mail/mail-config.ui.h:101
+msgid "Security"
+msgstr "Bezbednost"
+
+#. 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:3419 ../mail/em-account-editor.c:3502
+msgid "Receiving Options"
+msgstr "Opcije za primanje"
+
+#: ../mail/em-account-editor.c:3420 ../mail/em-account-editor.c:3503
+msgid "Checking for New Messages"
+msgstr "Proveranje za nove poruke"
+
 #: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
-#: ../mail/em-format-html-display.c:1156 ../mail/mail-config.ui.h:14
+#: ../mail/em-format-html-display.c:1395 ../mail/mail-config.ui.h:14
 #: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:128
 #: ../widgets/misc/e-attachment-paned.c:133
 msgid "Attachment"
@@ -8360,22 +8432,22 @@ msgstr[3] "Prilog"
 #: ../mail/e-mail-attachment-bar.c:608
 #: ../widgets/misc/e-attachment-paned.c:623
 msgid "Icon View"
-msgstr "Pregled sa ikonama"
+msgstr "Pregled ikonicama"
 
 #: ../mail/e-mail-attachment-bar.c:610
 #: ../widgets/misc/e-attachment-paned.c:625
 msgid "List View"
-msgstr "Pregled sa spiskom"
+msgstr "Pregled spiskom"
 
-#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1446
-#: ../shell/e-shell-window-actions.c:1453
-#: ../shell/e-shell-window-actions.c:1460
+#: ../mail/e-mail-browser.c:134 ../shell/e-shell-window-actions.c:1427
+#: ../shell/e-shell-window-actions.c:1434
+#: ../shell/e-shell-window-actions.c:1441
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
 #: ../mail/e-mail-browser.c:291
 msgid "(No Subject)"
-msgstr ""
+msgstr "(Bez subjekta)"
 
 #: ../mail/e-mail-display.c:66
 msgid "_Add to Address Book..."
@@ -8390,16 +8462,12 @@ msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
 #: ../mail/e-mail-display.c:87
-#, fuzzy
-#| msgid "_Send To..."
 msgid "Send _Reply To..."
-msgstr "_PoÅalji za..."
+msgstr "_PoÅalji odgovor..."
 
 #: ../mail/e-mail-display.c:89
-#, fuzzy
-#| msgid "Send a mail message to this address"
 msgid "Send a reply message to this address"
-msgstr "Åalje poruku na ovu adresu"
+msgstr "PoÅaljite poruku odgovora na ovu adresu"
 
 #: ../mail/e-mail-display.c:96
 msgid "Create Search _Folder"
@@ -8415,57 +8483,55 @@ msgid "Forwarded messages"
 msgstr "ProsleÄene poruke"
 
 #: ../mail/e-mail-folder-utils.c:391
-#, fuzzy
-#| msgid "Mark the selected messages for deletion"
 msgid "Scanning messages for duplicates"
-msgstr "OznaÄava izabranu(e) poruku(e) za brisanje"
+msgstr "TraÅim duplikate u porukama"
 
 #: ../mail/e-mail-folder-utils.c:584
 #, 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"
+msgstr[0] "DovlaÄim %d poruku"
+msgstr[1] "DovlaÄim %d poruke"
+msgstr[2] "DovlaÄim %d poruka"
+msgstr[3] "DovlaÄim jednu poruku"
 
-#: ../mail/e-mail-folder-utils.c:824
+#: ../mail/e-mail-folder-utils.c:833
 #, c-format
 msgid "Removing folder '%s'"
-msgstr "Uklanjanje fascikle â%sâ"
+msgstr "Uklanjam fasciklu â%sâ"
 
-#: ../mail/e-mail-folder-utils.c:948
-#, fuzzy, c-format
-#| msgid "All accounts have been removed."
+#: ../mail/e-mail-folder-utils.c:967
+#, c-format
 msgid "File \"%s\" has been removed."
-msgstr "Svi nalozi su uklonjeni."
+msgstr "Datoteka â%sâ je uklonjena."
 
-#: ../mail/e-mail-folder-utils.c:952
-#, fuzzy
-#| msgid "All accounts have been removed."
+#: ../mail/e-mail-folder-utils.c:971
 msgid "File has been removed."
-msgstr "Svi nalozi su uklonjeni."
+msgstr "Datoteka je uklonjena."
 
-#: ../mail/e-mail-folder-utils.c:1011
-#, fuzzy
-#| msgid "Saving attachment"
+#: ../mail/e-mail-folder-utils.c:1030
 msgid "Removing attachments"
-msgstr "Äuvanje priloga"
+msgstr "Uklanjam priloge"
 
-#: ../mail/e-mail-folder-utils.c:1177
+#: ../mail/e-mail-folder-utils.c:1194
 #, 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"
+msgstr[0] "Äuvam %d poruku"
+msgstr[1] "Äuvam %d poruke"
+msgstr[2] "Äuvam %d poruka"
+msgstr[3] "Äuvam jednu poruk"
 
-#: ../mail/e-mail-folder-utils.c:1515 ../mail/em-folder-utils.c:577
-#, fuzzy, c-format
-#| msgid "Invalid folder: `%s'"
+#: ../mail/e-mail-folder-utils.c:1538 ../mail/em-folder-utils.c:612
+#, c-format
 msgid "Invalid folder URI '%s'"
-msgstr "Neispravna fascikla â%sâ"
+msgstr "Neispravna adresa fascikle â%sâ"
+
+#. Label + combo box has a 12px left margin so it's
+#. * aligned with the junk mail options above it.
+#: ../mail/e-mail-junk-options.c:252
+msgid "Junk filtering software:"
+msgstr "Softver za filtriranje nepoÅeljne:"
 
 #: ../mail/e-mail-label-dialog.c:223
 msgid "_Label name:"
@@ -8499,7 +8565,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:676
+#: ../modules/mail/e-mail-shell-view-actions.c:679
 msgid "Add Label"
 msgstr "Dodaj oznaku"
 
@@ -8512,8 +8578,8 @@ msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
 msgstr ""
-"Napomena: podvuÄen znak u oznaci koristi\n"
-"se kao skraÄenica u meniju."
+"Napomena: podvuÄen znak u oznaci se koristi\n"
+"kao skraÄenica u izborniku."
 
 #: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
@@ -8527,30 +8593,30 @@ msgstr "Boja"
 msgid "Name"
 msgstr "Ime"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:309
-#: ../mail/em-folder-tree-model.c:722
-#: ../modules/mail/e-mail-shell-view-private.c:1065
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-properties.c:310
+#: ../mail/em-folder-tree-model.c:717
+#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 msgid "Inbox"
 msgstr "SanduÄe"
 
-#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../mail/e-mail-local.c:42 ../mail/em-folder-tree-model.c:710
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Drafts"
 msgstr "Nacrti"
 
-#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:726
-#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../mail/e-mail-local.c:43 ../mail/em-folder-tree-model.c:721
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Outbox"
 msgstr "Za slanje"
 
-#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:730
-#: ../modules/mail/e-mail-shell-view-private.c:1069
+#: ../mail/e-mail-local.c:44 ../mail/em-folder-tree-model.c:725
+#: ../modules/mail/e-mail-shell-view-private.c:1070
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:718
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../mail/e-mail-local.c:45 ../mail/em-folder-tree-model.c:713
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
 #: ../plugins/templates/templates.c:1006 ../plugins/templates/templates.c:1283
 #: ../plugins/templates/templates.c:1293
@@ -8559,7 +8625,7 @@ msgstr "Åabloni"
 
 #: ../mail/e-mail-migrate.c:133
 msgid "Migrating..."
-msgstr "PrenoÅenje..."
+msgstr "Prenosim..."
 
 #: ../mail/e-mail-migrate.c:168
 msgid "Migration"
@@ -8568,7 +8634,7 @@ msgstr "Prelazak"
 #: ../mail/e-mail-migrate.c:209
 #, c-format
 msgid "Migrating '%s':"
-msgstr "PrenoÅenje â%sâ:"
+msgstr "Prenosim â%sâ:"
 
 #: ../mail/e-mail-migrate.c:722
 msgid "Migrating Folders"
@@ -8581,971 +8647,783 @@ msgid ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Format saÅetka fascikli poÅte prebaÄen je na SQLite joÅ od Evolucije 2.24.\n"
+"Format saÅetka fascikli poÅte prebaÄen je na SKuLajt joÅ od Evolucije 2.24.\n"
 "\n"
 "Budite strpljivi dok Evolucija prenosi fascikle..."
 
-#: ../mail/e-mail-migrate.c:1279
+#: ../mail/e-mail-migrate.c:1523
 #, c-format
 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-notebook-view.c:578
+#: ../mail/e-mail-notebook-view.c:619
 msgid "Please select a folder"
 msgstr "Izaberite fasciklu."
 
-#: ../mail/e-mail-reader-utils.c:139
-#, fuzzy
-#| msgid "Do not ask me again"
-msgid "Do not warn me again"
-msgstr "Ne pitaj me ponovo"
+#: ../mail/e-mail-reader.c:308 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "UmnoÅi u fasciklu"
 
-#. Translators: %s is replaced with a folder
-#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:663
-#, c-format
-msgid ""
-"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
-"it?"
-msgid_plural ""
-"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
-"them?"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../mail/e-mail-reader-utils.c:960
-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 part of a suggested file name
-#. * used when saving a message or multiple messages to
-#. * mbox format, when the first message doesn't have a
-#. * subject.  The extension ".mbox" is appended to the
-#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:981
-msgid "Message"
-msgid_plural "Messages"
-msgstr[0] "Poruka"
-msgstr[1] "Poruke"
-msgstr[2] "Poruke"
-msgstr[3] "Poruka"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "UmnoÅi u fasciklu"
-
-#: ../mail/e-mail-reader.c:304 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:308 ../mail/em-folder-utils.c:486
 msgid "C_opy"
 msgstr "_UmnoÅi"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:814 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:806 ../mail/em-folder-utils.c:480
+#: ../mail/e-mail-reader.c:814 ../mail/em-folder-utils.c:486
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../mail/e-mail-reader.c:1167 ../mail/e-mail-reader.c:1355
-#: ../mail/e-mail-reader.c:1395
+#: ../mail/e-mail-reader.c:1175 ../mail/e-mail-reader.c:1363
+#: ../mail/e-mail-reader.c:1403
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1401
+#: ../mail/e-mail-reader.c:1409
 msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_Uvek zanemari Odgovor-za: za dopisne liste."
+msgstr "_Uvek zanemari âOdgovor-za:â za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1767
+#: ../mail/e-mail-reader.c:1775
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj poÅiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1769
+#: ../mail/e-mail-reader.c:1777
 msgid "Add sender to address book"
 msgstr "Dodaj poÅiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1774
+#: ../mail/e-mail-reader.c:1782
 msgid "Check for _Junk"
-msgstr "Proveri ima li _Äubreta"
+msgstr "Proveri da li ima _Äubreta"
 
-#: ../mail/e-mail-reader.c:1776
+#: ../mail/e-mail-reader.c:1784
 msgid "Filter the selected messages for junk status"
-msgstr "Filtriraj da li meÄu izabranim porukama ima Äubreta"
+msgstr "Filtrira da li meÄu izabranim porukama ima Äubreta"
 
-#: ../mail/e-mail-reader.c:1781
+#: ../mail/e-mail-reader.c:1789
 msgid "_Copy to Folder..."
 msgstr "_UmnoÅi u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1783
+#: ../mail/e-mail-reader.c:1791
 msgid "Copy selected messages to another folder"
-msgstr "UmnoÅi izabrane poruke u drugu fasciklu"
+msgstr "UmnoÅava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1788
+#: ../mail/e-mail-reader.c:1796
 msgid "_Delete Message"
 msgstr "_ObriÅi poruku"
 
-#: ../mail/e-mail-reader.c:1790
+#: ../mail/e-mail-reader.c:1798
 msgid "Mark the selected messages for deletion"
 msgstr "OznaÄava izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1803
 msgid "Filter on Mailing _List..."
 msgstr "Filter na dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1805
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Napravi pravilo za filtriranje poruka na ovu dopisnu listu"
+msgstr "Pravi pravilo za filtriranje poruka na ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1810
 msgid "Filter on _Recipients..."
 msgstr "Filter na _primaoce..."
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1812
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Napravi pravilo za filtriranje poruka ovim primaocima"
+msgstr "Pravi pravilo za filtriranje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1817
 msgid "Filter on Se_nder..."
 msgstr "Filter na poÅ_iljaoca..."
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1819
 msgid "Create a rule to filter messages from this sender"
-msgstr "Napravi pravilo za filtriranje poruka od ovog poÅiljaoca"
+msgstr "Pravi pravilo za filtriranje poruka od ovog poÅiljaoca"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1824
 msgid "Filter on _Subject..."
 msgstr "Filter na _naslov..."
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1826
 msgid "Create a rule to filter messages with this subject"
-msgstr "Napravi pravilo za filtriranje poruka sa ovim naslovom"
+msgstr "Pravi pravilo za filtriranje poruka sa ovim naslovom"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1831
 msgid "A_pply Filters"
 msgstr "Pri_meni filtere"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1833
 msgid "Apply filter rules to the selected messages"
-msgstr "Primeni pravila filtriranja na izabrane poruke"
+msgstr "Primenjuje pravila filtriranja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1838
 msgid "_Find in Message..."
 msgstr "P_ronaÄi u poruci..."
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1840
 msgid "Search for text in the body of the displayed message"
-msgstr "PretraÅi tekst u telu prikazane poruke"
+msgstr "PretraÅuje tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1845
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1847
 msgid "Remove the follow-up flag from the selected messages"
-msgstr "Ukloni oznaku za praÄenje sa izabranih poruka"
+msgstr "Uklanja oznaku za praÄenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1852
 msgid "_Flag Completed"
 msgstr "OznaÄ_i kao zavrÅeno"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1854
 msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "Postavi oznaku za praÄenje kao zavrÅenu na izabranim porukama"
+msgstr "Postavlja oznaku za praÄenje kao zavrÅenu na izabranim porukama"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1859
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1861
 msgid "Flag the selected messages for follow-up"
-msgstr "OznaÄi izabrane poruke za praÄenje"
+msgstr "OznaÄava izabrane poruke za praÄenje"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1866
 msgid "_Attached"
 msgstr "Pri_loÅeno"
 
-#: ../mail/e-mail-reader.c:1860 ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1868 ../mail/e-mail-reader.c:1875
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ProsleÄuje izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1873
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1880
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1874 ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1882 ../mail/e-mail-reader.c:1889
 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:1879
+#: ../mail/e-mail-reader.c:1887
 msgid "Forward As _Inline"
-msgstr "Prosledi _unutar poruke"
+msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1894
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1896 ../mail/e-mail-reader.c:1903
 msgid "Forward the selected message quoted like a reply"
 msgstr "ProsleÄuje izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:1901
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:1908
 msgid "_Load Images"
 msgstr "_UÄitaj slike"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1910
 msgid "Force images in HTML mail to be loaded"
 msgstr "Silom uÄitava slike u HTML porukama"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:1915
 msgid "_Important"
 msgstr "_VaÅno"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1917
 msgid "Mark the selected messages as important"
 msgstr "OznaÄava izabranu(e) poruku(e) kao vaÅno"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:1922
 msgid "_Junk"
 msgstr "_Äubre"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages as junk"
 msgstr "OznaÄava izabranu(e) poruku(e) kao neÅeljenu poÅtu"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:1929
 msgid "_Not Junk"
 msgstr "Ni_je Äubre"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1931
 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:1928
+#: ../mail/e-mail-reader.c:1936
 msgid "_Read"
 msgstr "Pro_Äitaj"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1938
 msgid "Mark the selected messages as having been read"
-msgstr "OznaÄi izabranu(e) poruku(e) kao proÄitano"
+msgstr "OznaÄava izabranu(e) poruku(e) kao proÄitano"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:1943
 msgid "Uni_mportant"
 msgstr "Ne_vaÅno"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1945
 msgid "Mark the selected messages as unimportant"
 msgstr "OznaÄava izabranu(e) poruku(e) kao nevaÅno"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:1950
 msgid "_Unread"
 msgstr "_NeproÄitano"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1952
 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:1949
+#: ../mail/e-mail-reader.c:1957
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1959
 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:1956
+#: ../mail/e-mail-reader.c:1964
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1966
 msgid "Open a window for composing a mail message"
-msgstr "Otvori prozor za sastavljanje poruke"
+msgstr "Otvara prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1971
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1973
 msgid "Open the selected messages in a new window"
-msgstr "Otvori izabrane poruke u novom prozoru"
+msgstr "Otvara izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1978
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1980
 msgid "Move selected messages to another folder"
-msgstr "Premesti izabranu(e) poruku(e) u drugu fasciklu"
+msgstr "PremeÅta izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1985
 msgid "_Switch to Folder"
 msgstr "PreÄi u _fasciklu"
 
-#: ../mail/e-mail-reader.c:1979
-#, fuzzy
-#| msgid "Install the shared folder"
+#: ../mail/e-mail-reader.c:1987
 msgid "Display the parent folder"
-msgstr "Instaliraj deljenu fasciklu"
+msgstr "Prikazuje nadreÄenu fasciklu"
 
-#: ../mail/e-mail-reader.c:1984
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1992
 msgid "Switch to _next tab"
-msgstr "PreÄi na %s"
+msgstr "Prebaci na _sledeÄi jeziÄak"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1994
 msgid "Switch to the next tab"
-msgstr "Prebaci na sledeÄi jeziÄak"
+msgstr "Prebacuje na sledeÄi jeziÄak"
 
-#: ../mail/e-mail-reader.c:1991
-#, fuzzy
-#| msgid "Switch to %s"
+#: ../mail/e-mail-reader.c:1999
 msgid "Switch to _previous tab"
-msgstr "PreÄi na %s"
+msgstr "Prebaci na _prethodni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2001
 msgid "Switch to the previous tab"
-msgstr "Prebaci na prethodni jeziÄak"
+msgstr "Prebacuje na prethodni jeziÄak"
 
-#: ../mail/e-mail-reader.c:1998
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2006
 msgid "Cl_ose current tab"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "_Zatvori trenutni jeziÄak"
 
-#: ../mail/e-mail-reader.c:2000
-#, fuzzy
-#| msgid "Close the current file"
+#: ../mail/e-mail-reader.c:2008
 msgid "Close current tab"
-msgstr "Zatvara trenutnu datoteku"
+msgstr "Zatvara trenutni jeziÄak"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2013
 msgid "_Next Message"
 msgstr "_SledeÄa poruka"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2015
 msgid "Display the next message"
-msgstr "PrikaÅi sledeÄu poruku"
+msgstr "Prikazuje sledeÄu poruku"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2020
 msgid "Next _Important Message"
 msgstr "SledeÄa _vaÅna poruka"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2022
 msgid "Display the next important message"
-msgstr "PrikaÅi sledeÄu vaÅnu poruku"
+msgstr "Prikazuje sledeÄu vaÅnu poruku"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2027
 msgid "Next _Thread"
 msgstr "_SledeÄa rasprava"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2029
 msgid "Display the next thread"
-msgstr "PrikaÅi sledeÄu raspravu"
+msgstr "Prikazuje sledeÄu raspravu"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2034
 msgid "Next _Unread Message"
 msgstr "SledeÄa _neproÄitana poruka"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2036
 msgid "Display the next unread message"
-msgstr "PrikaÅi sledeÄu neproÄitanu poruku"
+msgstr "Prikazuje sledeÄu neproÄitanu poruku"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2041
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2043
 msgid "Display the previous message"
-msgstr "PrikaÅi prethodnu poruku"
+msgstr "Prikazuje prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2048
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna vaÅna poruka"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2050
 msgid "Display the previous important message"
-msgstr "PrikaÅi prethodnu vaÅnu poruku"
+msgstr "Prikazuje prethodnu vaÅnu poruku"
 
-#: ../mail/e-mail-reader.c:2047
-#, fuzzy
-#| msgid "_Previous Message"
+#: ../mail/e-mail-reader.c:2055
 msgid "Previous T_hread"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2049
-#, fuzzy
-#| msgid "Display the previous message"
+#: ../mail/e-mail-reader.c:2057
 msgid "Display the previous thread"
-msgstr "PrikaÅi prethodnu poruku"
+msgstr "PrikaÅite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2062
 msgid "P_revious Unread Message"
 msgstr "P_rethodna neproÄitana poruka"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2064
 msgid "Display the previous unread message"
-msgstr "PrikaÅi prethodnu neproÄitanu poruku"
+msgstr "Prikazuje prethodnu neproÄitanu poruku"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2071
 msgid "Print this message"
 msgstr "Åtampaj ovu poruku"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2078
 msgid "Preview the message to be printed"
-msgstr "Pregledaj poruku pred Åtampu"
+msgstr "Pregleda poruku pred Åtampu"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2083
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2085
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "Preu_smerava (bez Äitanja) izabranu poruku nekome"
+msgstr "Preusmerava (bez Äitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2082
-#, fuzzy
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2090
 msgid "Remo_ve Attachments"
-msgstr "SaÄuvaj prilog"
+msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2084
-#, fuzzy
-#| msgid "Save Attachment"
-#| msgid_plural "Save Attachments"
+#: ../mail/e-mail-reader.c:2092
 msgid "Remove attachments"
-msgstr "SaÄuvaj prilog"
+msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2089
-#, fuzzy
-#| msgid "Recent Messages"
+#: ../mail/e-mail-reader.c:2097
 msgid "Remove Du_plicate Messages"
-msgstr "SkoraÅnje poruke"
+msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2091
-#, fuzzy
-#| msgid "Mark the selected messages for deletion"
+#: ../mail/e-mail-reader.c:2099
 msgid "Checks selected messages for duplicates"
-msgstr "OznaÄava izabranu(e) poruku(e) za brisanje"
+msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2096 ../mail/mail.error.xml.h:108
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../mail/e-mail-reader.c:2104 ../mail/mail.error.xml.h:109
+#: ../modules/calendar/e-cal-shell-view-actions.c:1509
 #: ../modules/mail/e-mail-attachment-handler.c:177
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2106
 msgid "Compose a reply to all the recipients of the selected message"
-msgstr "Sastavi odgovor svim primaocima izabrane poruke"
+msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2103 ../mail/mail.error.xml.h:109
+#: ../mail/e-mail-reader.c:2111 ../mail/mail.error.xml.h:110
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2113
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Sastavi odgovor dopisnoj listi izabrane poruke"
+msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2118
 #: ../modules/mail/e-mail-attachment-handler.c:184
 msgid "_Reply to Sender"
 msgstr "_Odgovori poÅiljaocu"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2120
 msgid "Compose a reply to the sender of the selected message"
-msgstr "Sastavi odgovor poÅiljaocu izabrane poruke"
+msgstr "Sastavite odgovor poÅiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2125
 msgid "_Save as mbox..."
-msgstr "_SaÄuvaj kao mbox..."
+msgstr "_SaÄuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2127
 msgid "Save selected messages as an mbox file"
-msgstr "SaÄuvaj izabrane poruke kao mbox datoteku"
+msgstr "SaÄuvajte izabrane poruke kao âmboxâ datoteku"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2132
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2134
 msgid "Show the raw email source of the message"
-msgstr "PrikaÅi izvorni kod elektronske poruke"
+msgstr "PrikaÅite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2146
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2148
 msgid "Undelete the selected messages"
-msgstr "Povrati izabrane poruke"
+msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2153
 msgid "_Normal Size"
 msgstr "_Normalna veliÄina"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2155
 msgid "Reset the text to its original size"
-msgstr "Vrati tekst na originalnu veliÄinu"
+msgstr "Vratite tekst na originalnu veliÄinu"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2160
 msgid "_Zoom In"
 msgstr "Uv_eÄaj"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2162
 msgid "Increase the text size"
-msgstr "UveÄaj veliÄinu teksta"
+msgstr "UveÄajte veliÄinu teksta"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2167
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2169
 msgid "Decrease the text size"
-msgstr "Umanji veliÄinu teksta"
+msgstr "Umanjite veliÄinu teksta"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2176
 msgid "Create R_ule"
 msgstr "Napravi pra_vilo"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2183
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2190
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2189
-#, fuzzy
-#| msgid "_Reply"
+#: ../mail/e-mail-reader.c:2197
 msgid "_Group Reply"
-msgstr "O_dgovori"
+msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2204
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2211
 msgid "Mar_k As"
 msgstr "O_znaÄi kao"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2218
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2225
 msgid "_Zoom"
 msgstr "Uv_eÄaj"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2235
 msgid "Search Folder from Mailing _List..."
-msgstr "Fascikla pretrage na dopisnu _listu..."
+msgstr "Fascikla pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2237
 msgid "Create a search folder for this mailing list"
-msgstr "Napravi fasciklu pretrage za ovu dopisnu listu"
+msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2242
 msgid "Search Folder from Recipien_ts..."
-msgstr "Fascikla pretrage od prima_laca..."
+msgstr "Fascikla pretrage prima_laca..."
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2244
 msgid "Create a search folder for these recipients"
-msgstr "Napravi fasciklu pretrage za ove primaoce"
+msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2249
 msgid "Search Folder from Sen_der..."
-msgstr "Fascikla pretrage na _poÅiljaoca..."
+msgstr "Fascikla pretrage _poÅiljaoca..."
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2251
 msgid "Create a search folder for this sender"
-msgstr "Napravi fasciklu pretrage za ovog poÅiljaoca"
+msgstr "Napravite fasciklu pretrage za ovog poÅiljaoca"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2256
 msgid "Search Folder from S_ubject..."
-msgstr "Fascikla pretrage na n_aslov..."
+msgstr "Fascikla pretrage n_aslova..."
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2258
 msgid "Create a search folder for this subject"
-msgstr "Napravi fasciklu pretrage za ovaj naslov"
+msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2281
 msgid "Mark for Follo_w Up..."
 msgstr "ObeleÅi za _praÄenje..."
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2289
 msgid "Mark as _Important"
 msgstr "OnaÄi kao _vaÅno"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2293
 msgid "Mark as _Junk"
 msgstr "OznaÄi kao _Äubre"
 
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2297
 msgid "Mark as _Not Junk"
 msgstr "OznaÄi da _nije Äubre"
 
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2301
 msgid "Mar_k as Read"
 msgstr "O_znaÄi kao proÄitano"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2305
 msgid "Mark as Uni_mportant"
 msgstr "OznaÄi kao _nevaÅno"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2309
 msgid "Mark as _Unread"
 msgstr "OznaÄi kao _neproÄitano"
 
-#: ../mail/e-mail-reader.c:2345
+#: ../mail/e-mail-reader.c:2353
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2355
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "PrikaÅi trepÄuÄi kursor u telu prikazanih poruka"
+msgstr "Prikazuje trepÄuÄi kursor u telu prikazanih poruka"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2361
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2363
 msgid "Show messages with all email headers"
-msgstr "PrikaÅi poruku sa svim zaglavljima e-poÅte"
+msgstr "Prikazuje poruku sa svim zaglavljima e-poÅte"
 
-#: ../mail/e-mail-reader.c:2651
+#: ../mail/e-mail-reader.c:2659
 #, c-format
 msgid "Retrieving message '%s'"
-msgstr "DovlaÄenje poruke â%sâ"
+msgstr "DovlaÄim poruku â%sâ"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:3229 ../mail/mail-config.ui.h:32
-#: ../plugins/google-account-setup/google-source.c:306
-#: ../plugins/google-account-setup/google-source.c:549
-#: ../plugins/google-account-setup/google-source.c:688
+#: ../mail/e-mail-reader.c:3246 ../mail/mail-config.ui.h:32
+#: ../plugins/google-account-setup/google-source.c:310
+#: ../plugins/google-account-setup/google-source.c:553
+#: ../plugins/google-account-setup/google-source.c:692
 #: ../widgets/misc/e-account-tree-view.c:253
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../mail/e-mail-reader.c:3396
+#: ../mail/e-mail-reader.c:3415
 #: ../modules/mail/e-mail-attachment-handler.c:170
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3397
+#: ../mail/e-mail-reader.c:3416
 msgid "Forward the selected message to someone"
 msgstr "ProsleÄuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:3416
-#, fuzzy
-#| msgid "Group Items By"
+#: ../mail/e-mail-reader.c:3435
 msgid "Group Reply"
-msgstr "GrupiÅi stavke po"
+msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3417
-#, fuzzy
-#| msgid "Compose a reply to the mailing list of the selected message"
+#: ../mail/e-mail-reader.c:3436
 msgid "Reply to the mailing list, or to all recipients"
-msgstr "Sastavi odgovor dopisnoj listi izabrane poruke"
+msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:3470 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3489 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "ObriÅi"
 
-#: ../mail/e-mail-reader.c:3503
-#: ../modules/calendar/e-cal-shell-view-actions.c:1323
+#: ../mail/e-mail-reader.c:3522
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "SledeÄe"
 
-#: ../mail/e-mail-reader.c:3507
-#: ../modules/calendar/e-cal-shell-view-actions.c:1316
+#: ../mail/e-mail-reader.c:3526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3516 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3535 ../mail/mail-dialogs.ui.h:17
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:4186
-#, fuzzy, c-format
-#| msgid "Folder"
+#: ../mail/e-mail-reader.c:4205
+#, c-format
 msgid "Folder '%s'"
-msgstr "Fascikla"
+msgstr "Fascikla â%sâ"
 
-#: ../mail/e-mail-session.c:661
+#: ../mail/e-mail-reader-utils.c:145
+msgid "Do not warn me again"
+msgstr "Ne upozoravaj me ponovo"
+
+#. Translators: %s is replaced with a folder
+#. * name %u with count of duplicate messages.
+#: ../mail/e-mail-reader-utils.c:669
+#, c-format
+msgid ""
+"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
+"it?"
+msgid_plural ""
+"Folder '%s' contains %u duplicate messages. Are you sure you want to delete "
+"them?"
+msgstr[0] ""
+"Fascikla â%sâ sadrÅi %u dupliranu poruku. Da li ste sigurni da Åelite da je "
+"izbriÅete?"
+msgstr[1] ""
+"Fascikla â%sâ sadrÅi %u duplirane poruke. Da li ste sigurni da Åelite da ih "
+"izbriÅete?"
+msgstr[2] ""
+"Fascikla â%sâ sadrÅi %u dupliranih poruka. Da li ste sigurni da Åelite da ih "
+"izbriÅete?"
+msgstr[3] ""
+"Fascikla â%sâ sadrÅi %u dupliranu poruku. Da li ste sigurni da Åelite da je "
+"izbriÅete?"
+
+#: ../mail/e-mail-reader-utils.c:1046
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "SaÄuvaj poruku"
+msgstr[1] "SaÄuvaj poruke"
+msgstr[2] "SaÄuvaj poruke"
+msgstr[3] "SaÄuvaj poruku"
+
+#. Translators: This is part of a suggested file name
+#. * used when saving a message or multiple messages to
+#. * mbox format, when the first message doesn't have a
+#. * subject.  The extension ".mbox" is appended to the
+#. * string; for example "Message.mbox".
+#: ../mail/e-mail-reader-utils.c:1067
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Poruka"
+msgstr[1] "Poruke"
+msgstr[2] "Poruke"
+msgstr[3] "Poruka"
+
+#: ../mail/e-mail-session.c:863
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/e-mail-session.c:665
+#: ../mail/e-mail-session.c:867
 msgid "Enter Passphrase"
 msgstr "Unesite lozinku"
 
-#: ../mail/e-mail-session.c:669
+#: ../mail/e-mail-session.c:871
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: ../mail/e-mail-session.c:673
+#: ../mail/e-mail-session.c:875
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: ../mail/e-mail-session.c:724
+#: ../mail/e-mail-session.c:926
 #, c-format
 msgid "User canceled operation."
 msgstr "Korisnik je otkazao operaciju."
 
-#: ../mail/e-mail-session.c:839
+#: ../mail/e-mail-session.c:1039
 #, 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/e-mail-session.c:848
+#: ../mail/e-mail-session.c:1048
 #, 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/e-mail-session-utils.c:416
-#, fuzzy, c-format
-#| msgid "Expunging and storing account '%s'"
+#: ../mail/e-mail-session-utils.c:419
+#, c-format
 msgid "Cannot get transport for account '%s'"
-msgstr "PraÅnjenje i smeÅtanje naloga â%sâ"
+msgstr "Ne mogu da dobijem prenos za nalog â%sâ"
 
-#: ../mail/e-mail-session-utils.c:496 ../mail/mail-ops.c:633
+#: ../mail/e-mail-session-utils.c:508 ../mail/mail-ops.c:634
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlazeÄih filtera: %s"
 
-#: ../mail/e-mail-session-utils.c:520 ../mail/e-mail-session-utils.c:554
-#: ../mail/mail-ops.c:652 ../mail/mail-ops.c:686
-#, fuzzy, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local `Sent' folder instead."
+#: ../mail/e-mail-session-utils.c:532 ../mail/e-mail-session-utils.c:566
+#: ../mail/mail-ops.c:653 ../mail/mail-ops.c:687
+#, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
-"Neuspelo dopunjavanje u %s: %s\n"
-"Dopunjavanje u lokalnu fasciklu âPoslatoâ."
+"Nisam uspeo da prikaÄim u %s: %s\n"
+"Umesto toga prikaÄiÄu u lokalnu fasciklu âPoslatoâ."
 
-#: ../mail/e-mail-session-utils.c:574 ../mail/mail-ops.c:706
-#, fuzzy, c-format
-#| msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/e-mail-session-utils.c:586 ../mail/mail-ops.c:707
+#, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Neuspelo dopunjavanje u lokalnu fasciklu âPoslatoâ: %s"
+msgstr "Nisam uspeo da prikaÄim u lokalnu fasciklu âPoslatoâ: %s"
 
-#: ../mail/e-mail-session-utils.c:785 ../mail/mail-ops.c:809
-#: ../mail/mail-ops.c:905
+#: ../mail/e-mail-session-utils.c:797 ../mail/mail-ops.c:810
+#: ../mail/mail-ops.c:906
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../mail/e-mail-session-utils.c:861
-#, fuzzy, c-format
-#| msgid "Unsubscribing from folder \"%s\""
+#: ../mail/e-mail-session-utils.c:873
+#, c-format
 msgid "Unsubscribing from folder '%s'"
-msgstr "Odjava sa fascikle â%sâ"
+msgstr "Odjavljujem se sa fascikle â%sâ"
 
-#: ../mail/e-mail-store-utils.c:165
+#: ../mail/e-mail-store-utils.c:168
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekidanje veze sa â%sâ"
 
-#: ../mail/e-mail-store-utils.c:256
+#: ../mail/e-mail-store-utils.c:259
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezivanje na â%sâ"
 
-#: ../mail/e-mail-store-utils.c:331
+#: ../mail/e-mail-store-utils.c:334
 #, c-format
 msgid "Preparing account '%s' for offline"
-msgstr "Priprema nalog â%sâ za rad van mreÅe"
+msgstr "Pripremam nalog â%sâ za rad van mreÅe"
 
 #: ../mail/e-mail-tag-editor.c:291
 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:568 ../mail/mail-config.ui.h:72
-#: ../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:572 ../mail/mail-config.ui.h:130
-#: ../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:576 ../mail/mail-config.ui.h:94
-#: ../modules/addressbook/ldap-config.ui.h:12
-msgid "SSL encryption"
-msgstr "SSL Åifrovanje"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:839 ../widgets/misc/e-signature-combo-box.c:75
-msgctxt "mail-signature"
-msgid "None"
-msgstr "NiÅta"
-
-#: ../mail/em-account-editor.c:920
-msgid "Never"
-msgstr "Nikada"
-
-#: ../mail/em-account-editor.c:921
-msgid "Always"
-msgstr "Uvek"
-
-#: ../mail/em-account-editor.c:922
-msgid "Ask for each message"
-msgstr "Pitaj za svaku poruku"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1742 ../widgets/misc/e-account-tree-view.c:131
-msgctxt "mail-receiving"
-msgid "None"
-msgstr "NiÅta"
-
-#: ../mail/em-account-editor.c:2177
-msgid "Mail Configuration"
-msgstr "PodeÅavanje poÅte"
-
-#: ../mail/em-account-editor.c:2178
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin."
-msgstr ""
-"Dobro doÅli u PomoÄnika podeÅavanja poÅte Evolucije.\n"
-"\n"
-"Kliknite âNapredâ za poÄetak. "
-
-#: ../mail/em-account-editor.c:2181
-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:2183 ../mail/em-account-editor.c:2346
-msgid "Receiving Email"
-msgstr "Primanje poÅte"
-
-#: ../mail/em-account-editor.c:2184
-msgid "Please configure the following account settings."
-msgstr "Podesite sledeÄe postavke naloga."
-
-#: ../mail/em-account-editor.c:2186 ../mail/em-account-editor.c:2846
-msgid "Sending Email"
-msgstr "Slanje poÅte"
-
-#: ../mail/em-account-editor.c:2187
-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:2189 ../mail/mail-config.ui.h:1
-msgid "Account Information"
-msgstr "Podaci o nalogu"
-
-#: ../mail/em-account-editor.c:2190
-msgid ""
-"Please enter a descriptive name for this account below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"Unesite opisno ime za ovaj nalog.\n"
-"Ovo ime Äe biti koriÅÄeno samo za prikaz."
-
-#: ../mail/em-account-editor.c:2194
-msgid "Done"
-msgstr "Gotovo"
-
-#: ../mail/em-account-editor.c:2195
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"Äestitamo, podeÅavanje poÅte je zavrÅeno.\n"
-"\n"
-"Sada ste spremni da Åaljete i primate poÅtu koriÅÄenjem Evolucije.\n"
-"\n"
-"Kliknite âPrimeniâ da saÄuvate postavke."
-
-#: ../mail/em-account-editor.c:2660
-msgid "Check for _new messages every"
-msgstr "Proveri za _novu poÅtu svakih"
-
-# bug: plural-forms
-#: ../mail/em-account-editor.c:2668
-msgid "minu_tes"
-msgstr "minu_ta"
-
-#: ../mail/em-account-editor.c:2960
-msgid "Please select a folder from the current account."
-msgstr "Izaberite fasciklu iz ovog naloga."
-
-#: ../mail/em-account-editor.c:3269 ../mail/mail-config.ui.h:101
-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:3315 ../mail/em-account-editor.c:3383
-msgid "Receiving Options"
-msgstr "Opcije za primanje"
-
-#: ../mail/em-account-editor.c:3316 ../mail/em-account-editor.c:3384
-msgid "Checking for New Messages"
-msgstr "Proveranje za nove poruke"
-
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
 #. 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 mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1184
+#: ../mail/em-composer-utils.c:1193
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -9553,37 +9431,37 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piÅe:"
 
-#: ../mail/em-composer-utils.c:1195
+#: ../mail/em-composer-utils.c:1204
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
 #. 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:1976
+#: ../mail/em-composer-utils.c:1985
 #, 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."
 
-#: ../mail/em-composer-utils.c:2030
+#: ../mail/em-composer-utils.c:2044
 #, c-format
 msgid "Delivery Notification for: \"%s\""
 msgstr "ObaveÅtenje o prijemu za: â%sâ"
 
-#: ../mail/em-composer-utils.c:2532
+#: ../mail/em-composer-utils.c:2567
 msgid "an unknown sender"
 msgstr "nepoznati poÅiljalac"
 
-#: ../mail/em-composer-utils.c:2933
+#: ../mail/em-composer-utils.c:2972
 msgid "Posting destination"
 msgstr "OdrediÅna poÅta"
 
-#: ../mail/em-composer-utils.c:2934
+#: ../mail/em-composer-utils.c:2973
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
 #: ../mail/em-filter-folder-element.c:241
 msgid "Select Folder"
-msgstr "Izaberite fasciklu"
+msgstr "Izaberi fasciklu"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -9668,7 +9546,7 @@ msgstr "Sledi"
 
 #: ../mail/em-filter-i18n.h:29
 msgid "Forward to"
-msgstr "Prosledi za"
+msgstr "Prosledi"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "Important"
@@ -9747,7 +9625,7 @@ msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:15
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:16
 msgid "Read"
 msgstr "Äitaj"
 
@@ -9757,7 +9635,7 @@ msgstr "Primaoci"
 
 #: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
-msgstr "Regex odgovara"
+msgstr "Regizr odgovara"
 
 #: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
@@ -9838,7 +9716,7 @@ msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:142
+#: ../mail/em-folder-properties.c:143
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "NeproÄitanih poruka:"
@@ -9847,7 +9725,7 @@ msgstr[2] "NeproÄitanih poruka:"
 msgstr[3] "NeproÄitanih poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:153
+#: ../mail/em-folder-properties.c:154
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -9856,143 +9734,225 @@ 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:174
+#: ../mail/em-folder-properties.c:175
 #, 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:176
+#: ../mail/em-folder-properties.c:177
 #, c-format
 msgid "Quota usage"
 msgstr "IskoriÅÄenost kvote"
 
-#: ../mail/em-folder-properties.c:314
+#: ../mail/em-folder-properties.c:315
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
-#: ../mail/em-folder-selection-button.c:77
+#: ../mail/em-folder-selection-button.c:80
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:385
+#: ../mail/em-folder-selector.c:432
 msgid "C_reate"
 msgstr "Na_pravi"
 
-#: ../mail/em-folder-selector.c:391
+#: ../mail/em-folder-selector.c:438
 msgid "Folder _name:"
 msgstr "_Ime fascikle:"
 
-#. load store to mail component
-#: ../mail/em-folder-tree-model.c:147 ../mail/em-folder-tree-model.c:150
-#: ../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:1165 ../mail/mail-vfolder.c:1240
-msgid "Search Folders"
-msgstr "Fascikle pretrage"
-
-#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:172 ../mail/em-folder-tree-model.c:174
-msgid "UNMATCHED"
-msgstr "NEODGOVARA"
-
-#: ../mail/em-folder-tree-model.c:792 ../mail/em-folder-tree-model.c:1061
-msgid "Loading..."
-msgstr "UÄitavanje..."
-
-#: ../mail/em-folder-tree.c:647
+#: ../mail/em-folder-tree.c:664
 msgid "Folder names cannot contain '/'"
-msgstr "Imena fascikli ne mogu da sadrÅe â/â"
+msgstr "Imena fascikli ne mogu da sadrÅe â/â"
 
-#: ../mail/em-folder-tree.c:1331
+#: ../mail/em-folder-tree.c:784
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1568
+#: ../mail/em-folder-tree.c:1606
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poÅtu"
 
-#: ../mail/em-folder-tree.c:2068 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2085 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Moving folder %s"
-msgstr "PremeÅtanje fascikle %s"
+msgstr "PremeÅtam fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:2071 ../mail/em-folder-utils.c:116
+#: ../mail/em-folder-tree.c:2088 ../mail/em-folder-utils.c:116
 #, c-format
 msgid "Copying folder %s"
-msgstr "UmnoÅavanje fascikle %s"
+msgstr "UmnoÅavam fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:2078 ../mail/message-list.c:2218
+#: ../mail/em-folder-tree.c:2095 ../mail/message-list.c:2212
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "PremeÅtanje poruka u fasciklu %s"
+msgstr "PremeÅtam poruke u fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:2082 ../mail/message-list.c:2220
+#: ../mail/em-folder-tree.c:2099 ../mail/message-list.c:2214
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "UmnoÅavanje poruka u fasciklu %s"
+msgstr "UmnoÅavam poruke u fasciklu â%sâ"
 
-#: ../mail/em-folder-tree.c:2101
+#: ../mail/em-folder-tree.c:2118
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "Nije moguÄe ubaciti poruku(e) u ostavu na najviÅem nivou"
+msgstr "Ne mogu da ubacim poruku(e) u ostavu na najviÅem nivou"
+
+#: ../mail/em-folder-tree-model.c:150 ../mail/em-folder-tree-model.c:153
+#: ../mail/em-folder-tree-model.c:159 ../mail/em-folder-tree-model.c:161
+#: ../mail/em-folder-tree-model.c:168 ../mail/em-folder-tree-model.c:170
+#: ../mail/mail-vfolder.c:1121 ../mail/mail-vfolder.c:1235
+msgid "Search Folders"
+msgstr "Fascikle pretrage"
+
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:175 ../mail/em-folder-tree-model.c:177
+msgid "UNMATCHED"
+msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-tree-model.c:787 ../mail/em-folder-tree-model.c:1072
+msgid "Loading..."
+msgstr "UÄitavam..."
+
+#: ../mail/em-folder-utils.c:487
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:481
+#: ../mail/em-folder-utils.c:487
 msgid "Copy Folder To"
 msgstr "UmnoÅi fasciklu u"
 
-#: ../mail/em-folder-utils.c:556
+#: ../mail/em-folder-utils.c:589
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:557
+#: ../mail/em-folder-utils.c:590
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-format-html-display.c:85 ../mail/em-format-html.c:1683
+#: ../mail/em-format-html.c:166
+msgid "Formatting message"
+msgstr "Oblikovanje poruke"
+
+#: ../mail/em-format-html.c:378
+msgid "Formatting Message..."
+msgstr "Oblikujem poruku..."
+
+#: ../mail/em-format-html.c:1551 ../mail/em-format-html.c:1561
+#, c-format
+msgid "Retrieving '%s'"
+msgstr "DovlaÄim â%sâ"
+
+#: ../mail/em-format-html.c:1707 ../mail/em-format-html-display.c:89
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../mail/em-format-html-display.c:85
+#: ../mail/em-format-html.c:1708 ../mail/em-format-html-display.c:90
+msgid "Valid signature"
+msgstr "Ispravan potpis"
+
+#: ../mail/em-format-html.c:1709 ../mail/em-format-html-display.c:91
+msgid "Invalid signature"
+msgstr "Neispravan potpis"
+
+#: ../mail/em-format-html.c:1710 ../mail/em-format-html-display.c:92
+msgid "Valid signature, but cannot verify sender"
+msgstr "Ispravan potpis, ali ne mogu da proverim poÅiljaoca"
+
+#: ../mail/em-format-html.c:1711 ../mail/em-format-html-display.c:93
+msgid "Signature exists, but need public key"
+msgstr "Potpis postoji, ali traÅi javni kljuÄ"
+
+#: ../mail/em-format-html.c:1717 ../mail/em-format-html-display.c:100
+msgid "Unencrypted"
+msgstr "NeÅifrovano"
+
+#: ../mail/em-format-html.c:1718 ../mail/em-format-html-display.c:101
+msgid "Encrypted, weak"
+msgstr "Åifrovano, slabo"
+
+#: ../mail/em-format-html.c:1719 ../mail/em-format-html-display.c:102
+msgid "Encrypted"
+msgstr "Åifrovano"
+
+#: ../mail/em-format-html.c:1720 ../mail/em-format-html-display.c:103
+msgid "Encrypted, strong"
+msgstr "Åifrovano, jako"
+
+#: ../mail/em-format-html.c:2120
+msgid "Unknown external-body part."
+msgstr "Nepoznat spoljni deo poruke."
+
+#: ../mail/em-format-html.c:2130
+msgid "Malformed external-body part."
+msgstr "LoÅe sloÅen spoljni deo poruke."
+
+#: ../mail/em-format-html.c:2161
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "PokazivaÄ na FTP stranicu (%s)"
+
+#: ../mail/em-format-html.c:2172
+#, 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:2174
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "PokazivaÄ na lokalnu datoteku (%s)"
+
+#: ../mail/em-format-html.c:2195
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "PokazivaÄ na udaljeni podatak (%s)"
+
+#: ../mail/em-format-html.c:2210
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "PokazivaÄ na nepoznati spoljni podatak (tipa â%sâ)"
+
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user example com"
+#: ../mail/em-format-html.c:2915
+#: ../plugins/mail-notification/mail-notification.c:402
+#, c-format
+msgid "From: %s"
+msgstr "Åalje: %s"
+
+#: ../mail/em-format-html.c:2937
+msgid "(no subject)"
+msgstr "(bez naslova)"
+
+#: ../mail/em-format-html.c:3013
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "Poruku Åalje â%sâ na ime â%sâ"
+
+#: ../mail/em-format-html-display.c:89
 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:86 ../mail/em-format-html.c:1684
-msgid "Valid signature"
-msgstr "Ispravan potpis"
+msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
 
-#: ../mail/em-format-html-display.c:86
+#: ../mail/em-format-html-display.c:90
 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."
+"verovatno verodostojan."
 
-#: ../mail/em-format-html-display.c:87 ../mail/em-format-html.c:1685
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: ../mail/em-format-html-display.c:87
+#: ../mail/em-format-html-display.c:91
 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:88 ../mail/em-format-html.c:1686
-msgid "Valid signature, but cannot verify sender"
-msgstr "Ispravan potpis, ali nije moguÄa provera poÅiljaoca"
-
-#: ../mail/em-format-html-display.c:88
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -10000,21 +9960,13 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali poÅiljalac poruke ne moÅe "
 "biti proveren."
 
-#: ../mail/em-format-html-display.c:89 ../mail/em-format-html.c:1687
-msgid "Signature exists, but need public key"
-msgstr "Potpis postoji, ali traÅi javni kljuÄ"
-
-#: ../mail/em-format-html-display.c:89
+#: ../mail/em-format-html-display.c:93
 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:96 ../mail/em-format-html.c:1693
-msgid "Unencrypted"
-msgstr "NeÅifrovano"
-
-#: ../mail/em-format-html-display.c:96
+#: ../mail/em-format-html-display.c:100
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -10022,11 +9974,7 @@ msgstr ""
 "Ova poruka nije Åifrovana. Njen sadrÅaj je moguÄe videti u prenosu preko "
 "Interneta."
 
-#: ../mail/em-format-html-display.c:97 ../mail/em-format-html.c:1694
-msgid "Encrypted, weak"
-msgstr "Åifrovano, slabo"
-
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:101
 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 "
@@ -10035,22 +9983,14 @@ 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:98 ../mail/em-format-html.c:1695
-msgid "Encrypted"
-msgstr "Åifrovano"
-
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:102
 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:99 ../mail/em-format-html.c:1696
-msgid "Encrypted, strong"
-msgstr "Åifrovano, jako"
-
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:103
 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 "
@@ -10059,44 +9999,62 @@ 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:237 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:241 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
-msgstr "Pre_gledaj sertifikat"
+msgstr "Pre_gledaj uverenje"
 
-#: ../mail/em-format-html-display.c:250
+#: ../mail/em-format-html-display.c:254
 msgid "This certificate is not viewable"
-msgstr "Ovaj sertifikat nije Äitljiv"
+msgstr "Ovo uverenje nije Äitljivo"
 
-#: ../mail/em-format-html-display.c:539
+#: ../mail/em-format-html-display.c:556
 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."
+"Evolucija ne moÅe da iscrta ovu poruku poÅto je prevelika. MoÅete je "
+"pogledati kao neformatiranu ili pomoÄu drugog ureÄivaÄa teksta."
+
+#: ../mail/em-format-html-display.c:746
+#, fuzzy
+#| msgid "Save Message"
+#| msgid_plural "Save Messages"
+msgid "Save Image"
+msgstr "SaÄuvaj poruku"
 
-#: ../mail/em-format-html-display.c:806
+#: ../mail/em-format-html-display.c:794
+#, fuzzy
+#| msgid "Save as..."
+msgid "Save _Image..."
+msgstr "SaÄuvaj kao..."
+
+#: ../mail/em-format-html-display.c:796
+#, fuzzy
+#| msgid "Save the current file"
+msgid "Save the image to a file"
+msgstr "SaÄuvajte trenutnu datoteku"
+
+#: ../mail/em-format-html-display.c:1024
 msgid "Completed on"
 msgstr "ZavrÅeno za"
 
-#: ../mail/em-format-html-display.c:814
+#: ../mail/em-format-html-display.c:1036
 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:818
+#: ../mail/em-format-html-display.c:1044
 msgid "by"
 msgstr "od"
 
-#: ../mail/em-format-html-display.c:1081 ../mail/em-format-html-display.c:1128
+#: ../mail/em-format-html-display.c:1320 ../mail/em-format-html-display.c:1367
 msgid "View _Unformatted"
 msgstr "Pregledaj _neformatirano"
 
-#: ../mail/em-format-html-display.c:1083
+#: ../mail/em-format-html-display.c:1322
 msgid "Hide _Unformatted"
 msgstr "Sakrij _neformatirano"
 
-#: ../mail/em-format-html-display.c:1148
+#: ../mail/em-format-html-display.c:1387
 msgid "O_pen With"
 msgstr "O_tvori pomoÄu"
 
@@ -10105,136 +10063,69 @@ msgstr "O_tvori pomoÄu"
 msgid "Page %d of %d"
 msgstr "%d. strana od %d"
 
-#: ../mail/em-format-html.c:165
-msgid "Formatting message"
-msgstr "Oblikovanje poruke"
-
-#: ../mail/em-format-html.c:364
-msgid "Formatting Message..."
-msgstr "Oblikovanje poruke..."
-
-#: ../mail/em-format-html.c:1527 ../mail/em-format-html.c:1537
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "DovlaÄenje â%sâ"
-
-#: ../mail/em-format-html.c:2058
-msgid "Unknown external-body part."
-msgstr "Nepoznat spoljni deo poruke."
-
-#: ../mail/em-format-html.c:2066
-msgid "Malformed external-body part."
-msgstr "LoÅe sloÅen spoljni deo poruke."
-
-#: ../mail/em-format-html.c:2096
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "PokazivaÄ na FTP stranicu (%s)"
-
-#: ../mail/em-format-html.c:2107
-#, 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:2109
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "PokazivaÄ na lokalnu datoteku (%s)"
-
-#: ../mail/em-format-html.c:2130
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "PokazivaÄ na mreÅni podatak (%s)"
-
-#: ../mail/em-format-html.c:2141
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "PokazivaÄ na nepoznati spoljni podatak (tipa â%sâ)"
-
-#: ../mail/em-format-html.c:2799
-#, fuzzy
-#| msgid "Subject"
-msgid "(no subject)"
-msgstr "Naslov"
-
-#. Translators: "From:" is preceding a new mail
-#. * sender address, like "From: user example com"
-#: ../mail/em-format-html.c:2815
-#: ../plugins/mail-notification/mail-notification.c:407
-#, c-format
-msgid "From: %s"
-msgstr "Od: %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:2892
-#, c-format
-msgid "This message was sent by %s on behalf of %s"
-msgstr "Poruku Åalje â%sâ na ime â%sâ"
-
 #: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
 #: ../mail/em-html-stream.c:122
 #, c-format
 msgid "No HTML stream available"
-msgstr "HTML deo nije dostupan"
+msgstr "Nije dostupan HTML tok."
 
-#: ../mail/em-subscription-editor.c:1138
+#: ../mail/em-subscription-editor.c:1156
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1177
+#: ../mail/em-subscription-editor.c:1195
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1192
+#: ../mail/em-subscription-editor.c:1210
 msgid "Clear Search"
 msgstr "OÄisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1210
+#: ../mail/em-subscription-editor.c:1228
 msgid "Sho_w items that contain:"
-msgstr "Prika_Åi stavke koje sadrÅe:"
+msgstr "_PrikaÅi stavke koje sadrÅe:"
 
-#: ../mail/em-subscription-editor.c:1249
+#: ../mail/em-subscription-editor.c:1267
 msgid "Subscribe to the selected folder"
-msgstr "Prijava na izabranu fasciklu"
+msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1250
+#: ../mail/em-subscription-editor.c:1268
 msgid "Su_bscribe"
-msgstr "_Prijavi se"
+msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../mail/em-subscription-editor.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1227
 msgid "Unsubscribe from the selected folder"
-msgstr "Odjava od izabrane fascikle"
+msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1262
-#: ../modules/mail/e-mail-shell-view-actions.c:1222
+#: ../mail/em-subscription-editor.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../mail/em-subscription-editor.c:1273
+#: ../mail/em-subscription-editor.c:1291
 msgid "Collapse all folders"
-msgstr "Skupi sve fascikle"
+msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1274
+#: ../mail/em-subscription-editor.c:1292
 msgid "C_ollapse All"
-msgstr "S_kupi sve"
+msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1284
+#: ../mail/em-subscription-editor.c:1302
 msgid "Expand all folders"
-msgstr "Razgranaj sve fascikle"
+msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1285
+#: ../mail/em-subscription-editor.c:1303
 msgid "E_xpand All"
-msgstr "R_azgranaj sve"
+msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1295
+#: ../mail/em-subscription-editor.c:1313
 msgid "Refresh the folder list"
-msgstr "OsveÅi listu fascikli"
+msgstr "OsveÅite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1307
+#: ../mail/em-subscription-editor.c:1325
 msgid "Stop the current operation"
-msgstr "OtkaÅi trenutnu radnju"
+msgstr "Zaustavite trenutnu operaciju"
 
 #. Translators: This message is shown only for ten or more
 #. * messages to be opened.  The %d is replaced with the actual
@@ -10244,15 +10135,15 @@ msgstr "OtkaÅi trenutnu radnju"
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
-msgstr[0] "Sigurno Åelite da otvorite %d poruku odjednom?"
+msgstr[0] "Sigurno Åelite da otvorite ovu %d poruku?"
 msgstr[1] "Sigurno Åelite da otvorite %d poruke odjednom?"
 msgstr[2] "Sigurno Åelite da otvorite %d poruka odjednom?"
-msgstr[3] "Sigurno Åelite da otvorite %d poruku odjednom?"
+msgstr[3] "Sigurno Åelite da otvorite ovu jednu poruku?"
 
 #: ../mail/em-utils.c:158
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
-msgstr "_Ne prikazuj viÅe ovu poruku"
+msgstr "_Ne prikazuj ponovo ovu poruku."
 
 #: ../mail/em-utils.c:331
 msgid "Message Filters"
@@ -10261,70 +10152,70 @@ msgstr "Filteri poruka"
 #: ../mail/em-utils.c:916
 #, c-format
 msgid "Messages from %s"
-msgstr "Poruke od %s"
+msgstr "Poruke koje je poslao %s"
 
 #: ../mail/em-vfolder-editor.c:108
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-rule.c:604
+#: ../mail/em-vfolder-rule.c:608
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
 #: ../mail/evolution-mail.schemas.in.h:1
 msgid "\"Filter Editor\" window height"
-msgstr "Visina prozora âUreÄivaÄa filteraâ"
+msgstr "Visina prozora ureÄivaÄa filtera"
 
 #: ../mail/evolution-mail.schemas.in.h:2
 msgid "\"Filter Editor\" window maximize state"
-msgstr "Stanje uveÄanog prozora âUreÄivaÄa filteraâ"
+msgstr "Stanje uveÄanog prozora ureÄivaÄa filtera"
 
 #: ../mail/evolution-mail.schemas.in.h:3
 msgid "\"Filter Editor\" window width"
-msgstr "Åirina prozora âUreÄivaÄa filteraâ"
+msgstr "Åirina prozora ureÄivaÄa filtera"
 
 #: ../mail/evolution-mail.schemas.in.h:4
 msgid "\"Folder Subscriptions\" window height"
-msgstr "Visina prozora âPrijave na fascikleâ"
+msgstr "Visina prozora âPrijavljivanje na fascikleâ"
 
 #: ../mail/evolution-mail.schemas.in.h:5
 msgid "\"Folder Subscriptions\" window maximize state"
-msgstr "Stanje uveÄanog prozora âPrijave na fascikleâ"
+msgstr "Stanje uveÄanog prozora âPrijavljivanje na fascikleâ"
 
 #: ../mail/evolution-mail.schemas.in.h:6
 msgid "\"Folder Subscriptions\" window width"
-msgstr "Åirina prozora âPrijave na fascikleâ"
+msgstr "Åirina prozora âPrijavljivanje na fascikleâ"
 
 #: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Search Folder Editor\" window height"
-msgstr "Visina prozora âUreÄivaÄa fascikle pretrageâ"
+msgstr "Visina prozora ureÄivaÄa fascikle pretrage"
 
 #: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Search Folder Editor\" window maximize state"
-msgstr "Stanje uveÄanog prozora âUreÄivaÄa fascikle pretrageâ"
+msgstr "Stanje uveÄanog prozora ureÄivaÄa fascikle pretrage"
 
 #: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Search Folder Editor\" window width"
-msgstr "Åirina prozora âUreÄivaÄa fascikle pretrageâ"
+msgstr "Åirina prozora ureÄivaÄa fascikle pretrage"
 
 #: ../mail/evolution-mail.schemas.in.h:10
 msgid "\"Send and Receive Mail\" window height"
-msgstr "Visina prozora âSlanje i primanje poÅteâ"
+msgstr "Visina prozora za slanje i primanje poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:11
 msgid "\"Send and Receive Mail\" window maximize state"
-msgstr "UveÄanje prozora za âSlanje i primanje poÅteâ"
+msgstr "UveÄanje prozora za slanje i primanje poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:12
 msgid "\"Send and Receive Mail\" window width"
-msgstr "Åirina prozora âSlanje i primanje poÅteâ"
+msgstr "Åirina prozora za slanje i primanje poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:13
 msgid "Always request read receipt"
 msgstr "Uvek traÅi povratnicu"
 
 #: ../mail/evolution-mail.schemas.in.h:14
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
 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."
 
@@ -10333,36 +10224,32 @@ msgid ""
 "Asks whether to close the message window when the user forwards or replies "
 "to the message shown in the window"
 msgstr ""
+"Pita da li da zatvori prozor sa porukom kada korisnik prosleÄuje ili "
+"odgovara na poruku prikazanu u prozoru."
 
 #: ../mail/evolution-mail.schemas.in.h:16
-#, fuzzy
-#| msgid "Attached message"
 msgid "Attribute message."
-msgstr "PriloÅena poruka"
+msgstr "PriloÅena poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:17
 msgid "Automatic emoticon recognition"
-msgstr "Automatsko prepoznavanje emotikona"
+msgstr "Automatsko prepoznavanje smajliÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:18
 msgid "Automatic link recognition"
 msgstr "Automatsko prepoznavanje veza"
 
 #: ../mail/evolution-mail.schemas.in.h:19
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages in all active accounts"
-msgstr "Proveri za _novu poÅtu svakih"
+msgstr "VrÅi proveru za novim porukama u svim aktivnim nalozima"
 
 #: ../mail/evolution-mail.schemas.in.h:20
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messages on start"
-msgstr "Proveri za _novu poÅtu svakih"
+msgstr "VrÅi proveru za novim porukama prilikom pokretanja"
 
 #: ../mail/evolution-mail.schemas.in.h:21
 msgid "Check incoming mail being junk"
-msgstr "Proveri da li je pristigla poÅta Äubre"
+msgstr "VrÅi proveru da li je pristigla poÅta Äubre"
 
 #: ../mail/evolution-mail.schemas.in.h:22
 msgid "Citation highlight color"
@@ -10370,7 +10257,7 @@ msgstr "Boja isticanja citata"
 
 #: ../mail/evolution-mail.schemas.in.h:23
 msgid "Citation highlight color."
-msgstr "Boja isticanja citata."
+msgstr "Boja za isticanja citata."
 
 #: ../mail/evolution-mail.schemas.in.h:24
 msgid "Composer Window default height"
@@ -10378,7 +10265,7 @@ msgstr "Podrazumevana visina prozora sastavljaÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:25
 msgid "Composer Window default width"
-msgstr "Podrazumevana Åirina prozora sastavljaÄa"
+msgstr "Podrazumevana Åirina za prozor sastavljaÄa"
 
 #: ../mail/evolution-mail.schemas.in.h:26
 msgid "Composer load/attach directory"
@@ -10386,13 +10273,15 @@ msgstr "Direktorijum sastavljaÄa za uÄitavanje/prilaganje"
 
 #: ../mail/evolution-mail.schemas.in.h:27
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "SaÅmi prikaz adresa u TO/CC/BCC"
+msgstr "SaÅima prikaz adresa u TO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:28
 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."
+msgstr ""
+"VrÅi saÅimanje prikaza adresa u TO/CC/BCC na broj odreÄen u address_count "
+"(broj adresa)."
 
 #: ../mail/evolution-mail.schemas.in.h:29
 msgid ""
@@ -10412,7 +10301,7 @@ msgid ""
 "in the format \"headername=value\"."
 msgstr ""
 "PrilagoÄena zaglavlja za upotrebu prilikom provere neÅeljene poÅte. Elementi "
-"spiska su niz formata âheadername=valueâ."
+"spiska su niz formata âheadername=valueâ (ime zaglavlja=vrednost)."
 
 #: ../mail/evolution-mail.schemas.in.h:32
 msgid "Default charset in which to compose messages"
@@ -10464,21 +10353,23 @@ msgstr "Podrazumevana Åirina prozora pregledaÄa poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
-"Describes wheter message headers in paned view should be collapsed or "
+"Describes whether message headers in paned view should be collapsed or "
 "expanded by default. \"0\" = expanded \"1\" = collapsed"
 msgstr ""
+"Opisuje da li zaglavlja poruke u pregledu povrÅi treba da budu skupljena ili "
+"raÅirena po osnovnoj vrednosti. 0 = raÅirena, 1 = skupljena"
 
 #: ../mail/evolution-mail.schemas.in.h:45
 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 "
+"UtvrÄuje da li samo u adresaru da pregleda adrese u potrazi za neÅeljenom "
 "poÅtom"
 
 #: ../mail/evolution-mail.schemas.in.h:46
 msgid "Determines whether to lookup in address book for sender email"
-msgstr "UtvrÄuje da li da pregleda u adresaru adrese poÅiljaoca"
+msgstr "UtvrÄuje da li u adresaru da pregleda adrese poÅiljaoca"
 
 #: ../mail/evolution-mail.schemas.in.h:47
 msgid ""
@@ -10529,11 +10420,11 @@ msgstr "IskljuÄuje ili omoguÄava skraÄivanje naziva fascikli u boÄnoj povrÅ
 
 #: ../mail/evolution-mail.schemas.in.h:54
 msgid "Display only message texts not exceeding certain size"
-msgstr "PrikaÅi samo tekst poruka koje ne prelaze odreÄenu veliÄinu"
+msgstr "Prikazuje samo tekst poruka koje ne prelaze odreÄenu veliÄinu"
 
 #: ../mail/evolution-mail.schemas.in.h:55
 msgid "Do not add signature delimiter"
-msgstr "Ne dodaj razdvojnik potpisa"
+msgstr "Ne dodaje razdvojnik potpisa"
 
 #: ../mail/evolution-mail.schemas.in.h:56
 msgid "Draw spelling error indicators on words as you type."
@@ -10561,11 +10452,11 @@ msgid ""
 "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."
+"slike i umesto njih Åele nepokretne slike."
 
 #: ../mail/evolution-mail.schemas.in.h:62
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "OmoguÄava prikaz kurzora, tako da vidite kurzor dok Äitate poruku."
+msgstr "OmoguÄava prikaz kursora, tako da vidite kursor dok Äitate poruku."
 
 #: ../mail/evolution-mail.schemas.in.h:63
 msgid "Enable or disable magic space bar"
@@ -10577,7 +10468,7 @@ msgstr "UkljuÄuje ili iskljuÄuje upozorenje pri oznaÄavanju viÅe poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable or disable type ahead search feature"
-msgstr "UkljuÄi ili iskljuÄi moguÄnost traÅenja kucanja u napred"
+msgstr "UkljuÄuje ili iskljuÄuje moguÄnost traÅenja kucanja unapred"
 
 #: ../mail/evolution-mail.schemas.in.h:66
 msgid "Enable search folders"
@@ -10592,7 +10483,7 @@ 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 "
+"OmoguÄava pretraÅivanje iz boÄne povrÅi, Åto donosi interaktivnost u pretrazi "
 "naziva fascikli."
 
 #: ../mail/evolution-mail.schemas.in.h:69
@@ -10608,22 +10499,18 @@ 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â."
+"OmoguÄava samo prikaz teksta poruka koje ne prelaze veliÄinu odreÄenu kljuÄem "
+"âmessage_text_part_limitâ (veliÄina dela teksta poruke)."
 
 #: ../mail/evolution-mail.schemas.in.h:71
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
+"OmoguÄiti da koriste sliÄna podeÅavanja prikaza liste poruke za sve fascikle"
 
 #: ../mail/evolution-mail.schemas.in.h:72
-#, 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."
+"OmoguÄiti da koriste sliÄna podeÅavanja prikaza liste poruke za sve fascikle."
 
 #: ../mail/evolution-mail.schemas.in.h:73
 msgid "Enable/disable caret mode"
@@ -10631,7 +10518,7 @@ msgstr "UkljuÄuje/iskljuÄuje prikaz kursora"
 
 #: ../mail/evolution-mail.schemas.in.h:74 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
-msgstr "Kodiraj nazive datoteka na Outlook/GMail naÄin"
+msgstr "Kodiranje naziva datoteka na naÄin Autluka/GpoÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
@@ -10640,23 +10527,21 @@ msgid ""
 "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, "
+"Kodira nazive datoteka u zaglavljima poÅte kao Åto to rade Autluk ili GpoÅta, "
 "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:76
 msgid "Flush Outbox after filtering"
-msgstr ""
+msgstr "Prazni slanje nakon filtriranja"
 
 #: ../mail/evolution-mail.schemas.in.h:77
-#, fuzzy
-#| msgid "Forwarded message"
 msgid "Forward message."
-msgstr "ProsleÄena poruka"
+msgstr "ProsleÄuje poruku."
 
 #: ../mail/evolution-mail.schemas.in.h:78
 msgid "Group Reply replies to list"
-msgstr ""
+msgstr "Grupisanje odgovora Odgovori na spisku"
 
 #: ../mail/evolution-mail.schemas.in.h:79
 msgid "Height of the message-list pane"
@@ -10664,7 +10549,7 @@ msgstr "Visina povrÅi liste poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:80
 msgid "Height of the message-list pane."
-msgstr "Visina povrÅi liste poruka."
+msgstr "Visina povrÅi za liste poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:81
 msgid "Hides the per-folder preview and removes the selection"
@@ -10675,8 +10560,8 @@ 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."
+"Ukoliko korisnik pokuÅa da otvori 10 ili viÅe poruka odjednom, pitaÄe ga da "
+"li zaista Åeli to da uradi."
 
 #: ../mail/evolution-mail.schemas.in.h:83
 msgid ""
@@ -10690,38 +10575,38 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:84
 msgid "Ignore list Reply-To:"
-msgstr ""
+msgstr "Zanemaruje listu âOdgovor-za:â"
 
 #: ../mail/evolution-mail.schemas.in.h:85
 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."
+"PoÄetna visina prozora ureÄivaÄa filtera. Vrednost se aÅurira ukoliko "
+"korisnik izduÅi prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:86
 msgid ""
 "Initial height of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
-"PoÄetna visina prozora âPrijave na fascikleâ. Vrednost se aÅurira ukoliko "
-"korisnik produÅi prozor."
+"PoÄetna visina prozora âPrijavljivanje na fascikleâ. Vrednost se aÅurira "
+"ukoliko korisnik produÅi prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:87
 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."
+"PoÄetna visina prozora ureÄivaÄa fascikle pretrage. Vrednost se aÅurira "
+"ukoliko korisnik izduÅi prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:88
 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 "
+"PoÄetna visina prozora slanja i primanja poÅte. Vrednost se aÅurira ukoliko "
 "korisnik produÅi prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:89
@@ -10731,10 +10616,10 @@ msgid ""
 "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."
+"PoÄetno stanje uveÄanog prozora ureÄivaÄa filtera. Vrednost se aÅurira "
+"ukoliko korisnik uveÄa ili umanji prozor. Znajte 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:90
 msgid ""
@@ -10743,9 +10628,9 @@ msgid ""
 "particular value is not used by Evolution since the \"Folder Subscriptions\" "
 "window cannot be maximized. This key exists only as an implementation detail."
 msgstr ""
-"PoÄetno stanje uveÄanog prozora âPrijave na fascikleâ. 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 "
+"PoÄetno stanje uveÄanog prozora âPrijavljivanje na fascikleâ. 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:91
@@ -10755,8 +10640,8 @@ msgid ""
 "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 "
+"PoÄetno stanje uveÄanog prozora ureÄivaÄa fascikle pretrage. Vrednost se "
+"aÅurira ukoliko korisnik uveÄa ili umanji prozor. Znajte da Evolucija ne "
 "koristi ovu vrednost poÅto ovaj prozor ne moÅe biti uveÄan. Ovaj kljuÄ samo "
 "upotpunjuje postavke."
 
@@ -10768,42 +10653,42 @@ msgid ""
 "\" 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."
+"PoÄetna veliÄina uveÄanog prozora slanja i primanja poÅte. Vrednost se aÅurira "
+"ukoliko korisnik uveÄa ili umanji prozor. Znajte 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:93
 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."
+"PoÄetna Åirina prozora ureÄivaÄa filtera. Vrednost se aÅurira ukoliko "
+"korisnik raÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "Initial width of the \"Folder Subscriptions\" window. The value updates as "
 "the user resizes the window horizontally."
 msgstr ""
-"PoÄetna Åirina prozora âPrijave na fascikleâ. Vrednost se aÅurira ukoliko "
-"korisnik proÅiri prozor."
+"PoÄetna Åirina prozora âPrijavljivanje na fascikleâ. Vrednost se aÅurira "
+"ukoliko korisnik proÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:95
 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."
+"PoÄetna Åirina prozora ureÄivaÄa fascikle pretrage. Vrednost se aÅurira "
+"ukoliko korisnik raÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:96
 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."
+"PoÄetna Åirina prozora slanja i primanja poÅte. Vrednost se aÅurira ukoliko "
+"korisnik raÅiri prozor."
 
 #: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
@@ -10812,9 +10697,9 @@ msgid ""
 "which you happened to receive the copy of the message to which you're "
 "replying."
 msgstr ""
-"Ova opcija navodi da Äe dugme âOdgovor grupiâ u traci alatki pokuÅati da "
-"odgovori samo na dopisnu listu preko koje je poruka primljena, Umesto obiÄnog "
-"ponaÅanja âOdgovori svimaâ."
+"Umesto normalnog ponaÅanja odgovoranja svima, ova opcija Äe napraviti dugme "
+"âOdgovor grupiâ na liniji alata koje Äe pokuÅati da odgovori samo na dopisnu "
+"listi preko koje ste navikli da primate primerak poruke na koju odgovarate."
 
 #: ../mail/evolution-mail.schemas.in.h:98
 msgid ""
@@ -10823,23 +10708,22 @@ msgid ""
 "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. "
+"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
 #: ../mail/evolution-mail.schemas.in.h:99
 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 o slanju privatnog odgovora na "
-"poruku koja je stigla preko dopisne liste."
+"OmoguÄava/onemoguÄava ponavljanje upozorenja da Åaljete privatan odgovor na "
+"poruku koja je stigla sa dopisne liste."
 
 #: ../mail/evolution-mail.schemas.in.h:100
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
-"OmoguÄava/onemoguÄava ponavljanje upozorenja o slanju odgovora na adresu veÄeg "
-"broja ljudi."
+"OmoguÄava/onemoguÄava ponavljanje upozorenja da Åaljete odgovor mnogim ljudima."
 
 #: ../mail/evolution-mail.schemas.in.h:101
 msgid ""
@@ -10847,29 +10731,23 @@ msgid ""
 "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 ""
+"OmoguÄava/onemoguÄava ponavljanje upozorenja da pokuÅavate da poÅaljete privatni "
+"odgovor na poruku koja je stigla sa dopisne liste, ali u listi zaglavlje "
+"âOdgovor-zaâ je podeÅeno da vas preusmeri da odgovorite na listu."
 
 #: ../mail/evolution-mail.schemas.in.h:102
-#, 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 trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr ""
-"OmoguÄava/onemoguÄava ponavljanje upozorenja da je brisanje poruke iz fascikle "
-"pretrage trajno, a ne samo uklanjanje iz rezultata pretrage. "
+"OmoguÄava/onemoguÄava ponavljanje upozorenja kada pokuÅavate da poÅaljete poruku "
+"primaocima koji nisu uneÅeni kao adrese poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:103
-#, fuzzy
-#| msgid "Last time empty junk was run"
 msgid "Last time Empty Junk was run"
-msgstr "Poslednje vreme praÅnjenja Äubreta"
+msgstr "Vreme poslednjeg praÅnjenja Äubreta"
 
 #: ../mail/evolution-mail.schemas.in.h:104
-#, fuzzy
-#| msgid "Last time empty trash was run"
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme praÅnjenja smeÄa"
 
@@ -10878,7 +10756,7 @@ msgid "Layout style"
 msgstr "Stil razmeÅtaja"
 
 #: ../mail/evolution-mail.schemas.in.h:106
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
@@ -10888,7 +10766,7 @@ msgstr "Spisak oznaka i njima dodeljenih boja"
 
 #: ../mail/evolution-mail.schemas.in.h:108
 msgid "List of MIME types to check for Bonobo component viewers"
-msgstr "Lista MIME tipova radi provere za Bonobo pregledaÄima delova"
+msgstr "Lista MIME tipova za proveru u pregledaÄima Bonobo delova"
 
 #: ../mail/evolution-mail.schemas.in.h:109
 msgid "List of accepted licenses"
@@ -10908,7 +10786,7 @@ msgstr ""
 
 #: ../mail/evolution-mail.schemas.in.h:112
 msgid "List of custom headers and whether they are enabled."
-msgstr "Spisak prilagoÄenih zaglavlja i da li su ukljuÄena."
+msgstr "Spisak proizvoljnih zaglavlja i da li su ukljuÄena."
 
 #: ../mail/evolution-mail.schemas.in.h:113
 msgid "List of dictionary language codes used for spell checking."
@@ -10920,7 +10798,7 @@ msgid ""
 "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."
+"oblika ime:boja gde boja koristi HTML heksa kodiranje."
 
 #: ../mail/evolution-mail.schemas.in.h:115
 msgid "List of protocol names whose license has been accepted."
@@ -10936,13 +10814,13 @@ msgid ""
 "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."
+"UÄitava slike za HTML poruke preko HTT(S)-a. MoguÄe vrednosti su: 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:118
 msgid "Log filter actions"
-msgstr "BeleÅi radnje filtera"
+msgstr "Dnevnik radnji filtera"
 
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid "Log filter actions to the specified log file."
@@ -10970,11 +10848,11 @@ msgstr "Åirina pregledaÄa poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid "Mark as Seen after specified timeout"
-msgstr "OznaÄava kao viÄenu posle navedenog roka"
+msgstr "OznaÄava poruku viÄenom posle navedenog roka"
 
 #: ../mail/evolution-mail.schemas.in.h:126
 msgid "Mark as Seen after specified timeout."
-msgstr "OznaÄava kao viÄenu posle navedenog roka."
+msgstr "OznaÄava poruku viÄenom posle navedenog roka."
 
 #: ../mail/evolution-mail.schemas.in.h:127
 msgid "Mark citations in the message \"Preview\""
@@ -10985,16 +10863,14 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr "OznaÄava citate u pregledu poruke."
 
 #: ../mail/evolution-mail.schemas.in.h:129
-#, fuzzy
-#| msgid "Message Display"
 msgid "Message text limit for display"
-msgstr "Prikaz poruke"
+msgstr "OgraniÄenje teksta poruke za prikazivanje"
 
 #: ../mail/evolution-mail.schemas.in.h:130
 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)"
+"Stil prikaza poruke (normal â za normalan prikaz; full headers â za prikaz "
+"svih zaglavlja; source â za izvorni prikaz)"
 
 #: ../mail/evolution-mail.schemas.in.h:131
 msgid "Minimum days between emptying the junk on exit"
@@ -11014,33 +10890,28 @@ msgstr "Najmanje vreme izmeÄu praÅnjenja smeÄa na izlazu, u danima."
 
 #: ../mail/evolution-mail.schemas.in.h:135
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Broj adresa za prikaz u TO/CC/BCC"
+msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
 #: ../mail/evolution-mail.schemas.in.h:136
-#, fuzzy
-#| msgid "-----Original Message-----"
 msgid "Original message."
-msgstr "-----Originalna poruka-----"
+msgstr "Originalna poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:137
 msgid "Path where picture gallery should search for its content"
-msgstr ""
+msgstr "Putanja u kojoj galerija slika treba da traÅi svoj sadrÅaj."
 
 #: ../mail/evolution-mail.schemas.in.h:138
 msgid ""
 "Possible values are: never - to never close browser window always - to "
 "always close browser window ask - (or any other value) will ask user"
 msgstr ""
+"MoguÄe vrednosti su: âneverâ â da nikada ne zatvori prozor pretraÅivaÄa; "
+"âalwaysâ â da uvek zatvori prozor pretraÅivaÄa i âaskâ â (ili bilo koja "
+"druga vrednost) pitaÄe korisnika"
 
 #: ../mail/evolution-mail.schemas.in.h:139
-#, fuzzy
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
 msgid "Prompt before sending to recipients not entered as mail addresses"
-msgstr ""
-"Nisu prepoznate ispravne adrese sledeÄih primalaca:\n"
-"{0}"
+msgstr "UpitaÄe pre slanja primaocima koji nisu uneÅeni kao adrese poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:140
 msgid "Prompt on empty subject"
@@ -11057,25 +10928,19 @@ msgstr "Pita korisnika kada pokuÅa da poÅalje poruku bez naslova."
 
 #: ../mail/evolution-mail.schemas.in.h:143
 msgid "Prompt when deleting messages in search folder"
-msgstr "Upozori kod brisanja poruka iz fascikle pretrage"
+msgstr "Pita kod brisanja poruka iz fascikle pretrage"
 
 #: ../mail/evolution-mail.schemas.in.h:144
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when mailing list hijacks private replies"
-msgstr "Pita pri oznaÄavanju viÅe poruka"
+msgstr "Pita kada dopisna lista oduzme privatne odgovore"
 
 #: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Prompt when replying privately to list messages"
-msgstr "Pita pri oznaÄavanju viÅe poruka"
+msgstr "Pita kada odgovarate privatno na listu poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:146
-#, 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"
+msgstr "Pita kada odgovarate veÄem broju primalaca"
 
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid "Prompt when user expunges"
@@ -11083,7 +10948,7 @@ msgstr "Pita pri praÅnjenju"
 
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Prompt when user only fills Bcc"
-msgstr "Pita kada korisnik unese samo nevidljivu kopiju (Bcc)"
+msgstr "Pita kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
 
 #: ../mail/evolution-mail.schemas.in.h:149
 msgid "Prompt when user tries to open 10 or more messages at once"
@@ -11111,7 +10976,7 @@ msgstr "Pita pri oznaÄavanju viÅe poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "Put personalized signatures at the top of replies"
-msgstr "Postavi personalizovane potpise povrh odgovora"
+msgstr "Postavlja personalizovane potpise iznad odgovora"
 
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "Put the cursor at the bottom of replies"
@@ -11119,7 +10984,7 @@ msgstr "Postavlja kursor na dno odgovora"
 
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Recognize emoticons in text and replace them with images."
-msgstr "Prepoznaje emotikone u tekstu i zamenjuje ih slikama."
+msgstr "Prepoznaje smajliÄe u tekstu i zamenjuje ih slikama."
 
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Recognize links in text and replace them."
@@ -11131,7 +10996,7 @@ msgstr "Proverava da li ima Äubreta u dolaznoj poÅti."
 
 #: ../mail/evolution-mail.schemas.in.h:159
 msgid "Save directory"
-msgstr "SaÄuvaj direktorijum"
+msgstr "Direktorijum Äuvanja"
 
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid "Search for the sender photo in local address books"
@@ -11139,55 +11004,55 @@ msgstr "TraÅi sliku poÅiljaoca u lokalnim adresarima"
 
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Send HTML mail by default"
-msgstr "Podrazumevano Åalji poÅtu kao HTML"
+msgstr "Podrazumevano slanje HTML poÅte"
 
 #: ../mail/evolution-mail.schemas.in.h:162
 msgid "Send HTML mail by default."
-msgstr "Podrazumevano Åalje poÅtu kao HTML."
+msgstr "Åalje HTML poÅtu po podrazumevanoj vrednosti."
 
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Sender email-address column in the message list"
-msgstr "Prikazuje kolonu sa e-adresama  u spisku poruka"
+msgstr "Prikaz kolone e-adresa poÅiljaoca u spisku poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid "Server synchronization interval"
-msgstr "Interval sinhronizacije sa serverom"
+msgstr "Interval usaglaÅavanja sa serverom"
 
 #: ../mail/evolution-mail.schemas.in.h:165
 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. "
+"Izaberite ovu opciju u sluÄaju da ne Åelite dodavanje razdvojnika ispred "
+"potpisa prilikom pisanja poruke. "
 
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "PrikaÅi polje âBccâ pri slanju poruke"
+msgstr "Prikazivanje polja âBccâ pri slanju poruke"
 
 #: ../mail/evolution-mail.schemas.in.h:167
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr "PrikaÅi polje âCcâ pri slanju poruke"
+msgstr "Prikazivanje polja âCcâ pri slanju poruke"
 
 #: ../mail/evolution-mail.schemas.in.h:168
 msgid "Show \"From\" field when posting to a newsgroup"
-msgstr "PrikaÅi polje âÅaljeâ pri slanju na dopisnu listu"
+msgstr "Prikazivanje polja âÅaljeâ pri slanju na dopisnu listu"
 
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "Show \"Reply To\" field when posting to a newsgroup"
-msgstr "PrikaÅi polje âOdgovor zaâ pri slanju na dopisnu listu"
+msgstr "Prikazivanje polja âOdgovor zaâ pri slanju na dopisnu listu"
 
 #: ../mail/evolution-mail.schemas.in.h:170
 msgid "Show \"Reply To\" field when sending a mail message"
-msgstr "Prikazuje polje âOdgovor zaâ kada Åalje poruku"
+msgstr "Prikazivanje polja âOdgovor zaâ kada Åalje poruku"
 
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid "Show Animations"
-msgstr "PrikaÅi animacije"
+msgstr "Prikazivanje animacija"
 
 #: ../mail/evolution-mail.schemas.in.h:172
 msgid "Show all message headers"
-msgstr "PrikaÅi sva zaglavlja poruka"
+msgstr "Prikazivanje svih zaglavlja poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "Show all the headers when viewing a messages."
@@ -11203,19 +11068,19 @@ msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Show deleted messages in the message-list"
-msgstr "PrikaÅi obrisane poruke u listi poruka"
+msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid "Show image animations"
-msgstr "Prikazuje animirane slike"
+msgstr "Prikazivanje animiranih slika"
 
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Show original \"Date\" header value."
-msgstr "Prikazuje originalnu vrednost âDatumâ."
+msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Show photo of the sender"
-msgstr "Prikatuje sliku poÅiljaoca"
+msgstr "Prikazivanje slike poÅiljaoca"
 
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
@@ -11287,10 +11152,17 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
+"Neke dopisne liste podeÅavaju zaglavlje âOdgovor-za:â da prevare korisnike da "
+"Åalju odgovore na listu, Äak i kada oni traÅe od Evolucije da da privatni "
+"odgovor. Postavljanje ove opcije Äe pokuÅati da zanemari takva zaglavlja "
+"âOdgovor-zaâ, tako da Äe Evolucija da uradi onako kako ste vi zatraÅili. Ako "
+"koristite radnju privatnog odgovora, onda Äe odgovoriti privatno, a ako "
+"koristite radnju âOdgovori na listuâ onda Äe to da uradi. VrÅi se uporeÄivanje "
+"zaglavlje âOdgovor-zaâ sa zaglavljem âLista objavaâ, ako postoji."
 
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Spell check inline"
-msgstr "Provera pravopisa"
+msgstr "UnutraÅnja provera pravopisa"
 
 #: ../mail/evolution-mail.schemas.in.h:190
 msgid "Spell checking color"
@@ -11302,7 +11174,7 @@ msgstr "Jezici za proveru pravopisa"
 
 #: ../mail/evolution-mail.schemas.in.h:192
 msgid "State of message headers in paned view"
-msgstr ""
+msgstr "Stanje zaglavlja poruke u pregledu povrÅi"
 
 #: ../mail/evolution-mail.schemas.in.h:193
 msgid "Terminal font"
@@ -11313,18 +11185,18 @@ msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za Äubre"
 
 #: ../mail/evolution-mail.schemas.in.h:195
-#, 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."
+msgstr ""
+"Kada je poslednji put izvrÅeno praÅnjenje Äubreta, u danima od 1. januara, 1970 "
+"(epoh)."
 
 #: ../mail/evolution-mail.schemas.in.h:196
-#, 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."
+msgstr ""
+"Kada je poslednji put izvrÅeno praÅnjenje smeÄa, u danima od 1. januara, 1970 "
+"(epoh)."
 
 #: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
@@ -11333,9 +11205,9 @@ msgid ""
 "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."
+"Stil razmeÅtaja utvrÄuje gde Äe biti postavljen pregled 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:198
 msgid "The terminal font for mail display."
@@ -11346,18 +11218,24 @@ msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows."
 msgstr ""
+"Tekst koji se ubacuje prilikom prosleÄivanja poruke, koji je rekao da "
+"prosleÄena poruka sledi."
 
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows."
 msgstr ""
+"Tekst koji se ubacuje prilikom prosleÄivanja poruke (objava pri vrhu), koji "
+"je rekao da prosleÄena poruka sledi."
 
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author."
 msgstr ""
+"Tekst koji se ubacuje kada odgovarate na poruku, pripisujuÄi poruku "
+"originalnom autoru."
 
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "The variable width font for mail display."
@@ -11368,22 +11246,20 @@ 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 "
+"MoÅe imati tri moguÄe vrednosti: 0 â za greÅke, 1 â za upozorenja i 2 â za "
 "poruke o dijagnozi kvara."
 
 # bug: s/interms/in terms/ (space)
 #: ../mail/evolution-mail.schemas.in.h:204
-#, 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."
+"Ovo odreÄuje najveÄu veliÄinu teksta poruke koji moÅe biti prikazan u "
+"Evoluciji, navedenu u kilobajtima (KB). Podrazumevano je 4096 (4MB). Ova "
+"vrednost se koristi samo kada je aktiviran kljuÄ "
+"âforce_message_limitâ (prisili ograniÄenje poruke)."
 
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
@@ -11410,9 +11286,10 @@ msgid ""
 "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."
+"Ovaj kljuÄ treba da sadrÅi listu HML struktura za navoÄenje prilagoÄenih "
+"zaglavlja i potrebu njihovog prikazivanja. HML struktura je formata &lt;header "
+"enabled&gt; â izaberite ovu opciju ako Äe zaglavlje biti prikazivano u "
+"pregledu poÅte."
 
 #: ../mail/evolution-mail.schemas.in.h:208
 msgid ""
@@ -11434,19 +11311,15 @@ msgid ""
 "beyond which a '...' is shown."
 msgstr ""
 "Ovo podeÅava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
-"posle Äega je â...â prikazano."
+"posle Äega je prikazano â...â."
 
 #: ../mail/evolution-mail.schemas.in.h:211
-#, fuzzy
-#| msgid ""
-#| "This setting specifies whether the threads should be in expanded or "
-#| "collapsed state by default. Evolution requires a restart."
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Requires a restart to apply."
 msgstr ""
-"Ovo podeÅavanje odreÄuje da li Äe nizovi podrazumevano biti raÅireni ili "
-"skupljeni. Evolucija zahteva ponovno pokretanje."
+"Ovo podeÅavanje odreÄuje da li Äe niti podrazumevano biti raÅirene ili "
+"skupljene. Evolucija zahteva ponovno pokretanje."
 
 #: ../mail/evolution-mail.schemas.in.h:212
 msgid ""
@@ -11454,8 +11327,8 @@ msgid ""
 "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."
+"Ovo podeÅavanje odreÄuje da li Äe niti biti razvrstani po poslednjoj poruci "
+"jedne niti, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
 #: ../mail/evolution-mail.schemas.in.h:213
 msgid ""
@@ -11463,10 +11336,13 @@ msgid ""
 "folder, usually set to ~/Pictures. This folder will be also used when the "
 "set path is not pointing to the existent folder."
 msgstr ""
+"Ova vrednost moÅe biti prazna niska, Åto znaÄi da Äe koristiti sistemsku "
+"fasciklu sa slikama, obiÄno podeÅena na ~/Slike. Ova fascikla Äe se takoÄe "
+"koristi kada podeÅena putanja ne ukazuje na postojeÄu fasciklu."
 
 #: ../mail/evolution-mail.schemas.in.h:214
 msgid "Thread the message-list based on Subject"
-msgstr "PrikaÅi poruke prema naslovu rasprave"
+msgstr "Prikaz poruke prema naslovu rasprave"
 
 #: ../mail/evolution-mail.schemas.in.h:215
 msgid "Timeout for marking message as seen"
@@ -11474,7 +11350,7 @@ msgstr "Vreme za oznaÄavanje poruke kao viÄene"
 
 #: ../mail/evolution-mail.schemas.in.h:216
 msgid "Timeout for marking message as seen."
-msgstr "Vreme za oznaÄavanje poruke kao viÄene."
+msgstr "Vreme za koje Äe poruke bit oznaÄavanje kao viÄene."
 
 #: ../mail/evolution-mail.schemas.in.h:217
 msgid "UID string of the default account."
@@ -11485,75 +11361,65 @@ 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:219
-msgid "Use SpamAssassin daemon and client"
-msgstr "Koristi servis i klijenta Ubice spama"
-
-#: ../mail/evolution-mail.schemas.in.h:220
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
-
-#: ../mail/evolution-mail.schemas.in.h:221
 msgid "Use custom fonts"
-msgstr "Koristi sopstvene fontove"
+msgstr "KoriÅÄenje sopstvenih fontova"
 
-#: ../mail/evolution-mail.schemas.in.h:222
+#: ../mail/evolution-mail.schemas.in.h:220
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagoÄene fontove za prikaz poÅte."
 
-#: ../mail/evolution-mail.schemas.in.h:223
-msgid "Use only local spam tests."
-msgstr "Koristi samo lokalne provere spama."
-
-#: ../mail/evolution-mail.schemas.in.h:224
-msgid "Use only the local spam tests (no DNS)."
-msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
-
-#: ../mail/evolution-mail.schemas.in.h:225
+#: ../mail/evolution-mail.schemas.in.h:221
 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 "
+"Korisnici se razmimoilaze u stavovima gde bi kursor trebalo 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:226
+#: ../mail/evolution-mail.schemas.in.h:222
 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."
+"Korisnicima se razmimoilaze u stavovima gde bi potpis trebalo 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:227
+#: ../mail/evolution-mail.schemas.in.h:223
 msgid "Variable width font"
 msgstr "Font promenljive veliÄine"
 
-#: ../mail/evolution-mail.schemas.in.h:228
+#: ../mail/evolution-mail.schemas.in.h:224
 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:229
+#: ../mail/evolution-mail.schemas.in.h:225
 msgid ""
 "Whether check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
+"Da li Äe vrÅiti proveru za novim porukama u svim aktivnim nalozima bez "
+"obzira na opciju naloga âProveri za novim porukama svakih H minutaâ prilikom "
+"pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
+"âsend_recv_on_startâ (poÅalji_primi_pri_pokretanju) opcijom."
 
-#: ../mail/evolution-mail.schemas.in.h:230
+#: ../mail/evolution-mail.schemas.in.h:226
 msgid ""
 "Whether check for new messages when Evolution is started. This includes also "
 "sending messages from Outbox."
 msgstr ""
+"Da li Äe vrÅiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
+"ukljuÄuje i slanje poruka iz fascikle Poslato."
 
-#: ../mail/evolution-mail.schemas.in.h:231
+#: ../mail/evolution-mail.schemas.in.h:227
 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:232
+#: ../mail/evolution-mail.schemas.in.h:228
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11561,22 +11427,25 @@ 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:233
+#: ../mail/evolution-mail.schemas.in.h:229
 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:234
+#: ../mail/evolution-mail.schemas.in.h:230
 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 ""
+"Da li Äe fascikla slanja biti oÄiÅÄena nakon obavljenog filtriranja. ÄiÅÄenje "
+"ove fascikle Äe se dogoditi samo ako se koristi neka radnja filtera "
+"âProslediâ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../mail/evolution-mail.schemas.in.h:235
+#: ../mail/evolution-mail.schemas.in.h:231
 msgid "Width of the message-list pane"
 msgstr "Åirina povrÅi spiska poruka"
 
-#: ../mail/evolution-mail.schemas.in.h:236
+#: ../mail/evolution-mail.schemas.in.h:232
 msgid "Width of the message-list pane."
 msgstr "Åirina povrÅi spiska poruka."
 
@@ -11585,49 +11454,43 @@ msgid "Importing Elm data"
 msgstr "UvoÅenje Elm podataka"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:446
-#: ../modules/mail/e-mail-shell-view.c:1036
+#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:453
+#: ../modules/mail/e-mail-shell-view.c:1040
 #: ../widgets/misc/e-send-options.c:511
 msgid "Mail"
 msgstr "PoÅta"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
+msgstr "Elm uvoznik Evolucije"
 
 #: ../mail/importers/elm-importer.c:383
 msgid "Import mail from Elm."
-msgstr "VaÅna poÅta iz programa Elm."
+msgstr "Uvozi poÅtu iz Elma."
 
 #: ../mail/importers/evolution-mbox-importer.c:135
 #: ../plugins/dbx-import/dbx-importer.c:249
-#, fuzzy
-#| msgid "Destination folder:"
 msgid "_Destination folder:"
-msgstr "OdrediÅna fascikla:"
+msgstr "_OdrediÅna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:142
 #: ../plugins/dbx-import/dbx-importer.c:259
-#: ../plugins/pst-import/pst-importer.c:318
+#: ../plugins/pst-import/pst-importer.c:446
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
 #: ../mail/importers/evolution-mbox-importer.c:143
 #: ../plugins/dbx-import/dbx-importer.c:260
-#: ../plugins/pst-import/pst-importer.c:319
+#: ../plugins/pst-import/pst-importer.c:447
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
 #: ../mail/importers/evolution-mbox-importer.c:417
-#, fuzzy
-#| msgid "Subject"
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Naslov"
 
 #: ../mail/importers/evolution-mbox-importer.c:422
-#, fuzzy
-#| msgid "From"
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Åalje"
@@ -11648,32 +11511,30 @@ msgstr "UvoÅenje poÅtanskog sanduÄeta"
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
 #: ../plugins/dbx-import/dbx-importer.c:603
-#: ../plugins/pst-import/pst-importer.c:500
-#: ../plugins/pst-import/pst-importer.c:609
-#, fuzzy, c-format
-#| msgid "Importing `%s'"
+#: ../plugins/pst-import/pst-importer.c:629
+#, c-format
 msgid "Importing '%s'"
-msgstr "UvoÅenje â%sâ"
+msgstr "Uvozim â%sâ"
 
 #: ../mail/importers/mail-importer.c:315
 #, c-format
 msgid "Scanning %s"
-msgstr "Pretraga %s"
+msgstr "PretraÅujem â%sâ"
 
-#: ../mail/importers/pine-importer.c:250
+#: ../mail/importers/pine-importer.c:257
 msgid "Importing Pine data"
-msgstr "UvoÅenje Pine podataka"
+msgstr "UvoÅenje Pine podatke"
 
-#: ../mail/importers/pine-importer.c:451
-#: ../modules/addressbook/addressbook-config.c:1013
+#: ../mail/importers/pine-importer.c:458
+#: ../modules/addressbook/addressbook-config.c:1053
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../mail/importers/pine-importer.c:493
+#: ../mail/importers/pine-importer.c:500
 msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
+msgstr "Pine uvoznik Evolucije"
 
-#: ../mail/importers/pine-importer.c:494
+#: ../mail/importers/pine-importer.c:501
 msgid "Import mail from Pine."
 msgstr "Uvozi poÅtu iz programa Pine."
 
@@ -11716,9 +11577,17 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
+"Pravilo filtera â%sâ je izmenjeno u nalogu za obrisanu fasciklu \n"
+"â%sâ."
 msgstr[1] ""
+"Pravila filtera â%sâ su izmenjena u nalogu za obrisanu fasciklu \n"
+"â%sâ."
 msgstr[2] ""
+"Pravila filtera â%sâ su izmenjena u nalogu za obrisanu fasciklu \n"
+"â%sâ."
 msgstr[3] ""
+"Pravilo filtera â%sâ je izmenjeno u nalogu za obrisanu fasciklu \n"
+"â%sâ."
 
 #: ../mail/mail-config.ui.h:2
 msgid "Add Ne_w Signature..."
@@ -11733,25 +11602,25 @@ msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
 msgstr ""
+"Sve nove e-poruke sa zaglavljem koje se podudara sa datim sadrÅajem Äe biti "
+"automatski filtrirane kao neÅeljene"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:6
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Allowing a _mailing list to redirect a private reply to the list"
-msgstr "Pita pri oznaÄavanju viÅe poruka"
+msgstr "Dozvoljavanja _dopisnoj listi da preusmeri privatnu poruku na listu"
 
 #: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
-msgstr "_TakoÄe Åifruj na sebe pri slanju Åifrovane poÅte"
+msgstr "_TakoÄe Åifruj sebi pri slanju Åifrovane poÅte"
 
 #: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Uvek poÅalji _kopiju (cc):"
+msgstr "Uvek poÅalji _grafitnu kopiju (cc):"
 
 #: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Uvek poÅalji _nevidljivu kopiju (Bcc):"
+msgstr "Uvek poÅalji _nevidljivu grafitnu kopiju (Bcc):"
 
 #: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
@@ -11759,7 +11628,7 @@ msgstr "Uvek _veruj kljuÄevima mog priveska pri Åifrovanju"
 
 #: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
-msgstr "Uv_ek Åifruj i meni pri slanju Åifrovane poÅte"
+msgstr "Uv_ek i meni Åifruj pri slanju Åifrovane poÅte"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -11767,16 +11636,16 @@ msgstr "Uvek traÅi povratnicu"
 
 #: ../mail/mail-config.ui.h:13
 msgid "Apply the same _view settings to all folders"
-msgstr ""
+msgstr "Primeni ista podeÅavanja _pregleda na svim fasciklama"
 
 #: ../mail/mail-config.ui.h:15
-#: ../modules/addressbook/addressbook-config.c:1020
+#: ../modules/addressbook/addressbook-config.c:1060
 msgid "Authentication"
-msgstr "Autentifikacija"
+msgstr "PotvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Automatically insert _emoticon images"
-msgstr "Uvek umetni slike _emotikona"
+msgstr "Uvek umetni slike _smajliÄa"
 
 #: ../mail/mail-config.ui.h:17
 msgid "C_haracter set:"
@@ -11791,16 +11660,12 @@ msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li Äubreta u _prilagoÄenim zaglavljima"
 
 #: ../mail/mail-config.ui.h:20
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new _messages on start"
-msgstr "Proveri za _novu poÅtu svakih"
+msgstr "Proveri nove _poruke prilikom pokretanja"
 
 #: ../mail/mail-config.ui.h:21
-#, fuzzy
-#| msgid "Check for _new messages every"
 msgid "Check for new messa_ges in all active accounts"
-msgstr "Proveri za _novu poÅtu svakih"
+msgstr "Proveri nove poruke u svim aktivnim nalozima"
 
 #: ../mail/mail-config.ui.h:22
 msgid "Check incoming _messages for junk"
@@ -11836,13 +11701,11 @@ msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniÅ fasciklu"
 
 #: ../mail/mail-config.ui.h:30
-#, fuzzy
-#| msgid "Configuration"
 msgid "Confirmations"
-msgstr "PodeÅavanje"
+msgstr "PotvrÄivanja"
 
 #: ../mail/mail-config.ui.h:31
-#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/addressbook/autocompletion-config.c:178
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
@@ -11868,8 +11731,6 @@ msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "Digitalno potpiÅi od_lazne poruke (podrazumevano)"
 
 #: ../mail/mail-config.ui.h:39
-#, fuzzy
-#| msgid "Displayed Message _Headers"
 msgid "Displayed Message Headers"
 msgstr "Prikazana _zaglavlja poruka"
 
@@ -11883,19 +11744,19 @@ msgstr "Ne citiraj"
 
 #: ../mail/mail-config.ui.h:42
 msgid "Drafts _Folder:"
-msgstr "_Fascikla Nacrti:"
+msgstr "_Fascikla nacrta:"
 
 #: ../mail/mail-config.ui.h:43
 msgid "Email _Address:"
-msgstr "Elektronska _adresa:"
+msgstr "Adresa _e-poÅte:"
 
 #: ../mail/mail-config.ui.h:44
 msgid "Empty trash folders on e_xit"
-msgstr "Isprazni fascikle sa _smeÄem na izlazu"
+msgstr "Isprazni fascikle sa _smeÄem kada izaÄeÅ"
 
 #: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
-msgstr "Sertifikat za Åi_frovanje:"
+msgstr "Uverenje za Åi_frovanje:"
 
 #: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
@@ -11906,14 +11767,12 @@ msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
 #: ../mail/mail-config.ui.h:49
-#, fuzzy
-#| msgid "Fix_ed width Font:"
 msgid "Fix_ed Width Font:"
-msgstr "Font nep_romenjive Åirine:"
+msgstr "Font _stalne Åirine:"
 
 #: ../mail/mail-config.ui.h:50
 msgid "Format messages in _HTML"
-msgstr "Oblikuj poruke u H_TML"
+msgstr "Oblikuj poruke u HTM_L"
 
 #: ../mail/mail-config.ui.h:51
 msgid "Full Nam_e:"
@@ -11921,7 +11780,7 @@ msgstr "Ime i prezime:"
 
 #: ../mail/mail-config.ui.h:53
 msgid "Group Reply goes only to mailing list, if possible"
-msgstr ""
+msgstr "Odgovor grupi ide samo na dopisnu listu, ako je moguÄe"
 
 #: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
@@ -11929,7 +11788,7 @@ msgstr "HTML poruke"
 
 #: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
-msgstr "H_TTP posrednik:"
+msgstr "HTTP _posrednik:"
 
 #: ../mail/mail-config.ui.h:56
 msgid "Header content"
@@ -11949,7 +11808,7 @@ msgstr "Naglasi _citate sa"
 
 #: ../mail/mail-config.ui.h:60
 msgid "Ignore Reply-To: for mailing lists"
-msgstr "Zanemari Odgovori-na: za dopisne liste"
+msgstr "Zanemari âOdgovor-za:â za dopisne liste"
 
 #: ../mail/mail-config.ui.h:61
 msgid "Inline"
@@ -11957,7 +11816,7 @@ msgstr "Unutar"
 
 #: ../mail/mail-config.ui.h:62
 msgid "Inline (Outlook style)"
-msgstr "Unutar (Outlook stil)"
+msgstr "Unutar (Autluk stil)"
 
 #: ../mail/mail-config.ui.h:64 ../mail/message-list.etspec.h:8
 msgid "Labels"
@@ -11991,11 +11850,15 @@ msgstr "Priznanice poruke"
 msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
+#: ../mail/mail-config.ui.h:72 ../modules/addressbook/ldap-config.ui.h:9
+msgid "No encryption"
+msgstr "Bez Åifrovanja"
+
 #: ../mail/mail-config.ui.h:73
 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."
+"Opcija se zanemaruje ukoliko je pronaÄeno poklapanje sa proizvoljnim zaglavljem "
+"Äubreta."
 
 #: ../mail/mail-config.ui.h:74
 #: ../plugins/publish-calendar/publish-calendar.ui.h:10
@@ -12048,10 +11911,8 @@ msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
 #: ../mail/mail-config.ui.h:88
-#, fuzzy
-#| msgid "Replies and parents"
 msgid "Replies and Forwards"
-msgstr "Odgovori i nadreÄeno"
+msgstr "Odgovori i prosleÄivanja"
 
 #: ../mail/mail-config.ui.h:89
 msgid "Required Information"
@@ -12059,19 +11920,23 @@ msgstr "Obavezni podaci"
 
 #: ../mail/mail-config.ui.h:90
 msgid "SHA1"
-msgstr ""
+msgstr "SHA1"
 
 #: ../mail/mail-config.ui.h:91
 msgid "SHA256"
-msgstr ""
+msgstr "SHA256"
 
 #: ../mail/mail-config.ui.h:92
 msgid "SHA384"
-msgstr ""
+msgstr "SHA384"
 
 #: ../mail/mail-config.ui.h:93
 msgid "SHA512"
-msgstr ""
+msgstr "SHA512"
+
+#: ../mail/mail-config.ui.h:94 ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL Åifrovanje"
 
 #: ../mail/mail-config.ui.h:95
 msgid "SSL is not supported in this build of Evolution"
@@ -12099,7 +11964,7 @@ msgstr "Sigurni MIME (S/MIME)"
 
 #: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
-msgstr "Izaberite HTML font fiksirane veliÄine"
+msgstr "Izaberite HTML font stalne veliÄine"
 
 #: ../mail/mail-config.ui.h:103
 msgid "Select HTML variable width font"
@@ -12111,43 +11976,29 @@ msgstr "Fotografija poÅiljaoca"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:106
-#, fuzzy
-#| msgid "Prompt while marking multiple messages"
 msgid "Sending a _private reply to a mailing list message"
-msgstr "Pita pri oznaÄavanju viÅe poruka"
+msgstr "Slanja privatnog _odgovora na poruku dopisne liste"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:108
-#, fuzzy
-#| msgid ""
-#| "The following recipients were not recognized as valid mail addresses:\n"
-#| "{0}"
 msgid "Sending a message with _recipients not entered as mail addresses"
-msgstr ""
-"Nisu prepoznate ispravne adrese sledeÄih primalaca:\n"
-"{0}"
+msgstr "Slanja poruke sa _primaocima koji nisu uneÅeni kao adrese poÅte"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:110
-#, fuzzy
-#| msgid "_Prompt when sending messages with an empty subject line"
 msgid "Sending a message with an _empty subject line"
-msgstr "_Upozori kada ÅaljeÅ poruke bez naslova"
+msgstr "Slanja poruke sa praznom linijom _naslova"
 
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:112
-#, fuzzy
-#| msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Upozori kada ÅaljeÅ poruke samo sa navedenim Bcc primaocima"
+msgstr "Slanja poruke koja sadrÅi odreÄene samo _Bcc primaoce"
 
 # bug(slobo): verovatno izveÅtaj o dostavi
 #. This is in the context of: Ask for confirmation before...
 #: ../mail/mail-config.ui.h:114
-#, fuzzy
-#| msgid "Sender or Recipients"
 msgid "Sending a reply to a large _number of recipients"
-msgstr "PoÅiljalac ili primaoci"
+msgstr "Slanja odgovora _veÄem broju primalaca"
 
 #: ../mail/mail-config.ui.h:115
 msgid "Sent _Messages Folder:"
@@ -12155,7 +12006,7 @@ msgstr "Fascikla poslatih _poruka:"
 
 #: ../mail/mail-config.ui.h:116
 msgid "Ser_ver requires authentication"
-msgstr "Ser_ver traÅi autentifikaciju"
+msgstr "Ser_ver traÅi potvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:117
 msgid "Server Configuration"
@@ -12163,19 +12014,15 @@ msgstr "PodeÅavanje servera"
 
 #: ../mail/mail-config.ui.h:118
 msgid "Server _Type:"
-msgstr "_Tip servera: "
+msgstr "_Tip servera:"
 
 #: ../mail/mail-config.ui.h:119
-#, fuzzy
-#| msgid "Add Custom Junk Header"
 msgid "Set custom junk header"
-msgstr "Dodaje prilagoÄeno zaglavlje za neÅeljenu poÅtu"
+msgstr "Postavite proizvoljno zaglavlje neÅeljene"
 
 #: ../mail/mail-config.ui.h:120
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Si_gning algorithm:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Algoritam _potpisivanja:"
 
 #: ../mail/mail-config.ui.h:121
 msgid "Sig_natures"
@@ -12183,7 +12030,7 @@ msgstr "Pot_pisi"
 
 #: ../mail/mail-config.ui.h:122
 msgid "Sig_ning certificate:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Uverenje _potpisivanja:"
 
 #: ../mail/mail-config.ui.h:123
 msgid "Signat_ure:"
@@ -12194,16 +12041,12 @@ msgid "Signatures"
 msgstr "Potpisi"
 
 #: ../mail/mail-config.ui.h:125
-#, fuzzy
-#| msgid "Sig_ning certificate:"
 msgid "Signing _algorithm:"
-msgstr "Sertifikat za _potpisivanje:"
+msgstr "Algoritam p_otpisa:"
 
 #: ../mail/mail-config.ui.h:126
-#, fuzzy
-#| msgid "Local Folders"
 msgid "Special Folders"
-msgstr "Lokalne fascikle"
+msgstr "Posebne fascikle"
 
 #: ../mail/mail-config.ui.h:127
 msgid "Spell Checking"
@@ -12211,13 +12054,15 @@ msgstr "Provera pravopisa"
 
 #: ../mail/mail-config.ui.h:128
 msgid "Start _typing at the bottom on replying"
-msgstr "U odgovoru zapoÄni _kucanje na dnu"
+msgstr "U odgovoru zapoÄni _kucanje pri dnu"
 
 #: ../mail/mail-config.ui.h:129
-#, fuzzy
-#| msgid "Start: "
 msgid "Start up"
-msgstr "PoÄetak:"
+msgstr "Pokretanje"
+
+#: ../mail/mail-config.ui.h:130 ../modules/addressbook/ldap-config.ui.h:20
+msgid "TLS encryption"
+msgstr "TLS Åifrovanje"
 
 #: ../mail/mail-config.ui.h:131
 msgid "T_ype:"
@@ -12237,7 +12082,7 @@ msgid ""
 "for display purposes only. "
 msgstr ""
 "Izlaz ove skripte Äe biti koriÅÄen kao\n"
-"potpis. Ime koje ste dali Äe biti koriÅÄeno\n"
+"potpis. Ime koje ste dali biÄe koriÅÄeno\n"
 "samo za prikazivanje na ekranu. "
 
 #: ../mail/mail-config.ui.h:136
@@ -12245,6 +12090,8 @@ msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
+"Da biste izbegli nepogodnosti i nelagodnost e-poÅte, pitajte za potvrdu pre "
+"izvrÅavanja sledeÄih oznaÄenih radnji:"
 
 #: ../mail/mail-config.ui.h:137
 msgid ""
@@ -12260,13 +12107,11 @@ msgstr "KorisniÄko_ime:"
 
 #: ../mail/mail-config.ui.h:140
 msgid "Use Authe_ntication"
-msgstr "Koristi aute_ntifikaciju"
+msgstr "Koristi _potvrÄivanje identiteta"
 
 #: ../mail/mail-config.ui.h:141
-#, fuzzy
-#| msgid "User_name:"
 msgid "User _Name:"
-msgstr "KorisniÄko_ime:"
+msgstr "KorisniÄko _ime:"
 
 #: ../mail/mail-config.ui.h:142
 msgid "_Add Signature"
@@ -12274,152 +12119,134 @@ msgstr "_Dodaj potpis"
 
 #: ../mail/mail-config.ui.h:143
 msgid "_Always load images from the Internet"
-msgstr "_Uvek uÄitavaj slike sa Interneta"
+msgstr "_Uvek uÄitaj slike sa Interneta"
 
 #: ../mail/mail-config.ui.h:144
 msgid "_Authentication Type"
-msgstr "Tip _autentifikacije"
+msgstr "Tip po_tvrÄivanja identiteta"
 
 #: ../mail/mail-config.ui.h:145
-msgid "_Default junk plugin:"
-msgstr "_Podrazumevani prikljuÄak za Äubre:"
-
-#: ../mail/mail-config.ui.h:146
 msgid "_Direct connection to the Internet"
 msgstr "_Direktna veza sa Internetom"
 
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:146
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "Ne potpisuj zahteve za s_astanke (Outlook kompatibilnost)"
+msgstr "Ne potpisuj zahteve za s_astanke (Autluk kompatibilnost)"
 
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:147
 msgid "_Forward style:"
 msgstr "Stil _prosleÄivanja:"
 
 # bug: requires a comment on usage
-#: ../mail/mail-config.ui.h:149
-#, fuzzy
-#| msgid "Current Folder"
+#: ../mail/mail-config.ui.h:148
 msgid "_Junk Folder:"
-msgstr "tekuÄoj fascikli"
+msgstr "Fascikla za _Äubre:"
 
-#: ../mail/mail-config.ui.h:150
-#, fuzzy
-#| msgid "_Keep Signature above the original message on replying"
+#: ../mail/mail-config.ui.h:149
 msgid "_Keep signature above the original message on replying"
 msgstr "_ZadrÅi potpis iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:150
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../mail/mail-config.ui.h:152
-#, fuzzy
-#| msgid "_Load images in messages from contacts"
+#: ../mail/mail-config.ui.h:151
 msgid "_Load images only in messages from contacts"
-msgstr "_UÄitaj slike od kontakata u poruku"
+msgstr "_UÄitaj slike samo u porukama od kontakta"
 
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:152
 msgid "_Lookup in local address book only"
 msgstr "_PotraÅi samo u lokalnom adresaru"
 
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:153
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj podrazumevani nalog"
 
-#: ../mail/mail-config.ui.h:155
+#: ../mail/mail-config.ui.h:154
 msgid "_Manual proxy configuration:"
 msgstr "_RuÄno podeÅavanje posrednika:"
 
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:156
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne uÄitavaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:157
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: ../mail/mail-config.ui.h:159 ../modules/addressbook/ldap-config.ui.h:27
+#: ../mail/mail-config.ui.h:158 ../modules/addressbook/ldap-config.ui.h:27
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:159
 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:161
+#: ../mail/mail-config.ui.h:160
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:161
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: ../mail/mail-config.ui.h:163
+#: ../mail/mail-config.ui.h:162
 msgid "_Secure HTTP Proxy:"
 msgstr "_Bezbedan HTTP posrednik:"
 
-#: ../mail/mail-config.ui.h:165 ../modules/addressbook/ldap-config.ui.h:29
+#: ../mail/mail-config.ui.h:164 ../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:167
-#, fuzzy
-#| msgid "Show animated images as animations."
+#: ../mail/mail-config.ui.h:166
 msgid "_Show animated images"
-msgstr "Prikazuje animirane slike kao animacije."
+msgstr "PrikaÅi _animirane slike"
 
-#: ../mail/mail-config.ui.h:168
+#: ../mail/mail-config.ui.h:167
 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:169
-#, fuzzy
-#| msgid "Drafts _Folder:"
+#: ../mail/mail-config.ui.h:168
 msgid "_Trash Folder:"
-msgstr "_Fascikla Nacrti:"
+msgstr "Fascikla za _smeÄe:"
 
-#: ../mail/mail-config.ui.h:170
-msgid "_Use Secure Connection:"
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:31
+msgid "_Use secure connection:"
 msgstr "_Koristi sigurnu vezu:"
 
-#: ../mail/mail-config.ui.h:171
+#: ../mail/mail-config.ui.h:170
 msgid "_Use system defaults"
 msgstr "_Koristi sistemske postavke"
 
-#: ../mail/mail-config.ui.h:172
+#: ../mail/mail-config.ui.h:171
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:172 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:174 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:173 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:175
+#: ../mail/mail-config.ui.h:174
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.ui.h:176
+#: ../mail/mail-config.ui.h:175
 msgid "description"
 msgstr "opis"
 
-#: ../mail/mail-config.ui.h:177
-msgid "gtk-ok"
-msgstr ""
-
 #: ../mail/mail-dialogs.ui.h:1
 msgid "All active remote folders"
 msgstr "Sve aktivne mreÅne fascikle"
 
 #: ../mail/mail-dialogs.ui.h:2
 msgid "All local and active remote folders"
-msgstr "Sve lokale i aktivne mreÅne fascikle"
+msgstr "Sve lokalne i aktivne mreÅne fascikle"
 
 #: ../mail/mail-dialogs.ui.h:3
 msgid "All local folders"
@@ -12430,87 +12257,88 @@ msgid "Call"
 msgstr "Poziv"
 
 # timezone.
-#: ../mail/mail-dialogs.ui.h:5
+#. Translators: Flag Completed
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "Za_vrÅeno"
 
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Digital Signature"
 msgstr "Digitalni potpis"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Do Not Forward"
 msgstr "Ne prosleÄuj"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Encryption"
-msgstr "Åifriranje"
+msgstr "Åifrovanje"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
-msgstr "Za VaÅu informaciju"
+msgstr "Za vaÅu informaciju"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "License Agreement"
 msgstr "Ugovor o licenci"
 
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "Review"
 msgstr "ProÄitati"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
 msgid "Security Information"
-msgstr "Sigurnosni podaci"
+msgstr "Podaci bezbednosti"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
 msgid "Specific folders"
 msgstr "OdreÄene fascikle"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
 "Poruke koje ste izabrali za praÄenje su dole izlistane.\n"
-"Izaberite radnju za izvrÅavanje iz menija âOznakaâ."
+"Izaberite radnju za izvrÅavanje iz menija âOznakeâ."
 
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:25
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:26
 msgid "_Due By:"
 msgstr "_Rok:"
 
-#: ../mail/mail-dialogs.ui.h:26
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Flag:"
 msgstr "_Oznaka:"
 
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_naÄite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-folder-cache.c:767
+#: ../mail/mail-folder-cache.c:769
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
@@ -12523,78 +12351,77 @@ msgstr "Filtriranje izabranih poruka"
 msgid "Fetching Mail"
 msgstr "Uzimanje poÅte"
 
-#: ../mail/mail-ops.c:820
+#: ../mail/mail-ops.c:821
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "Slanje poruke %d od %d"
+msgstr "Åaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../mail/mail-ops.c:868
+#: ../mail/mail-ops.c:869
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "Neuspelo slanje %d od %d poruka"
+msgstr "Nisam uspeo da poÅaljem %d od %d poruka"
 
-#: ../mail/mail-ops.c:872 ../mail/mail-send-recv.c:824
+#: ../mail/mail-ops.c:873 ../mail/mail-send-recv.c:824
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../mail/mail-ops.c:874 ../mail/mail-send-recv.c:826
+#: ../mail/mail-ops.c:875 ../mail/mail-send-recv.c:826
 msgid "Complete."
 msgstr "ZavrÅeno."
 
-#: ../mail/mail-ops.c:984
+#: ../mail/mail-ops.c:985
 #, c-format
 msgid "Moving messages to '%s'"
-msgstr "PremeÅtanje poruka u â%sâ"
+msgstr "PremeÅtam poruke u â%sâ"
 
-#: ../mail/mail-ops.c:985
+#: ../mail/mail-ops.c:986
 #, c-format
 msgid "Copying messages to '%s'"
-msgstr "UmnoÅavanje poruka u â%sâ"
+msgstr "UmnoÅavam poruke u â%sâ"
 
-#: ../mail/mail-ops.c:1102
+#: ../mail/mail-ops.c:1103
 #, c-format
 msgid "Storing folder '%s'"
-msgstr "SmeÅtanje fascikle â%sâ"
+msgstr "SmeÅtam fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1176
+#: ../mail/mail-ops.c:1177
 #, c-format
 msgid "Expunging and storing account '%s'"
-msgstr "PraÅnjenje i smeÅtanje naloga â%sâ"
+msgstr "Praznim i smeÅtam nalog â%sâ"
 
-#: ../mail/mail-ops.c:1177
+#: ../mail/mail-ops.c:1178
 #, c-format
 msgid "Storing account '%s'"
-msgstr "SmeÅtanje naloga â%sâ"
+msgstr "SmeÅtam nalog â%sâ"
 
-#: ../mail/mail-ops.c:1239
+#: ../mail/mail-ops.c:1240
 #, c-format
 msgid "Refreshing folder '%s'"
-msgstr "OsveÅavanje fascikle â%sâ"
+msgstr "OsveÅavam fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1417
+#: ../mail/mail-ops.c:1418
 #, c-format
 msgid "Expunging folder '%s'"
-msgstr "PraÅnjenje fascikle â%sâ"
+msgstr "Praznim fasciklu â%sâ"
 
-#: ../mail/mail-ops.c:1490
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "Izbacivanje smeÄa u â%sâ"
+msgstr "Izbacujem smeÄe u â%sâ"
 
-#: ../mail/mail-ops.c:1491
+#: ../mail/mail-ops.c:1492
 msgid "Local Folders"
 msgstr "Lokalne fascikle"
 
-#: ../mail/mail-ops.c:1589
-#, fuzzy, c-format
-#| msgid "Disconnecting from '%s'"
+#: ../mail/mail-ops.c:1590
+#, c-format
 msgid "Disconnecting %s"
-msgstr "Prekidanje veze sa â%sâ"
+msgstr "Prekidam vezu sa â%sâ"
 
 #: ../mail/mail-send-recv.c:197
 msgid "Canceling..."
-msgstr "Otkazivanje..."
+msgstr "Otkazujem..."
 
 #: ../mail/mail-send-recv.c:443
 msgid "Send & Receive Mail"
@@ -12606,33 +12433,31 @@ msgstr "OtkaÅi _sve"
 
 #: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:963
 msgid "Updating..."
-msgstr "AÅuriranje..."
+msgstr "AÅuriram..."
 
 #: ../mail/mail-send-recv.c:585 ../mail/mail-send-recv.c:680
 msgid "Waiting..."
-msgstr "Äekanje..."
+msgstr "Äekam..."
 
 #: ../mail/mail-send-recv.c:943
 #, c-format
 msgid "Checking for new mail"
-msgstr "Provera za nove poruke"
+msgstr "Provera za novim porukama"
 
 #: ../mail/mail-tools.c:72
-#, fuzzy, c-format
-#| msgid "Could not create spool directory `%s': %s"
+#, c-format
 msgid "Could not create spool directory '%s': %s"
-msgstr "Nije moguÄe pravljenje direktorijuma za pripremu â%sâ: %s"
+msgstr "Ne mogu da napravim direktorijum za pripremu â%sâ: %s"
 
 #: ../mail/mail-tools.c:106
-#, fuzzy, c-format
-#| msgid "Trying to movemail a non-mbox source `%s'"
+#, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
-msgstr "PokuÅava premeÅtanje poÅte iz ne-mbox izvora â%sâ"
+msgstr "PokuÅavam da premestim poÅtu iz ne-mboks izvora â%sâ"
 
 #: ../mail/mail-tools.c:215
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "ProsleÄena poruka - %s"
+msgstr "ProsleÄena poruka â %s"
 
 #: ../mail/mail-tools.c:217
 msgid "Forwarded message"
@@ -12643,18 +12468,17 @@ msgstr "ProsleÄena poruka"
 msgid "Setting up Search Folder: %s"
 msgstr "PodeÅavanje fascikle pretrage: %s"
 
-#: ../mail/mail-vfolder.c:238
-#, fuzzy, c-format
-#| msgid "Updating Search Folders for '%s:%s'"
+#: ../mail/mail-vfolder.c:232
+#, c-format
 msgid "Updating Search Folders for '%s' : %s"
-msgstr "AÅuriranje fascikla pretrage za â%s: %sâ"
+msgstr "AÅuriranje fascikla pretrage za â%s : %sâ"
 
 #. Translators: The first %s is name of the affected
 #. * search folder(s), the second %s is the 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:681
+#: ../mail/mail-vfolder.c:675
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12665,44 +12489,46 @@ msgid_plural ""
 "%s have been modified to account for the deleted folder\n"
 "\"%s\"."
 msgstr[0] ""
+"Fascikla pretrage â%sâ je izmenjena u nalogu za obrisanu fasciklu\n"
+"â%sâ."
 msgstr[1] ""
+"Fascikle pretrage â%sâ su izmenjene u nalogu za obrisanu fasciklu\n"
+"â%sâ."
 msgstr[2] ""
+"Fascikle pretrage â%sâ su izmenjene u nalogu za obrisanu fasciklu\n"
+"â%sâ."
 msgstr[3] ""
+"Fascikla pretrage â%sâ je izmenjena u nalogu za obrisanu fasciklu\n"
+"â%sâ."
 
-#: ../mail/mail-vfolder.c:1294
+#: ../mail/mail-vfolder.c:1308
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder.c:1408
+#: ../mail/mail-vfolder.c:1413
 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"
+msgstr "Provera Äubreta nije uspela"
 
 #: ../mail/mail.error.xml.h:2
-#, fuzzy
-#| msgid "Report Junk Failed"
 msgid "\"Report Junk\" Failed"
-msgstr "IzveÅtavanje za Äubre nije uspelo"
+msgstr "IzveÅtaj za Äubre nije uspeo"
 
 #: ../mail/mail.error.xml.h:3
-#, fuzzy
-#| msgid "Report Not Junk Failed"
 msgid "\"Report Not Junk\" Failed"
-msgstr "IzveÅtavanje da nije Äubre neuspelo"
+msgstr "IzveÅtavanje da nije Äubre nije uspelo"
 
 #: ../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."
+msgstr "Fascikla sa imenom â{0}â veÄ postoji. Dodelite joj neki drugi naziv."
 
 # bug: use the same message as above
 #: ../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."
+msgstr "Fascikla sa imenom â{1}â veÄ postoji. Dodelite joj neki drugi naziv."
 
 #: ../mail/mail.error.xml.h:6
 msgid ""
@@ -12713,21 +12539,21 @@ msgid ""
 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, da je prepiÅete ili da dopunite njen "
+"sadrÅaj, ili da izaÄete."
 
 #: ../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}?"
+msgstr "Povratnica je zatraÅena za â{1}â. Da poÅaljem povratnicu za {0}?"
 
 # mail:vfolder-notunique secondary
 #: ../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."
+msgstr "Potpis sa nazivom â{0}â veÄ postoji. Navedite neko drugo ime."
 
 #: ../mail/mail.error.xml.h:11
 msgid ""
@@ -12761,7 +12587,8 @@ msgstr ""
 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}â?"
+msgstr ""
+"Sigurno Åelite trajno da uklonite sve obrisane poruke iz fascikle â{0}â?"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message in HTML format?"
@@ -12792,93 +12619,91 @@ msgstr "Prazan potpis"
 
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot add Search Folder \"{0}\"."
-msgstr "Nije moguÄe dodavati fasciklu pretrage â{0}â."
+msgstr "Ne mogu da dodam fasciklu pretrage â{0}â."
 
 # mail:no-copy-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nije moguÄe umnoÅiti fasciklu â{0}â u â{1}â."
+msgstr "Ne mogu da umnoÅim fasciklu â{0}â u â{1}â."
 
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create folder \"{0}\"."
-msgstr "Nije moguÄe napraviti fasciklu â{0}â."
+msgstr "Ne mogu da napravim fasciklu â{0}â."
 
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot create temporary save directory."
-msgstr "Nije moguÄe pravljenje privremenog direktorijuma za Äuvanje."
+msgstr "Ne mogu da napravim privremeni direktorijum za Äuvanje."
 
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Nije moguÄe napraviti direktorijum za Äuvanje, zbog â{1}â"
+msgstr "Ne mogu da napravim direktorijum za Äuvanje, zbog â{1}â"
 
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot delete folder \"{0}\"."
-msgstr "Nije moguÄe obrisati fasciklu â{0}â."
+msgstr "Ne mogu da obriÅem fasciklu â{0}â."
 
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nije moguÄe obrisati sistemsku fasciklu â{0}â."
+msgstr "Ne mogu da obriÅem sistemsku fasciklu â{0}â."
 
 #: ../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."
+msgstr "Ne mogu da uredim fasciklu pretrage â{0}â jer ne postoji."
 
 # mail:no-move-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nije moguÄe premestiti fasciklu â{0}â u â{1}â."
+msgstr "Ne mogu da premestim fasciklu â{0}â u â{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}â"
+msgstr "Ne mogu da otvorim izvor â{1}â"
 
 # mail:no-copy-folder-nostore secondary
 #: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{2}\"."
-msgstr "Nije moguÄe otvoriti izvor â{2}â."
+msgstr "Ne mogu da otvorim izvor â{2}â."
 
 # mail:no-copy-folder-to-nostore secondary
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot open target \"{2}\"."
-msgstr "Nije moguÄe otvoriti cilj â{2}â."
+msgstr "Ne mogu da otvorim cilj â{2}â."
 
 #: ../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."
+"Ne mogu da proÄitam datoteku licence â{0}â, zbog problema sa instalacijom. "
+"NeÄete moÄi da koristite ovog dostavljaÄa dok ne prihvatite licencu."
 
 # mail:no-rename-folder primary
 #: ../mail/mail.error.xml.h:36
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Nije moguÄe preimenovati â{0}â u â{1}â."
+msgstr "Ne mogu da preimenujem â{0}â u â{1}â."
 
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nije moguÄe preimenovati ili premestiti sistemsku fascikluâ{0}â."
+msgstr "Ne mogu da preimenujem ili da premestim sistemsku fascikluâ{0}â."
 
 # mail:account-notunique primary
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save changes to account."
-msgstr "Nije moguÄe Äuvanje izmena na nalogu."
+msgstr "Ne mogu da saÄuvam izmene na nalogu."
 
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot save to directory \"{0}\"."
-msgstr "Nije moguÄe Äuvanje u direktorijum â{0}â."
+msgstr "Ne mogu da saÄuvam u direktorijumu â{0}â."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
 #: ../mail/mail.error.xml.h:40
 msgid "Cannot save to file \"{0}\"."
-msgstr "Nije moguÄe Äuvanje u datoteku â{0}â."
+msgstr "Ne mogu da saÄuvam u datoteku â{0}â."
 
 #: ../mail/mail.error.xml.h:41
 msgid "Cannot set signature script \"{0}\"."
-msgstr "Nije moguÄe postaviti skriptu za potpis â{0}â."
+msgstr "Ne mogu da postavim skriptu za potpis â{0}â."
 
 #: ../mail/mail.error.xml.h:42
 msgid ""
@@ -12889,30 +12714,22 @@ msgstr ""
 "lozinki veliÄina slova bitna; moÅda su ukljuÄena velika slova."
 
 #: ../mail/mail.error.xml.h:43
-#, fuzzy
-#| msgid "Close this window"
 msgid "Close message window."
-msgstr "Zatvori ovaj prozor"
+msgstr "Zatvori prozor poruke."
 
 #: ../mail/mail.error.xml.h:44
 msgid "Could not save signature file."
-msgstr "Nije moguÄe Äuvanje datoteke potpisa."
+msgstr "Ne mogu da saÄuvam datoteku potpisa."
 
 #: ../mail/mail.error.xml.h:46
-#, fuzzy
-#| msgid "Do not disable"
 msgid "Do _Not Disable"
-msgstr "Nemoj iskljuÄiti"
+msgstr "Nemoj _iskljuÄiti"
 
 #: ../mail/mail.error.xml.h:47
-#, fuzzy
-#| msgid "Do _not Send"
 msgid "Do _Not Send"
 msgstr "Ne Åalj_i"
 
 #: ../mail/mail.error.xml.h:48
-#, fuzzy
-#| msgid "_Do not Synchronize"
 msgid "Do _Not Synchronize"
 msgstr "_Ne usklaÄuj"
 
@@ -12926,11 +12743,11 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:50
 msgid "Do you want to mark all messages as read?"
-msgstr "Da li Åelite da sve poruke oznaÄite kao proÄitane?"
+msgstr "Da li Åelite da sve poruke oznaÄite proÄitanim?"
 
 #: ../mail/mail.error.xml.h:51
 msgid "Do you wish to save your changes?"
-msgstr "Åelite li da saÄuvate promene?"
+msgstr "Da li Åelite da saÄuvate izmene?"
 
 #: ../mail/mail.error.xml.h:52
 msgid "Enter password."
@@ -12942,7 +12759,7 @@ msgstr "GreÅka pri uÄitavanju definicija filtera."
 
 #: ../mail/mail.error.xml.h:54
 msgid "Error while performing operation."
-msgstr "GreÅka tokom operacije."
+msgstr "GreÅka tokom izvrÅavanja operacije."
 
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
@@ -12961,109 +12778,104 @@ msgid ""
 "delete the account after ensuring the data is safely migrated. Please make "
 "sure there is enough disk space if you choose to migrate now."
 msgstr ""
+"Evolucijin lokalni format poÅte je promenjen iz mboksa u  Mejldir. VaÅa "
+"lokalna poÅta mora biti preseljena u novi format da bi Evolucija mogla da "
+"nastavi sa radom. Da li Åelite sada da je preselite?\n"
+"\n"
+"Mboks nalog Äe biti napravljen zarad Äuvanja starih mboks fascikli. MoÅete da "
+"izbriÅete nalog nakon uspeÅnog preseljavanja podataka. Uverite se da ima "
+"dovoljno prostora na disku ukoliko odluÄite da ih preselite sada."
 
 #: ../mail/mail.error.xml.h:62
 msgid "Evolution's local mail format has changed."
-msgstr ""
+msgstr "Evolucijin lokalni format poÅte je promenjen."
 
 #: ../mail/mail.error.xml.h:63
-#, fuzzy
-#| msgid "_Download Messages for Offline Usage"
 msgid "Failed to download messages for offline viewing."
-msgstr "_Preuzima poruke za rad van mreÅe"
+msgstr "Nisam uspeo da preuzmem poruke za pregledanje van mreÅe."
 
 # bug: plural-forms
 #: ../mail/mail.error.xml.h:64
-#, fuzzy
-#| msgid "Failed to send %d of %d messages"
 msgid "Failed to find duplicate messages."
-msgstr "Neuspelo slanje %d od %d poruka"
+msgstr "Nisam uspeo da pronaÄem duplirane poruke."
 
 #: ../mail/mail.error.xml.h:65
-#, fuzzy
-#| msgid "failed to open book"
 msgid "Failed to open folder."
-msgstr "neuspelo otvaranje knjige"
+msgstr "Nisam uspeo da otvorim fasciklu."
 
 #: ../mail/mail.error.xml.h:66
 #, fuzzy
-#| msgid "View image attachments directly in mail messages."
-msgid "Failed to remove attachments from messages."
-msgstr "Pregled priloga sa slikama neposredno u porukama."
+#| msgid "Querying server for a list of supported authentication mechanisms."
+msgid ""
+"Failed to query server for a list of supported authentication mechanisms."
+msgstr ""
+"Slanje upita serveru za listu podrÅanih mehanizama potvrÄivanja identiteta."
 
 #: ../mail/mail.error.xml.h:67
-#, fuzzy
-#| msgid "Unable to retrieve message"
+msgid "Failed to remove attachments from messages."
+msgstr "Nisam uspeo da uklonim priloge iz poruka."
+
+#: ../mail/mail.error.xml.h:68
 msgid "Failed to retrieve messages."
-msgstr "Nije moguÄe dobiti poruku"
+msgstr "Nisam uspeo da dovuÄem poruke"
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:68
-#, fuzzy
-#| msgid "Failed to send %d of %d messages"
+#: ../mail/mail.error.xml.h:69
 msgid "Failed to save messages to disk."
-msgstr "Neuspelo slanje %d od %d poruka"
+msgstr "Nisam uspeo da saÄuvam poruke na disk."
 
-#: ../mail/mail.error.xml.h:69
-#, fuzzy
-#| msgid "Unsubscribing from folder \"%s\""
+#: ../mail/mail.error.xml.h:70
 msgid "Failed to unsubscribe from folder."
-msgstr "Odjava sa fascikle â%sâ"
+msgstr "Nisam uspeo da se odjavim sa fascikle."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji, nije moguÄe prepisivanje."
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:72
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:73
-#, fuzzy
-#| msgid "The attachment does not contain a valid calendar message"
+#: ../mail/mail.error.xml.h:74
 msgid "Folder '{0}' doesn't contain any duplicate message."
-msgstr "Prilog ne sadrÅi ispravnu poruku za kalendar"
+msgstr "Fascikla â{0}â ne sadrÅi nikakve duple poruke."
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:75
 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:75
-#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
+#: ../mail/mail.error.xml.h:76
 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."
+"Ukoliko obriÅete fasciklu, sav njen sadrÅaj i sadrÅaj podfascikli biÄe trajno "
+"obrisani."
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:77
 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."
+msgstr "Ukoliko obriÅete fasciklu, sav njen sadrÅaj biÄe trajno obrisan."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "Ako nastavite, svi posredniÄki nalozi biÄe trajno uklonjeni."
+msgstr "Ako nastavite, svi nalozi posrednika biÄe trajno uklonjeni."
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr ""
-"Ukoliko nastavite, podaci naloga i svi pripadajuÄi\n"
-"podaci Äe biti trajno obrisani."
+"Ukoliko nastavite, podaci o nalogu i svi\n"
+"podaci posrednika biÄe trajno obrisani."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Ukoliko nastavite, podaci naloga biÄe trajno obrisani."
+msgstr "Ukoliko nastavite, podaci o nalogu biÄe trajno obrisani."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -13071,89 +12883,81 @@ msgstr ""
 "Ukoliko izaÄete, ove poruke neÄe biti poslate dok ponovo ne pokrenete "
 "Evoluciju."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:83
 msgid "Ignore"
 msgstr "Zanemari"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 msgid "Invalid authentication"
-msgstr "Neispravna autentifikacija"
+msgstr "Neispravno potvrÄivanje identiteta"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
 msgid "Mail Deletion Failed"
 msgstr "NeuspeÅno brisanje poÅte"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
 msgid "Mail filters automatically updated."
 msgstr "Filteri poÅte su automatski aÅurirani."
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
 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."
+"Mnogi sistemi e-poÅte dodaju porukama zaglavlje âPrividno-kaâ koje imaju samo "
+"BCC primaoce. Ovo Äe zaglavlje, ako je dodato, u svakom sluÄaju izlistati sve "
+"primaoce poruke. Da izbegnete ovo, dodajte barem jednog âPrima:â ili âCC:â "
+"primaoca."
 
-#: ../mail/mail.error.xml.h:87
-#, fuzzy
-#| msgid ""
-#| "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?"
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"Upozorenje: brisanje poruka iz fascikle pretrage Äe obrisati samu poruku sa "
-"njene lokacije u fascikli.\n"
-"Åelite li ovo da uradite?"
+"Poruke prikazane u fasciklama za pretragu nisu umnoÅci. Njihovim brisanjem iz "
+"fascikle za pretragu izbrisaÄete stvarne poruke iz fascikle ili fascikli u "
+"kojima se fiziÄki nalaze. Da li zaista Åelite da izbriÅete ove poruke?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
 msgid "Missing folder."
-msgstr "Nedostaje fascikla."
+msgstr "NedostajuÄa fascikla."
 
-#: ../mail/mail.error.xml.h:90
-#, fuzzy
-#| msgid "Never"
+#: ../mail/mail.error.xml.h:91
 msgid "N_ever"
-msgstr "Nikada"
+msgstr "_Nikada"
 
-#: ../mail/mail.error.xml.h:91
-#, fuzzy
-#| msgid "Could not create message."
+#: ../mail/mail.error.xml.h:92
 msgid "No duplicate messages found."
-msgstr "Nije moguÄe pravljenje poruke."
+msgstr "Nisu pronaÄene duple poruke."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
 msgid "No sources selected."
 msgstr "Izvori nisu izabrani."
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
 msgid "Opening too many messages at once may take a long time."
-msgstr "Otvaranje previÅe poruka odjednom moÅe suviÅe da potraje."
+msgstr "Otvaranje previÅe poruka odjednom moÅe da potraje malo duÅe."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
 msgid "Please check your account settings and try again."
 msgstr "Proverite podeÅavanja naloga i pokuÅajte ponovo."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 msgid "Please enable the account or send using another account."
-msgstr "OmoguÄite nalog ili poÅaljite koriÅÄenjem drugog naloga."
+msgstr "OmoguÄite nalog ili poÅaljite koristeÄi drugi nalog."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
 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."
+"Unesite vaÅeÄu adresu e-poÅte u polje âPrima:â. MoÅete pretraÅiti adrese e-"
+"poÅte klikom na dugme âPrima:â pored polja za unos."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -13162,78 +12966,75 @@ msgstr ""
 "Proverite da li sledeÄi primaoci Åele i mogu da prime HTML poÅtu:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "Please provide an unique name to identify this signature."
 msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
 msgid "Please wait."
 msgstr "SaÄekajte."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem pri prenosu stare fascikle poÅte â{0}â."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "Slanje upita serveru za listu podrÅanih mehanizama autentifikacije."
+msgstr ""
+"Slanje upita serveru za listu podrÅanih mehanizama potvrÄivanja identiteta."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid "Read receipt requested."
-msgstr "ZatraÅene povratnice."
+msgstr "ProÄitajte zatraÅene povratnice."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:105
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Zaista obrisati fasciklu â{0}â i sve podfascikle?"
+msgstr "Da obriÅem fasciklu â{0}â i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
 msgid "Really delete folder \"{0}\"?"
-msgstr "Zaista obrisati fasciklu â{0}â?"
+msgstr "Da obriÅem fasciklu â{0}â?"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid "Remove duplicate messages?"
-msgstr ""
+msgstr "Da uklonim duplirane poruke?"
 
-#: ../mail/mail.error.xml.h:107
-#, fuzzy
-#| msgid "_Private"
+#: ../mail/mail.error.xml.h:108
 msgid "Reply _Privately"
-msgstr "L_iÄno"
+msgstr "Odgovori _privatno"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski aÅurirane."
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "Send private reply?"
-msgstr ""
+msgstr "Da poÅaljem privatan odgovor?"
 
 # bug(slobo): verovatno izveÅtaj o dostavi
-#: ../mail/mail.error.xml.h:112
-#, fuzzy
-#| msgid "Sender or Recipients"
+#: ../mail/mail.error.xml.h:113
 msgid "Send reply to all recipients?"
-msgstr "PoÅiljalac ili primaoci"
+msgstr "Da poÅaljem odgovore svim primaocima?"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 msgid "Signature Already Exists"
 msgstr "Potpis veÄ postoji"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
 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:115
+#: ../mail/mail.error.xml.h:116
 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."
+"Sistemske fascikle su neophodne Evoluciji da bi ispravno radila i ne mogu "
+"biti preimenovane, premeÅtene ili obrisane."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -13244,35 +13045,35 @@ msgid ""
 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 "
+"Mnogi sistemi e-poÅte dodaju porukama zaglavlje âPrividno-kaâ koje ima samo "
 "BCC primaoce. Ovo Äe zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
-"Da bi izbegli ovo, dodajte barem jednog Prima: ili CC: primaoca."
+"Da izbegnete ovo, dodajte barem jednog âPrima:â ili âCC:â primaoca."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
 msgstr ""
-"Nije prepoznata ispravna adresa sledeÄeg primaoca:\n"
+"SledeÄi primalac nije prepoznat kao ispravna adresa e-poÅte:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
 msgstr ""
-"Nisu prepoznate ispravne adrese sledeÄih primalaca:\n"
+"SledeÄi primaoci nisu prepoznati kao ispravne adrese e-poÅte:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:125
 msgid "The script file must exist and be executable."
 msgstr "Datoteka skripte mora postojati i biti izvrÅna."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:126
 msgid "These messages are not copies."
-msgstr ""
+msgstr "Ove poruke nisu umnoÅci."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -13280,18 +13081,18 @@ 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:128
+#: ../mail/mail.error.xml.h:129
 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:129
+#: ../mail/mail.error.xml.h:130
 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:130
+#: ../mail/mail.error.xml.h:131
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
@@ -13299,198 +13100,177 @@ msgstr ""
 "Ovaj server ne podrÅava traÅeni tip autentifikacije i moÅda uopÅte ne "
 "podrÅava autentifikaciju."
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:132
 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:132
+#: ../mail/mail.error.xml.h:133
 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:133
-#, fuzzy
-#| msgid ""
-#| "This will mark all messages as read in the selected folder and its "
-#| "subfolders."
+#: ../mail/mail.error.xml.h:134
 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."
+msgstr "Ovo oznaÄava sve poruke kao proÄitane u izabranoj fascikli."
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:135
 msgid "Unable to connect to the GroupWise server."
-msgstr "Neuspelo povezivanje na GroupWise server."
+msgstr "Nisam uspeo da se poveÅem na GroupVajz server."
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:136
 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?"
+"Ne mogu da otvorim fasciklu nacrta za ovaj nalog. Da koristim sistemsku "
+"fasciklu nacrta umesto toga?"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:137
 msgid "Unable to read license file."
-msgstr "Nije moguÄe Äitanje datoteke licence."
+msgstr "Ne mogu da proÄitam datoteku licence."
 
-#: ../mail/mail.error.xml.h:137
-#, fuzzy
-#| msgid "Unable to retrieve message"
+#: ../mail/mail.error.xml.h:138
 msgid "Unable to retrieve message."
-msgstr "Nije moguÄe dobiti poruku"
+msgstr "Ne mogu da dovuÄem poruku."
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:139
 msgid "Use _Default"
 msgstr "Koristi _podrazumevano"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:140
 msgid "Use default drafts folder?"
-msgstr "Koristiti podrazumevanu fasciklu nacrta?"
+msgstr "Da koristim podrazumevanu fasciklu nacrta?"
 
-#: ../mail/mail.error.xml.h:140
-#, fuzzy
-#| msgid "Would you like to accept it?"
+#: ../mail/mail.error.xml.h:141
 msgid "Would you like to close the message window?"
-msgstr "Prihvatate?"
+msgstr "Da li Åelite da zatvorite prozor sa porukom?"
 
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:142
 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 ""
+"Odgovorili ste privatno na poruku koja je stigla sa dopisne liste, ali lista "
+"pokuÅava da preusmeri vaÅ odgovor nazad na listu. Da li ste sigurni da "
+"Åelite da nastavite?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:143
 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 ""
+"Odgovorili ste na poruku koja je stigla sa dopisne liste, ali ste privatno "
+"odgovorili poÅiljaocu; a ne na listu. Da li ste sigurni da Åelite da "
+"nastavite?"
 
-#: ../mail/mail.error.xml.h:143
-#, fuzzy
-#| msgid ""
-#| "Retracting a message may remove it from the recipient's mailbox. Are you "
-#| "sure you want to do this?"
+#: ../mail/mail.error.xml.h:144
 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? "
+"Odgovarate na poruku koja je poslata veÄem broju primalaca. Da li ste "
+"sigurni da Åelite SVIMA da odgovorite?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:145
 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:145
+#: ../mail/mail.error.xml.h:146
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:147
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Imate neposlate poruke, Åelite li ipak da izaÄete?"
+msgstr "Imate neposlate poruke, da li Åelite ipak da izaÄete?"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:148
 msgid "You may not create two accounts with the same name."
-msgstr "Ne moÅete otvoriti dva naloga istog imena."
+msgstr "Ne moÅete da napravite dva naloga sa istim imenom."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:149
 msgid "You must name this Search Folder."
-msgstr "Morate imenovati ovu fasciklu pretrage."
+msgstr "Morate da date ime ovoj fascikli pretrage."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:150
 msgid "You must specify a folder."
-msgstr "Morate navesti fasciklu."
+msgstr "Morate da navedete fasciklu."
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:151
 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."
 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."
+"Morate da navedete bar jednu fasciklu kao izvor.\n"
+"Bilo da pojedinaÄno izaberete fascikle, i/ili da izaberete sve lokalne "
+"fascikle, sve mreÅne fascikle ili i jedne i druge."
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:153
 msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Prijava na server â{0}â kao â{0}â nije uspela."
 
-#: ../mail/mail.error.xml.h:153
-#, fuzzy
-#| msgid "Always"
+#: ../mail/mail.error.xml.h:154
 msgid "_Always"
-msgstr "Uvek"
+msgstr "_Uvek"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:155
 msgid "_Append"
-msgstr "_Dodaj"
+msgstr "_PrikaÄi"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:156
 #: ../plugins/publish-calendar/publish-calendar.c:600
 msgid "_Disable"
 msgstr "_OnemoguÄi"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:157
 msgid "_Discard changes"
-msgstr "_Zanemari promene"
+msgstr "_Odbaci izmene"
 
-#: ../mail/mail.error.xml.h:157
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../mail/mail.error.xml.h:158
+#: ../modules/mail/e-mail-shell-view-actions.c:1127
 msgid "_Empty Trash"
 msgstr "Isprazni _SmeÄe"
 
-#: ../mail/mail.error.xml.h:158
-#, fuzzy
-#| msgid "Evolution"
+#: ../mail/mail.error.xml.h:159
 msgid "_Exit Evolution"
-msgstr "Evolucija"
+msgstr "_IzaÄi iz Evolucije"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:160
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:160
-#, fuzzy
-#| msgid "Migration"
+#: ../mail/mail.error.xml.h:161
 msgid "_Migrate Now"
-msgstr "Prelazak"
+msgstr "P_reseli sada"
 
-#: ../mail/mail.error.xml.h:161
-#, fuzzy
-#| msgid "No"
+#: ../mail/mail.error.xml.h:162
 msgid "_No"
-msgstr "Ne"
+msgstr "_Ne"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:163
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
 # bug(slobo): verovatno izveÅtaj o dostavi
-#: ../mail/mail.error.xml.h:165
-#, fuzzy
-#| msgid "Send Receipt"
+#: ../mail/mail.error.xml.h:166
 msgid "_Send Receipt"
-msgstr "PoÅalji povratnicu"
+msgstr "PoÅalji _povratnicu"
 
-#: ../mail/mail.error.xml.h:166
-#, fuzzy
-#| msgid "Synchronize"
+#: ../mail/mail.error.xml.h:167
 msgid "_Synchronize"
-msgstr "Uskladi"
+msgstr "_Uskladi"
 
-#: ../mail/mail.error.xml.h:167
-#, fuzzy
-#| msgid "Yes"
+#: ../mail/mail.error.xml.h:168
 msgid "_Yes"
-msgstr "Da"
+msgstr "_Da"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:169
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
 #: ../mail/message-list.c:1211
 msgid "Unseen"
@@ -13532,54 +13312,59 @@ msgstr "ViÅe"
 msgid "Highest"
 msgstr "NajviÅe"
 
-#: ../mail/message-list.c:1838 ../widgets/table/e-cell-date.c:48
+#: ../mail/message-list.c:1832 ../widgets/table/e-cell-date.c:48
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1845 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1839 ../plugins/itip-formatter/itip-view.c:205
 msgid "Today %l:%M %p"
-msgstr "Danas %l:%M %p"
+msgstr "Danas u %l:%M %p"
 
-#: ../mail/message-list.c:1854
+#: ../mail/message-list.c:1848
 msgid "Yesterday %l:%M %p"
-msgstr "JuÄe %l:%M %p"
+msgstr "JuÄe u %l:%M %p"
 
-#: ../mail/message-list.c:1866
+#: ../mail/message-list.c:1860
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1874
+#: ../mail/message-list.c:1868
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1876
+#: ../mail/message-list.c:1870
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2644
+#: ../mail/message-list.c:2638
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:2802 ../mail/message-list.etspec.h:10
+#: ../mail/message-list.c:2796 ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Poruke"
 
+#. default follow-up flag name to use when clicked in the message list column
+#: ../mail/message-list.c:3991
+msgid "Follow-up"
+msgstr "Sledi"
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4475 ../mail/message-list.c:4894
+#: ../mail/message-list.c:4495 ../mail/message-list.c:4914
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4712
+#: ../mail/message-list.c:4732
 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."
+"Nema poruke sa zadatim uslovima pretrage. MoÅete oÄistiti pretragu iz menija "
+"âPretraga->OÄistiâ ili je izmeniti."
 
-#: ../mail/message-list.c:4714
+#: ../mail/message-list.c:4734
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -13597,7 +13382,7 @@ msgstr "OznaÄeno"
 
 #: ../mail/message-list.etspec.h:6
 msgid "Follow Up Flag"
-msgstr "Oznaka za sleÄenje"
+msgstr "Oznaka za praÄenje"
 
 #: ../mail/message-list.etspec.h:11
 msgid "Received"
@@ -13614,30 +13399,30 @@ msgstr "VeliÄina"
 
 #: ../mail/message-list.etspec.h:19
 msgid "Subject - Trimmed"
-msgstr "Naslov - skraÄeno"
+msgstr "Naslov â skraÄeno"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1567
 msgid "Body contains"
 msgstr "Telo sadrÅi"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1571
+#: ../modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Message contains"
 msgstr "Poruka sadrÅi"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1581
 msgid "Recipients contain"
 msgstr "Primaoci sadrÅe"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
+#: ../modules/mail/e-mail-shell-view-actions.c:1588
 msgid "Sender contains"
 msgstr "PoÅiljalac sadrÅi"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Subject contains"
 msgstr "Naslov sadrÅi"
 
@@ -13668,20 +13453,18 @@ msgid ""
 "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 "
+"To znaÄi da vaÅa veza neÄe biti sigurna i da Äete biti ranjivi na sigurnosne "
 "napade. "
 
-#: ../modules/addressbook/addressbook-config.c:610
-#, fuzzy
-#| msgid "Use in _Birthday & Anniversaries calendar"
+#: ../modules/addressbook/addressbook-config.c:625
 msgid "U_se in Birthday & Anniversaries calendar"
 msgstr "Koristi u kalendaru _RoÄendani i godiÅnjice"
 
-#: ../modules/addressbook/addressbook-config.c:646
+#: ../modules/addressbook/addressbook-config.c:666
 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:753
+#: ../modules/addressbook/addressbook-config.c:778
 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 "
@@ -13691,16 +13474,17 @@ msgstr ""
 "je spisak standardnih portova. Pitajte administratora sistema koji port da "
 "navedete."
 
-#: ../modules/addressbook/addressbook-config.c:827
+#: ../modules/addressbook/addressbook-config.c:857
 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."
+"Evolucija Äe koristiti ovaj metod za potvrÄivanje identiteta.  Znajte da Äe "
+"ovo ako postavite na âElektronska adresaâ zahtevati anonimni pristup na LDAP "
+"server."
 
-#: ../modules/addressbook/addressbook-config.c:902
+#: ../modules/addressbook/addressbook-config.c:937
 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 "
@@ -13709,32 +13493,32 @@ msgid ""
 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 "
+"pretragu. Obim pretrage âjedanâ Äe ukljuÄiti samo unose jedan nivo ispod vaÅe "
 "baze."
 
-#: ../modules/addressbook/addressbook-config.c:1018
+#: ../modules/addressbook/addressbook-config.c:1058
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/addressbook/addressbook-config.c:1023
+#: ../modules/addressbook/addressbook-config.c:1063
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "Details"
 msgstr "Detalji"
 
-#: ../modules/addressbook/addressbook-config.c:1024
+#: ../modules/addressbook/addressbook-config.c:1064
 #: ../modules/mail/e-mail-shell-view.c:58
 msgid "Searching"
 msgstr "PretraÅivanje"
 
-#: ../modules/addressbook/addressbook-config.c:1026
+#: ../modules/addressbook/addressbook-config.c:1066
 msgid "Downloading"
 msgstr "Preuzimanje"
 
-#: ../modules/addressbook/addressbook-config.c:1232
+#: ../modules/addressbook/addressbook-config.c:1275
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
-#: ../modules/addressbook/addressbook-config.c:1234
+#: ../modules/addressbook/addressbook-config.c:1277
 msgid "New Address Book"
 msgstr "Novi adresar"
 
@@ -13744,31 +13528,31 @@ msgstr "DuÅina samodopunjavanja"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
 msgid "Contact layout style"
-msgstr "Stil razmeÅtaja kontakata"
+msgstr "Stil razmeÅtaja kontakta"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
 msgid "Contact preview pane position (horizontal)"
-msgstr "Pozicija povrÅi za pregled kontakata (horizontalno)"
+msgstr "Pozicija povrÅi za pregled kontakta (poloÅeno)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
 msgid "Contact preview pane position (vertical)"
-msgstr "Pozicija pregleda kontakata (vertikalno)"
+msgstr "Pozicija pregleda kontakta (uspravno)"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
 msgid "EFolderList XML for the list of completion URIs"
-msgstr "EFolderList XML za listu adresa za dopunjavanje"
+msgstr "HML lista e-fascikle liste adresa za dopunjavanje"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
 msgid "EFolderList XML for the list of completion URIs."
-msgstr "EFolderList XML za listu adresa za dopunjavanje."
+msgstr "HML lista e-fascikle za listu adresa za dopunjavanje."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
 msgid "Position of the contact preview pane when oriented horizontally."
-msgstr "Pozicija povrÅi za pregled kontakata kada je okrenuta horizontalno."
+msgstr "PoloÅaj povrÅi za pregled kontakta kada je okrenuta poloÅeno."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
 msgid "Position of the contact preview pane when oriented vertically."
-msgstr "Pozicija povrÅi za pregled kontakata kada je okrenuta vertikalno."
+msgstr "Pozicija povrÅi za pregled kontakata kada je okrenuta uspravno."
 
 # note(slobo): message thread, niz --> bolji prevod je rasprava
 # note(slobo): ponegde sam za summary koristio --> âu kratkim crtamaâ
@@ -13779,20 +13563,16 @@ msgstr "Pozicija povrÅi za pregled kontakata kada je okrenuta vertikalno."
 # note(slobo): address book, adresar --> imenik na par mesta proba
 # note(slobo): spam , Äubre --> NeÅeljena poÅta
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
-#, fuzzy
-#| msgid "evolution address book"
 msgid "Primary address book"
-msgstr "Adresar Evolucije"
+msgstr "Primarni adresar"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
 msgid "Show autocompleted name with an address"
 msgstr "Prikazuje samodopunjeno ime sa adresom"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
-#, fuzzy
-#| msgid "Show Animations"
 msgid "Show maps"
-msgstr "PrikaÅi animacije"
+msgstr "PrikaÅi mape"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
 msgid "Show preview pane"
@@ -13803,6 +13583,8 @@ msgid ""
 "The UID of the selected (or \"primary\") address book in the sidebar of the "
 "\"Contacts\" view."
 msgstr ""
+"JIB izabranog (ili âprimarnogâ) adresara u boÄnoj povrÅi u pregledu "
+"âKontaktiâ."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
 msgid ""
@@ -13811,21 +13593,21 @@ msgid ""
 "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."
+"Stil razmeÅtaja utvrÄuje poloÅaj pregleda u odnosu na listu kontakta. 0 â "
+"(klasiÄan pregled) postavlja pregled ispod liste kontakta. 1 â (uspravan "
+"pregled) postavlja pregled pored liste kontakta."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
 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 "
+"Broj znakova koji se moraju ukucati nakon kojih Äe Evolucija pokuÅati da "
 "samodopuni."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
 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"
+msgstr "Adresa poslednje koriÅÄene fascikle u prozorÄetu za izbor imena"
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:17
 msgid "URI for the folder last used in the select names dialog."
@@ -13836,86 +13618,85 @@ 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."
+"Da li Äe u unosu da prisili prikazivanje adrese e-poÅte sa imenom "
+"samodopunjenog kontakta."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:19
-#, fuzzy
-#| msgid "Whether to show the preview pane."
 msgid "Whether to show maps in preview pane."
-msgstr "Da li se prikazuje povrÅ za pregled."
+msgstr "Da li da prikaÅe mape u povrÅi za pregled."
 
 #: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:20
 msgid "Whether to show the preview pane."
-msgstr "Da li se prikazuje povrÅ za pregled."
+msgstr "Da li Äe biti prikazana povrÅ za pregled."
 
 #. 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:165
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../modules/addressbook/autocompletion-config.c:184
+#: ../modules/mail/em-mailer-prefs.c:1029
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
-#: ../modules/addressbook/autocompletion-config.c:168
+#: ../modules/addressbook/autocompletion-config.c:187
 msgid "Autocompletion"
 msgstr "Samodopunjavanje"
 
-#: ../modules/addressbook/autocompletion-config.c:171
+#: ../modules/addressbook/autocompletion-config.c:190
 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:98
+#: ../modules/addressbook/e-book-shell-backend.c:102
 #: ../modules/addressbook/e-book-shell-migrate.c:154
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: ../modules/addressbook/e-book-shell-backend.c:284
+#: ../modules/addressbook/e-book-shell-backend.c:302
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-backend.c:304
 #: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact"
-msgstr "Napravi novi kontakt"
+msgstr "Napravite novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:291
+#: ../modules/addressbook/e-book-shell-backend.c:309
 msgctxt "New"
 msgid "Contact _List"
-msgstr "Kontakt li_sta"
+msgstr "Li_sta kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:293
+#: ../modules/addressbook/e-book-shell-backend.c:311
 #: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "Create a new contact list"
-msgstr "Napravi novu kontakt listu"
+msgstr "Napravite novu listu kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:301
+#: ../modules/addressbook/e-book-shell-backend.c:319
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-backend.c:321
 #: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Create a new address book"
-msgstr "Napravi novi adresar"
+msgstr "Napravite novi adresar"
 
 #. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:320
+#: ../modules/addressbook/e-book-shell-backend.c:338
 #: ../modules/addressbook/e-book-shell-view.c:405
-#: ../modules/calendar/e-cal-shell-backend.c:111
+#: ../modules/calendar/e-cal-shell-backend.c:115
 #: ../modules/calendar/e-cal-shell-migrate.c:63
+#: ../modules/online-accounts/e-online-accounts-google.c:366
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../modules/addressbook/e-book-shell-backend.c:330
+#: ../modules/addressbook/e-book-shell-backend.c:348
 msgid "Certificates"
-msgstr "Sertifikati"
+msgstr "Uverenja"
 
 #. Translators: This is a save dialog title
 #: ../modules/addressbook/e-book-shell-view-actions.c:387
 #: ../modules/addressbook/e-book-shell-view-actions.c:683
 msgid "Save as vCard"
-msgstr "SaÄuvaj kao vKartu"
+msgstr "SaÄuvajte kao vKartu"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "Co_py All Contacts To..."
@@ -13923,7 +13704,7 @@ msgstr "UmnoÅi _sve kontakte u..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Copy the contacts of the selected address book to another"
-msgstr "UmnoÅi kontakte izabranog adresara u drugi"
+msgstr "UmnoÅite kontakte izabranog adresara u drugi"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "D_elete Address Book"
@@ -13931,7 +13712,7 @@ msgstr "O_briÅi adresar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Delete the selected address book"
-msgstr "ObriÅi izabrani adresar"
+msgstr "ObriÅite izabrani adresar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "Mo_ve All Contacts To..."
@@ -13939,7 +13720,7 @@ msgstr "Premesti _sve kontakte u..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Move the contacts of the selected address book to another"
-msgstr "Premesti kontakte izabranog adresara u drugi"
+msgstr "Premestite kontakte izabranog adresara u drugi"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "_New Address Book"
@@ -13951,31 +13732,27 @@ msgstr "PodeÅavanja adresa_ra"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show properties of the selected address book"
-msgstr "PrikaÅi svojstva izabranog adresara"
+msgstr "PrikaÅite svojstva izabranog adresara"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:847
-#, fuzzy
-#| msgid "Address Book"
 msgid "Address Book _Map"
-msgstr "Adresar"
+msgstr "_Mapa adresara"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:849
-#, fuzzy
-#| msgid "Copy the contacts of the selected address book to another"
 msgid "Show map with all contacts from selected address book"
-msgstr "UmnoÅi kontakte izabranog adresara u drugi"
+msgstr "Prikazuje mapu sa svim kontaktima iz izabranih adresara"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:854
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
-#: ../modules/calendar/e-memo-shell-view-actions.c:627
-#: ../modules/calendar/e-task-shell-view-actions.c:751
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/mail/e-mail-shell-view-actions.c:1204
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Rename the selected address book"
-msgstr "Preimenuj izabrani adresar"
+msgstr "Preimenujte izabrani adresar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Stop loading"
@@ -13987,7 +13764,7 @@ msgstr "_UmnoÅi kontakt u..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Copy selected contacts to another address book"
-msgstr "UmnoÅi izabrane kontakte u drugi adresar"
+msgstr "UmnoÅite izabrane kontakte u drugi adresar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Delete Contact"
@@ -13999,7 +13776,7 @@ msgstr "_PronaÄi u kontaktu..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Search for text in the displayed contact"
-msgstr "PretraÅi tekst prikazanom kontaktu"
+msgstr "PretraÅite tekst u prikazanom kontaktu"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Forward Contact..."
@@ -14007,7 +13784,7 @@ msgstr "_Prosledi kontakt..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Send selected contacts to another person"
-msgstr "PoÅalji izabrane kontakte drugoj osobi"
+msgstr "PoÅaljite izabrane kontakte drugoj osobi"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_Move Contact To..."
@@ -14015,7 +13792,7 @@ msgstr "_Premesti kontakt u..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Move selected contacts to another address book"
-msgstr "Premesti izabrane kontakte u drugi adresar"
+msgstr "Premestite izabrane kontakte u drugi adresar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "_New Contact..."
@@ -14023,7 +13800,7 @@ msgstr "Novi kon_takt..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "New Contact _List..."
-msgstr "Novi kontakt _spisak..."
+msgstr "Nova _lista kontakta..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Open Contact"
@@ -14031,7 +13808,7 @@ msgstr "_Otvori kontakt"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "View the current contact"
-msgstr "Pregledaj tekuÄi kontakt"
+msgstr "Pregledajte tekuÄi kontakt"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:924
 msgid "_Send Message to Contact..."
@@ -14039,25 +13816,25 @@ msgstr "_PoÅalji poruku kontaktu..."
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:926
 msgid "Send a message to the selected contacts"
-msgstr "PoÅalji poruku izabranim kontaktima"
+msgstr "PoÅaljite poruku izabranim kontaktima"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:933
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Actions"
 msgstr "_Radnje"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:940
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
-#: ../modules/calendar/e-task-shell-view-actions.c:816
-#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:830
+#: ../modules/mail/e-mail-shell-view-actions.c:1362
 msgid "_Preview"
 msgstr "_Pregled"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:949
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
-#: ../modules/calendar/e-memo-shell-view-actions.c:677
-#: ../modules/calendar/e-task-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-memo-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-view-actions.c:843
 msgid "_Delete"
 msgstr "_ObriÅi"
 
@@ -14066,10 +13843,8 @@ msgid "_Properties"
 msgstr "O_sobine"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
-#, fuzzy
-#| msgid "Address Book"
 msgid "Address Book Map"
-msgstr "Adresar"
+msgstr "Mapa adresara"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Contact _Preview"
@@ -14077,62 +13852,58 @@ msgstr "Pre_gled kontakta"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Show contact preview window"
-msgstr "PrikaÅi prozor za pregled kontakta"
+msgstr "PrikaÅite prozor za pregled kontakta"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:997
-#, fuzzy
-#| msgid "Show as list"
 msgid "Show _Maps"
-msgstr "PrikaÅi kao spisak"
+msgstr "PrikaÅi _mape"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:999
-#, fuzzy
-#| msgid "Show contact preview window"
 msgid "Show maps in contact preview window"
-msgstr "PrikaÅi prozor za pregled kontakta"
+msgstr "PrikaÅite mape u prozoru za pregled kontakata"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1018
-#: ../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:1474
+#: ../modules/calendar/e-memo-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
 msgid "_Classic View"
 msgstr "_KlasiÄni prikaz"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview below the contact list"
-msgstr "PrikaÅi pregled kontakta ispod kontakt liste"
+msgstr "PrikaÅite pregled kontakta ispod kontakt liste"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1025
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:905
-#: ../modules/mail/e-mail-shell-view-actions.c:1481
+#: ../modules/calendar/e-memo-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1027
 msgid "Show contact preview alongside the contact list"
-msgstr "PrikaÅi pregled kontakta pored kontakt liste"
+msgstr "PrikaÅite pregled kontakta pored kontakt liste"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1035
-#: ../modules/calendar/e-cal-shell-view-actions.c:1663
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:936
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1042
-#: ../modules/calendar/e-cal-shell-view-actions.c:1677
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-memo-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1052
-#: ../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
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
-#: ../shell/e-shell-content.c:638
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/mail/e-mail-shell-view-actions.c:1560
+#: ../shell/e-shell-content.c:666
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
@@ -14150,11 +13921,11 @@ msgstr "Åtampa izabrane kontakte"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1114
 msgid "S_ave Address Book as vCard"
-msgstr "_SaÄuvaj adresar kao VKartu"
+msgstr "_SaÄuvaj adresar kao vKartu"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1116
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "SaÄuvaj kontakte izabranog adresara kao VKartu"
+msgstr "SaÄuvajte kontakte izabranog adresara kao vKartu"
 
 #. Translators: This is an action label
 #: ../modules/addressbook/e-book-shell-view-actions.c:1122
@@ -14204,7 +13975,7 @@ msgstr "Kontakt"
 #: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
-msgstr "Kontakt podaci za %s"
+msgstr "Podaci o kontaktu za %s"
 
 #. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../modules/addressbook/ldap-config.ui.h:2
@@ -14236,15 +14007,15 @@ msgstr "Jedan"
 
 #: ../modules/addressbook/ldap-config.ui.h:13
 msgid "Search Filter"
-msgstr "Propusnik pretrage"
+msgstr "Filter pretrage"
 
 #: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search _base:"
-msgstr "Osnova za _pretragu:"
+msgstr "Osnova _pretrage:"
 
 #: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _filter:"
-msgstr "P_ropusnik pretrage:"
+msgstr "_Filter pretrage:"
 
 #: ../modules/addressbook/ldap-config.ui.h:16
 msgid ""
@@ -14289,16 +14060,49 @@ msgstr "Obim p_retrage:"
 
 #: ../modules/addressbook/ldap-config.ui.h:30
 msgid "_Timeout:"
-msgstr "_Rok:"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Use secure connection:"
-msgstr "_Koristi sigurnu vezu:"
+msgstr "_Vremenski rok:"
 
 #: ../modules/addressbook/ldap-config.ui.h:32
 msgid "cards"
 msgstr "karte"
 
+#: ../modules/bogofilter/evolution-bogofilter.c:146
+#, c-format
+msgid "Failed to spawn Bogofilter (%s): "
+msgstr "Nisam uspeo da izrodim Bogofilter (%s): "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:164
+msgid "Failed to stream mail message content to Bogofilter: "
+msgstr "Nisam uspeo da uputim sadrÅaj poruke poÅte Bogofilteru: "
+
+#: ../modules/bogofilter/evolution-bogofilter.c:213
+msgid "Bogofilter either crashed or failed to process a mail message"
+msgstr "Ili se Bogofilter uruÅio ili nije uspeo da analizira poruku poÅte"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:312
+msgid "Bogofilter Options"
+msgstr "Opcije Bogofiltera"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:321
+msgid "Convert message text to _Unicode"
+msgstr "Prebaci tekst poruke u _Unikod"
+
+#: ../modules/bogofilter/evolution-bogofilter.c:477
+msgid "Bogofilter"
+msgstr "Bogofilter"
+
+#: ../modules/bogofilter/evolution-bogofilter.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "Prebacuje poruke poÅte u Unikod"
+
+#: ../modules/bogofilter/evolution-bogofilter.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."
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -14333,6 +14137,10 @@ msgstr "30 minuta"
 msgid "60 minutes"
 msgstr "60 minuta"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
+msgid "Alarms"
+msgstr "Alarmi"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:10
 msgid "Alerts"
 msgstr "Upozorenja"
@@ -14354,7 +14162,9 @@ msgid "Display"
 msgstr "Prikaz"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:16
-msgid "Display alarms in _notification area only"
+#, fuzzy
+#| msgid "Display alarms in _notification area only"
+msgid "Display reminders in _notification area only"
 msgstr "Prikazuje alarme samo u _obaveÅtajnoj zoni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:20
@@ -14367,301 +14177,300 @@ msgid "Minutes"
 msgstr "Minuti"
 
 #. Sunday
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#: ../modules/calendar/e-calendar-preferences.ui.h:26
 msgid "S_un"
 msgstr "N_ed"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:27
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Sc_roll Month View by a week"
 msgstr "Pri_kazuje MeseÄni pregled po nedeljama"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../modules/calendar/e-calendar-preferences.ui.h:29
 msgid "Se_cond zone:"
 msgstr "Dru_ga zona:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:29
-msgid "Select the calendars for alarm notification"
+#: ../modules/calendar/e-calendar-preferences.ui.h:30
+#, fuzzy
+#| msgid "Select the calendars for alarm notification"
+msgid "Select the calendars for reminder notification"
 msgstr "Izaberi kalendare za zvuÄno obaveÅtenje"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../modules/calendar/e-calendar-preferences.ui.h:32
 msgid "Sh_ow a reminder"
 msgstr "Pri_kaÅi podsetnik"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:33
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Show a _reminder"
 msgstr "PrikaÅi _podsetnik"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../modules/calendar/e-calendar-preferences.ui.h:35
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
+"PrikaÅi dogaÄaje koji se _ponavljaju iskoÅenim slovima u donjem levom kalendaru"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:35
+#: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "Show week _numbers"
 msgstr "PrikaÅi _brojeve nedelja"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../modules/calendar/e-calendar-preferences.ui.h:38
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
 #. Thursday
-#: ../modules/calendar/e-calendar-preferences.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "T_hu"
 msgstr "U_to"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:41
+#: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "Template:"
 msgstr "Model:"
 
 # note(slobo): moÅda treba rok
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../modules/calendar/e-calendar-preferences.ui.h:44
 #: ../widgets/misc/e-dateedit.c:592
 msgid "Time"
 msgstr "Vreme"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "Use s_ystem time zone"
 msgstr "Koristi vremensku zonu _sistema"
 
 #. A weekday like "Monday" follows
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Wee_k starts on:"
 msgstr "PoÄetak n_edelje:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
-#: ../modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
 msgid "Work Week"
 msgstr "Radna nedelja"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "_12 hour (AM/PM)"
 msgstr "_12 - Äasovni (AM/PM)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "_24 hour"
 msgstr "_24 - Äasovni"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_TraÅi potvrdu za brisanje stavki"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Compress weekends in month view"
 msgstr "_SaÅmi nedelje u meseÄni pregled"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Day begins:"
 msgstr "PoÄetak _dana:"
 
 #. Friday
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Fri"
 msgstr "_Pet"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij zavrÅene zadatke posle"
 
 #. Monday
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "_Mon"
 msgstr "_Pon"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Overdue tasks:"
 msgstr "_Neispunjeni zadaci:"
 
 #. Saturday
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "_Sat"
 msgstr "_Sub"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:66
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Show appointment end times in week and month view"
 msgstr "_PrikaÅi zakazana vremena zavrÅetka u nedeljnim i meseÄnim pregledima"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "_Time divisions:"
 msgstr "Podele _vremena:"
 
 #. Tuesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "_Tue"
 msgstr "_Uto"
 
 #. Wednesday
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "_Wed"
 msgstr "_Sre"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "pre svake godiÅnjice/roÄendana"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every appointment"
 msgstr "pre svakog zakazivanja"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:1
-msgid "Alarm programs"
-msgstr "Programi za alarm"
-
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "TraÅi potvrdu za brisanje stavki"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "Boja pozadine zaduÅenja za danas, u obliku â#rrggbbâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "Boja pozadine neispunjenih zaduÅenja, u obliku â#rrggbbâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Birthday and anniversary reminder"
-msgstr "RoÄendani i godiÅnjice"
+msgstr "Podsetnik na roÄendane i godiÅnjice"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:6
 msgid "Birthday and anniversary reminder units"
-msgstr "RoÄendani i godiÅnjice"
+msgstr "Jedinice podsetnika na roÄendane i godiÅnjice"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
-#, fuzzy
-#| msgid "Birthdays & Anniversaries"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:7
 msgid "Birthday and anniversary reminder value"
-msgstr "RoÄendani i godiÅnjice"
+msgstr "Vrednosti podsetnika na roÄendane i godiÅnjice"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
-msgid "Calendars to run alarms for"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:8
+#, fuzzy
+#| msgid "Calendars to run alarms for"
+msgid "Calendars to run reminders for"
 msgstr "Kalendari za koje se pokreÄe alarm"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:9
 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)."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:10
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:11
 msgid "Compress weekends in month view"
 msgstr "SaÅmi vikende u meseÄni pregled"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:12
 msgid "Confirm expunge"
 msgstr "Potvrdi praÅnjenje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:15
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
-msgid "Directory for saving alarm audio files"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:17
+#, fuzzy
+#| msgid "Directory for saving alarm audio files"
+msgid "Directory for saving reminder audio files"
 msgstr "Direktorijum za Äuvanje zvuÄnih datoteka alarma"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy server URLs"
 msgstr "Adrese servera za slobodno/zauzeto vreme"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:19
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "Sakrij zavrÅene zadatke"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "Sakrij vrednost zadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "Pozicija poloÅene povrÅi"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:24
 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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:25
 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."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:26
 msgid "If \"true\", show the memo preview pane in the main window."
 msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled beleÅki."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "If \"true\", show the task preview pane in the main window."
 msgstr "Ukoliko je âtaÄnoâ, u glavnom prozoru prikazuje pregled zadataka."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:28
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:30
-msgid "Last alarm time"
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:29
+#, fuzzy
+#| msgid "Last alarm time"
+msgid "Last reminder time"
 msgstr "Poslednje vreme za alarm"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:31
 msgid "List of recently used second time zones in a Day View."
 msgstr "Spisak nedavno koriÅÄenih drugih vremenskih zona u Dnevnom pregledu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:32
 msgid "List of server URLs for free/busy publishing."
 msgstr "Spisak adresa servera za objavljivanje slobodnog/zauzetog vremena."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:33
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:34
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Boja Markus Bejns linije - Dnevni pregled"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:35
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Boja Markus Bejns linije - traka vremena"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:36
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
@@ -14669,57 +14478,55 @@ msgstr ""
 "NajveÄi broj nedavno koriÅÄenih vremenskih zona za pamÄenje u spisku "
 "âday_second_zonesâ."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Maximum number of recently used timezones to remember."
 msgstr "NajveÄi broj nedavno koriÅÄenih vremenskih zona za pamÄenje."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:38
 msgid "Memo layout style"
 msgstr "Stil razmeÅtaja beleÅke"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:39
 msgid "Memo preview pane position (horizontal)"
 msgstr "Pozicija pregleda beleÅki (vertikalno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:40
 msgid "Memo preview pane position (vertical)"
 msgstr "Pozicija pregleda beleÅke (vertikalno)"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:41
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "Minut kojim se zavrÅava radni dan, od 0 do 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:42
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim poÄinje radni dan, od 0 do 59."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:43
 msgid "Month view horizontal pane position"
 msgstr "Pozicija poloÅene povrÅi MeseÄnog pregleda"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:44
 msgid "Month view vertical pane position"
 msgstr "Pozicija uspravne povrÅi MeseÄnog pregleda"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
-#, fuzzy
-#| msgid "Number of units for determining a default reminder."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:45
 msgid "Number of units for determining a birthday or anniversary reminder."
-msgstr "Broj jedinica za odreÄivanje podrazumevanog podsetnika."
+msgstr "Broj jedinica za odreÄivanje podsetnika na roÄendane ili godiÅnjice."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:46
 msgid "Number of units for determining a default reminder."
 msgstr "Broj jedinica za odreÄivanje podrazumevanog podsetnika."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:47
 msgid "Number of units for determining when to hide tasks."
 msgstr "Broj jedinica za odreÄivanje kada sakriti zadatke."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:48
 msgid "Overdue tasks color"
 msgstr "Boja prekoraÄenih zadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:49
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
@@ -14727,7 +14534,7 @@ msgstr ""
 "Pozicija poloÅene povrÅi, izmeÄu dela kalendara za datum i spiska zadataka "
 "kada nije postavljen meseÄni pregled, u pikselima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14735,19 +14542,19 @@ msgstr ""
 "Pozicija poloÅene povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
 "zadataka u meseÄnom pregledu, u pikselima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:51
 msgid "Position of the memo preview pane when oriented vertically."
 msgstr "Pozicija pregleda beÄeÅki kada je postavljeno vertikalno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:52
 msgid "Position of the task preview pane when oriented horizontally."
 msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:53
 msgid "Position of the task preview pane when oriented vertically."
 msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:54
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
@@ -14755,7 +14562,7 @@ msgstr ""
 "PoloÅaj uspravne povrÅi, izmeÄu liste kalendara i navigacije kalendara po "
 "datumu."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:55
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
@@ -14763,7 +14570,7 @@ msgstr ""
 "Pozicija uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
 "zadataka u meseÄnom pregledu, u pikselima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 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."
@@ -14771,34 +14578,42 @@ msgstr ""
 "Pozicija uspravne povrÅi, izmeÄu pregleda i dela kalendara za datum i spiska "
 "zadataka kada nije postavljen meseÄni pregled, u pikselima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:57
 msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Primary memo list"
 msgstr "Primarni spisak beleÅki"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:59
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
-msgid "Programs that are allowed to be run by alarms."
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
+#, fuzzy
+#| msgid "Programs that are allowed to be run by alarms."
+msgid "Programs that are allowed to be run by reminders."
 msgstr "Programi koji mogu biti pokrenuti alarmima."
 
-#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Recently used second time zones in a Day View"
 msgstr "Nedavno koriÅÄene druge vremenske zone u Dnevnom pregledu"
 
+#: ../modules/calendar/apps_evolution_calendar.schemas.in.h:62
+msgid "Recurrent Events in Italic"
+msgstr "DogaÄaji ponavljanja iskoÅenim slovima"
+
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:63
 #, fuzzy
-#| msgid "Recurrence date is invalid"
-msgid "Recurrent Events in Italic"
-msgstr "Datum ponavljanja nije ispravan"
+#| msgid "Reminder Notes"
+msgid "Reminder programs"
+msgstr "Podsetnici"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:64
-msgid "Save directory for alarm audio"
+#, fuzzy
+#| msgid "Save directory for alarm audio"
+msgid "Save directory for reminder audio"
 msgstr "Direktorijum za Äuvanje zvuÄnih alarma"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
@@ -14807,7 +14622,7 @@ msgstr "MeseÄni pregled po nedeljama"
 
 #: ../modules/calendar/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"
+msgstr "PrikaÅi polje Molim odgovorite u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Show Role field in the event/task/meeting editor"
@@ -14824,9 +14639,13 @@ msgstr "PrikaÅi polje kategorije u ureÄivaÄu dogaÄaja/sastanaka/zadataka"
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:70
 msgid "Show days with recurrent events in italic font in bottom left calendar."
 msgstr ""
+"Prikazuje dane sa dogaÄajima koji se ponavljaju iskoÅenim slovnim likom u "
+"donjem levom kalendaru."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:71
-msgid "Show display alarms in notification tray"
+#, fuzzy
+#| msgid "Show display alarms in notification tray"
+msgid "Show display reminders in notification tray"
 msgstr "Prikazuje alarme u obaveÅtajnoj zoni"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:72
@@ -14850,10 +14669,10 @@ msgid "Show type field in the event/task/meeting editor"
 msgstr "PrikaÅi polje tipa u ureÄivaÄu dogaÄaja/zadataka/sastanaka"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:77
-#, 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"
+msgstr ""
+"Prikazuje broj nedelje u dnevnom pregledu, u pregledu radne nedelje i "
+"pretraÅivaÄu datuma"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:78
 msgid ""
@@ -14884,18 +14703,22 @@ msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view."
 msgstr ""
+"JIB izabranog (ili âprimarnogâ) kalendara u boÄnoj povrÅi u pregledu "
+"âKalendarâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:84
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view."
 msgstr ""
+"JIB izabrane (ili âprimarneâ) beleÅke u boÄnoj povrÅi u pregledu âBeleÅkeâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view."
 msgstr ""
+"JIB izabranog (ili âprimarnogâ) zadatka u boÄnoj povrÅi u pregledu âZadaciâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 #, no-c-format
@@ -14951,7 +14774,9 @@ msgid "Time divisions"
 msgstr "Podela vremena"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:94
-msgid "Time the last alarm ran, in time_t."
+#, fuzzy
+#| msgid "Time the last alarm ran, in time_t."
+msgid "Time the last reminder ran, in time_t."
 msgstr "Vreme poslednjeg pokretanja alarma, u time_t."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
@@ -14963,12 +14788,12 @@ msgid "Twenty four hour time format"
 msgstr "24-Äasovni oblik vremena"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:97
-#, fuzzy
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgid ""
 "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
 "\"days\"."
-msgstr "Jedinice za podrazumevani podsetnik, âminutiâ, âsatiâ ili âdaniâ."
+msgstr ""
+"Jedinice za podsetnik na roÄendane ili godiÅnjice, âminutiâ, âsatiâ ili "
+"âdaniâ."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:98
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
@@ -15002,7 +14827,9 @@ msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "Dan kojim poÄinje nedelja, od nedelje (0) do subote (6)."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:105
-msgid "Whether or not to use the notification tray for display alarms."
+#, fuzzy
+#| msgid "Whether or not to use the notification tray for display alarms."
+msgid "Whether or not to use the notification tray for display reminders."
 msgstr "Da li da koristi obaveÅtajnu zonu za prikazivanje alarma."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:106
@@ -15044,14 +14871,14 @@ msgid "Whether to set a default reminder for appointments."
 msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:114
-#, fuzzy
-#| msgid "Whether to set a default reminder for appointments."
 msgid "Whether to set a reminder for birthdays and anniversaries."
-msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja."
+msgstr "Da li da postavi podsetnik na roÄendane i godiÅnjice."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:115
 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"
+msgstr ""
+"Da li da prikaÅe polje Molim odgovorite u ureÄivaÄu dogaÄaja/zadataka/"
+"sastanaka"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
@@ -15080,10 +14907,8 @@ 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"
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:122
-#, 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."
+msgstr "Da li da pokaÅe brojeve nedelja na raznim mestima u kalendaru."
 
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:123
 msgid "Work days"
@@ -15105,116 +14930,127 @@ msgstr "Äas kojim poÄinje radni dan"
 msgid "Workday start minute"
 msgstr "Minut kojim poÄinje radni dan"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:286
+#: ../modules/calendar/e-cal-attachment-handler.c:312
 #: ../smime/gui/smime-ui.ui.h:22
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:367
+#: ../modules/calendar/e-cal-attachment-handler.c:393
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:394
+#: ../modules/calendar/e-cal-attachment-handler.c:420
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:404
+#: ../modules/calendar/e-cal-attachment-handler.c:430
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:411
+#: ../modules/calendar/e-cal-attachment-handler.c:437
 msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
+#: ../modules/calendar/e-calendar-preferences.c:441
+#, fuzzy
+#| msgid "Selected Calendars for Alarms"
+msgid "Selected Calendars for Reminders"
+msgstr "Izabrani kalendari za koje zvoni sat"
+
+#: ../modules/calendar/e-calendar-preferences.c:840
+msgid "Ti_me and date:"
+msgstr "_Vreme i datum:"
+
+#: ../modules/calendar/e-calendar-preferences.c:841
+msgid "_Date only:"
+msgstr "Samo _datum:"
+
 #. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:113
+#: ../modules/calendar/e-cal-shell-backend.c:117
 #: ../modules/calendar/e-cal-shell-migrate.c:198
-#: ../modules/calendar/e-memo-shell-backend.c:100
+#: ../modules/calendar/e-memo-shell-backend.c:104
 #: ../modules/calendar/e-memo-shell-migrate.c:152
-#: ../modules/calendar/e-task-shell-backend.c:100
+#: ../modules/calendar/e-task-shell-backend.c:104
 #: ../modules/calendar/e-task-shell-migrate.c:164
 msgid "On The Web"
 msgstr "Na vebu"
 
-#: ../modules/calendar/e-cal-shell-backend.c:115
+#: ../modules/calendar/e-cal-shell-backend.c:119
 #: ../plugins/calendar-weather/calendar-weather.c:125
 msgid "Weather"
 msgstr "Vreme"
 
-#: ../modules/calendar/e-cal-shell-backend.c:202
+#: ../modules/calendar/e-cal-shell-backend.c:206
 #: ../modules/calendar/e-cal-shell-migrate.c:66
 msgid "Birthdays & Anniversaries"
 msgstr "RoÄendani i godiÅnjice"
 
-#: ../modules/calendar/e-cal-shell-backend.c:423
+#: ../modules/calendar/e-cal-shell-backend.c:439
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:425
-#: ../modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../modules/calendar/e-cal-shell-backend.c:441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:430
+#: ../modules/calendar/e-cal-shell-backend.c:446
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:432
+#: ../modules/calendar/e-cal-shell-backend.c:448
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:437
+#: ../modules/calendar/e-cal-shell-backend.c:453
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:439
+#: ../modules/calendar/e-cal-shell-backend.c:455
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:447
+#: ../modules/calendar/e-cal-shell-backend.c:463
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:449
-#: ../modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../modules/calendar/e-cal-shell-backend.c:465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:751
-#: ../plugins/itip-formatter/itip-formatter.c:2937
+#: ../modules/calendar/e-cal-shell-backend.c:788
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:184
 msgid "Loading calendars"
 msgstr "UÄitavanje kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:635
-#, fuzzy
-#| msgid "_New Calendar"
+#: ../modules/calendar/e-cal-shell-sidebar.c:755
 msgid "_New Calendar..."
-msgstr "Novi _kalendar"
+msgstr "Novi _kalendar..."
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:652
+#: ../modules/calendar/e-cal-shell-sidebar.c:772
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:1000
+#: ../modules/calendar/e-cal-shell-sidebar.c:1123
 #, c-format
 msgid "Opening calendar at %s"
-msgstr "Otvaranje kalendara na %s"
+msgstr "Otvaram kalendar na %s"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:222
-#: ../modules/calendar/e-cal-shell-view-actions.c:251
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
 msgid "Print"
 msgstr "Åtampaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:310
+#: ../modules/calendar/e-cal-shell-view-actions.c:320
 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 "
@@ -15225,488 +15061,484 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:327
+#: ../modules/calendar/e-cal-shell-view-actions.c:337
 msgid "Purge events older than"
 msgstr "Izbaci dogaÄaje starije od"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:541
+#: ../modules/calendar/e-cal-shell-view-actions.c:564
 msgid "Copying Items"
 msgstr "UmnoÅavanje stavki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:848
 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:1143
+#: ../modules/calendar/e-cal-shell-view-actions.c:1175
 msgid "event"
 msgstr "dogaÄaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1145
+#: ../modules/calendar/e-cal-shell-view-actions.c:1177
 #: ../modules/calendar/e-cal-shell-view-memopad.c:220
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:511
-#: ../modules/calendar/e-task-shell-view-actions.c:628
+#: ../modules/calendar/e-memo-shell-view-actions.c:525
+#: ../modules/calendar/e-task-shell-view-actions.c:642
 msgid "Save as iCalendar"
-msgstr "SaÄuvaj kao iCalendar"
+msgstr "SaÄuvaj kao iKalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Copy..."
 msgstr "_UmnoÅi..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "D_elete Calendar"
 msgstr "Ob_riÅi kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1343
 msgid "Delete the selected calendar"
-msgstr "ObriÅi izabrani kalendar"
+msgstr "ObriÅite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Select today"
 msgstr "Izaberi danaÅnji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Select a specific date"
-msgstr "Bira odreÄeni datum"
+msgstr "Izaberite odreÄeni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
-#: ../modules/calendar/e-task-shell-view-actions.c:800
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../modules/calendar/e-task-shell-view-actions.c:814
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Purge old appointments and meetings"
-msgstr "Izbaci stara zakazivanja i sastanke"
+msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
-#: ../modules/calendar/e-memo-shell-view-actions.c:620
-#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-task-shell-view-actions.c:758
 msgid "Re_fresh"
 msgstr "O_sveÅi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Refresh the selected calendar"
-msgstr "OsveÅi izabrani kalendar"
+msgstr "OsveÅite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Rename the selected calendar"
-msgstr "Preimenuj izabrani kalendar"
+msgstr "Preimenujte izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Show _Only This Calendar"
 msgstr "PrikaÅi _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "Cop_y to Calendar..."
 msgstr "_UmnoÅi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 msgid "_Delete Appointment"
 msgstr "_ObriÅi zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
 msgid "Delete selected appointments"
-msgstr "ObriÅi izabrana zakazivanja"
+msgstr "ObriÅite izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "Delete This _Occurrence"
 msgstr "ObriÅi ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Delete this occurrence"
-msgstr "ObriÅi ovu pojavu"
+msgstr "ObriÅite ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Delete All Occ_urrences"
 msgstr "ObriÅi sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Delete all occurrences"
-msgstr "ObriÅi sve pojave"
+msgstr "ObriÅite sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _dogaÄaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Create a new all day event"
-msgstr "Pravi novi celodnevni dogaÄaj"
+msgstr "Napravite novi celodnevni dogaÄaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1460
 #: ../modules/calendar/e-cal-shell-view-memopad.c:254
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:327
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:709
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-task-shell-view-actions.c:723
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1467
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "Create a new meeting"
-msgstr "Pravi novi sastanak"
+msgstr "Napravite novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1474
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1481
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1488
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1495
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
 msgid "View the current appointment"
-msgstr "Pregleda tekuÄe zakazivanje"
+msgstr "Pregledajte tekuÄe zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1502
 msgid "_Reply"
 msgstr "O_dgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1516
 msgid "_Schedule Meeting..."
 msgstr "_ZakaÅi sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "Converts an appointment to a meeting"
-msgstr "Pretvori zakazano u sastanak"
+msgstr "Pretvorite zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1523
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Converts a meeting to an appointment"
-msgstr "Pretvori sastanak u zakazano"
+msgstr "Pretvorite sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Quit"
 msgstr "IzaÄi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-cal-shell-view-actions.c:1650
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-cal-shell-view-actions.c:1652
 msgid "Show one day"
 msgstr "PrikaÅi jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+#: ../modules/calendar/e-cal-shell-view-actions.c:1659
 msgid "Show as list"
 msgstr "PrikaÅi kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
 msgid "Show one month"
 msgstr "PrikaÅi jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+#: ../modules/calendar/e-cal-shell-view-actions.c:1673
 msgid "Show one week"
 msgstr "PrikaÅi jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
 msgid "Show one work week"
 msgstr "PrikaÅi jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeÄu nedelju"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1733
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:995
 msgid "Description contains"
 msgstr "Opis sadrÅi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-memo-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:1002
 msgid "Summary contains"
 msgstr "SaÅetak sadrÅi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1720
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Print this calendar"
 msgstr "Åtampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred Åtampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1749
+#: ../modules/calendar/e-cal-shell-view-actions.c:1781
 #: ../modules/calendar/e-cal-shell-view-memopad.c:295
 msgid "Save as iCalendar..."
-msgstr "SaÄuvaj kao iCalendar..."
+msgstr "_SaÄuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
+#: ../modules/calendar/e-cal-shell-view-actions.c:1858
 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:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:509
+#: ../modules/calendar/e-memo-shell-view-actions.c:523
 msgid "memo"
 msgstr "beleÅka"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:261
-#: ../modules/calendar/e-memo-shell-view-actions.c:641
+#: ../modules/calendar/e-memo-shell-view-actions.c:655
 msgid "New _Memo"
 msgstr "Nova _beleÅka"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-memo-shell-backend.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-memo-shell-backend.c:300
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
 msgid "Create a new memo"
-msgstr "NapiÅi jednu novu beleÅku"
+msgstr "Napravite jednu novu beleÅku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:268
-#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-memo-shell-view-actions.c:662
 msgid "_Open Memo"
 msgstr "_Otvori beleÅku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:270
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
 msgid "View the selected memo"
-msgstr "Pogledaj izabranu beleÅku"
+msgstr "Pogledajte izabranu beleÅku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:275
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:655
-#: ../modules/calendar/e-task-shell-view-actions.c:793
+#: ../modules/calendar/e-memo-shell-view-actions.c:669
+#: ../modules/calendar/e-task-shell-view-actions.c:807
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:287
-#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
 msgid "Print the selected memo"
-msgstr "Åtampa izabranu beleÅku"
+msgstr "Åtampajte 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.
 #. 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:285
-#: ../modules/calendar/e-task-shell-view-actions.c:626
+#: ../modules/calendar/e-task-shell-view-actions.c:640
 msgid "task"
 msgstr "zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:320
-#: ../modules/calendar/e-task-shell-view-actions.c:688
+#: ../modules/calendar/e-task-shell-view-actions.c:702
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:334
-#: ../modules/calendar/e-task-shell-view-actions.c:765
+#: ../modules/calendar/e-task-shell-view-actions.c:779
 msgid "_Mark as Complete"
 msgstr "_OznaÄi kao zavrÅeno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Mark selected tasks as complete"
-msgstr "ObeleÅi izabrane zadatke kao zavrÅene"
+msgstr "ObeleÅite izabrane zadatke kao zavrÅene"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:341
 msgid "_Mark as Incomplete"
 msgstr "_OznaÄi kao nezavrÅeno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:788
 msgid "Mark selected tasks as incomplete"
-msgstr "ObeleÅava izabrane zadatke kao nezavrÅene"
+msgstr "ObeleÅite izabrane zadatke kao nezavrÅene"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:348
-#: ../modules/calendar/e-task-shell-view-actions.c:779
+#: ../modules/calendar/e-task-shell-view-actions.c:793
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../modules/calendar/e-task-shell-backend.c:286
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-task-shell-backend.c:299
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Create a new task"
-msgstr "Napravi novi zadatak"
+msgstr "Napravite novi zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:355
-#: ../modules/calendar/e-task-shell-view-actions.c:786
+#: ../modules/calendar/e-task-shell-view-actions.c:800
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:357
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "View the selected task"
-msgstr "Pregleda izabrani zadatak"
+msgstr "Pregledajte izabrani zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:374
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "Print the selected task"
 msgstr "Åtampa izabrani zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
 msgid "_Save as iCalendar..."
 msgstr "_SaÄuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-calendar-preferences.c:440
-msgid "Selected Calendars for Alarms"
-msgstr "Izabrani kalendari za koje zvoni sat"
-
-#: ../modules/calendar/e-calendar-preferences.c:839
-msgid "Ti_me and date:"
-msgstr "_Vreme i datum:"
-
-#: ../modules/calendar/e-calendar-preferences.c:840
-msgid "_Date only:"
-msgstr "Samo _datum:"
-
-#: ../modules/calendar/e-memo-shell-backend.c:285
+#: ../modules/calendar/e-memo-shell-backend.c:298
 msgctxt "New"
 msgid "Mem_o"
 msgstr "BeleÅk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:292
+#: ../modules/calendar/e-memo-shell-backend.c:305
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleÅka"
 
-#: ../modules/calendar/e-memo-shell-backend.c:294
+#: ../modules/calendar/e-memo-shell-backend.c:307
 msgid "Create a new shared memo"
-msgstr "Napravi novu deljenu beleÅku"
+msgstr "Napravite novu deljenu beleÅku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:302
+#: ../modules/calendar/e-memo-shell-backend.c:315
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-backend.c:304
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-memo-shell-backend.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
 msgid "Create a new memo list"
-msgstr "Sastavi novi spisak beleÅki"
+msgstr "Sastavite novi spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:179
 msgid "Loading memos"
-msgstr "UÄitavanje beleÅki je u toku"
+msgstr "UÄitavam beleÅke"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:577
+#: ../modules/calendar/e-memo-shell-sidebar.c:696
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleÅki"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:887
+#: ../modules/calendar/e-memo-shell-sidebar.c:1009
 #, c-format
 msgid "Opening memos at %s"
-msgstr "Otvaranje beleÅki sa %s je u toku"
+msgstr "Otvaram beleÅku sa â%sâ"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:222
-#: ../modules/calendar/e-memo-shell-view-actions.c:237
+#: ../modules/calendar/e-memo-shell-view-actions.c:231
+#: ../modules/calendar/e-memo-shell-view-actions.c:246
 msgid "Print Memos"
 msgstr "Åtampaj beleÅke"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
 msgid "_Delete Memo"
 msgstr "_ObriÅi beleÅku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "_Find in Memo..."
 msgstr "P_ronaÄi u beleÅci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
 msgid "Search for text in the displayed memo"
-msgstr "PretraÅi tekst u prikazanoj beleÅci"
+msgstr "PretraÅite tekst u prikazanoj beleÅci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
 msgid "D_elete Memo List"
 msgstr "Ob_riÅi spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "Delete the selected memo list"
-msgstr "ObriÅi izabrani spisak beleÅki"
+msgstr "ObriÅite izabrani spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
 msgid "_New Memo List"
 msgstr "_Novi spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "Refresh the selected memo list"
-msgstr "OsveÅi izabrani spisak beleÅki"
+msgstr "OsveÅite izabrani spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "Rename the selected memo list"
-msgstr "Preimenuj izabrani spisak beleÅki"
+msgstr "Preimenujte izabrani spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:634
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
 msgid "Show _Only This Memo List"
 msgstr "PrikaÅi _samo ovaj spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:713
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
 msgid "Memo _Preview"
 msgstr "_Pregled beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
 msgid "Show memo preview pane"
-msgstr "PrikaÅi pregled beleÅki"
+msgstr "PrikaÅite pregled beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:736
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Show memo preview below the memo list"
-msgstr "PrikaÅi pregled beleÅki ispod spiska beleÅki"
+msgstr "PrikaÅite pregled beleÅki ispod spiska beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
 msgid "Show memo preview alongside the memo list"
-msgstr "PrikaÅi pregled beleÅki pored spiska beleÅki"
+msgstr "PrikaÅite pregled beleÅki pored spiska beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:801
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
 msgid "Print the list of memos"
-msgstr "Åtampaj spisak beleÅki"
+msgstr "Åtampajte spisak beleÅki"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
 msgid "Preview the list of memos to be printed"
-msgstr "Pregled spiska beleÅki za Åtampu"
+msgstr "Pregledajte spisak beleÅki za Åtampu"
+
+#: ../modules/calendar/e-memo-shell-view.c:227
+msgid "Delete Memos"
+msgstr "ObriÅi beleÅke"
+
+#: ../modules/calendar/e-memo-shell-view.c:229
+msgid "Delete Memo"
+msgstr "ObriÅi beleÅku"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:424
 #, c-format
@@ -15718,63 +15550,55 @@ msgstr[2] "%d beleÅki"
 msgstr[3] "%d beleÅka"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:428
-#: ../modules/calendar/e-task-shell-view-private.c:573
+#: ../modules/calendar/e-task-shell-view-private.c:585
 #, c-format
 msgid "%d selected"
-msgstr "%d izabrano"
-
-#: ../modules/calendar/e-memo-shell-view.c:227
-msgid "Delete Memos"
-msgstr "ObriÅi beleÅke"
-
-#: ../modules/calendar/e-memo-shell-view.c:229
-msgid "Delete Memo"
-msgstr "ObriÅi beleÅku"
+msgstr "izabranih â %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:284
+#: ../modules/calendar/e-task-shell-backend.c:297
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:291
+#: ../modules/calendar/e-task-shell-backend.c:304
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:293
+#: ../modules/calendar/e-task-shell-backend.c:306
 msgid "Create a new assigned task"
-msgstr "Dodeli novi zadatak"
+msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:301
+#: ../modules/calendar/e-task-shell-backend.c:314
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:303
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-task-shell-backend.c:316
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "Create a new task list"
-msgstr "Napravi novi spisak zadataka"
+msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:179
 msgid "Loading tasks"
-msgstr "UÄitavanje zadataka"
+msgstr "UÄitavam zadatke"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:577
+#: ../modules/calendar/e-task-shell-sidebar.c:696
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
 #. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:887
+#: ../modules/calendar/e-task-shell-sidebar.c:1010
 #, c-format
 msgid "Opening tasks at %s"
-msgstr "Otvaranje zadataka u %s"
+msgstr "Otvaram zadatke u â%sâ"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:245
-#: ../modules/calendar/e-task-shell-view-actions.c:260
+#: ../modules/calendar/e-task-shell-view-actions.c:254
+#: ../modules/calendar/e-task-shell-view-actions.c:269
 msgid "Print Tasks"
 msgstr "Åtampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:584
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15784,109 +15608,117 @@ msgstr ""
 "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?"
+"Da obriÅem ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:577
+#: ../modules/calendar/e-task-shell-view-actions.c:591
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:695
+#: ../modules/calendar/e-task-shell-view-actions.c:709
 msgid "_Delete Task"
 msgstr "_ObriÅi zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:716
 msgid "_Find in Task..."
 msgstr "_PronaÄi u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-task-shell-view-actions.c:718
 msgid "Search for text in the displayed task"
 msgstr "PretraÅi tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:730
 msgid "Copy..."
 msgstr "UmnoÅi..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:723
+#: ../modules/calendar/e-task-shell-view-actions.c:737
 msgid "D_elete Task List"
 msgstr "O_briÅi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "Delete the selected task list"
-msgstr "ObriÅi izabrani spisak zadataka"
+msgstr "ObriÅite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:730
+#: ../modules/calendar/e-task-shell-view-actions.c:744
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "Refresh the selected task list"
-msgstr "OsveÅi izabrani spisak zadataka"
+msgstr "OsveÅite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:753
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "Rename the selected task list"
-msgstr "Preimenuj izabrani spisak zadataka"
+msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:758
+#: ../modules/calendar/e-task-shell-view-actions.c:772
 msgid "Show _Only This Task List"
 msgstr "PrikaÅi _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:772
+#: ../modules/calendar/e-task-shell-view-actions.c:786
 msgid "Mar_k as Incomplete"
 msgstr "O_znaÄi kao nezavrÅeno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "Delete completed tasks"
-msgstr "ObriÅi zavrÅene zadatke"
+msgstr "ObriÅite zavrÅene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:877
+#: ../modules/calendar/e-task-shell-view-actions.c:891
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:879
+#: ../modules/calendar/e-task-shell-view-actions.c:893
 msgid "Show task preview pane"
-msgstr "PrikaÅi pregled zadataka"
+msgstr "PrikaÅite pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:900
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Show task preview below the task list"
-msgstr "PrikaÅi pregled ispod spiska zadataka"
+msgstr "PrikaÅite pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:907
+#: ../modules/calendar/e-task-shell-view-actions.c:921
 msgid "Show task preview alongside the task list"
-msgstr "PrikaÅi pregled pored spiska zadataka"
+msgstr "PrikaÅite pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:929
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:929
+#: ../modules/calendar/e-task-shell-view-actions.c:943
 msgid "Completed Tasks"
 msgstr "ZavrÅeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-task-shell-view-actions.c:950
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeÄu nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:957
 msgid "Overdue Tasks"
 msgstr "PrekoraÄeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1000
+#: ../modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Print the list of tasks"
-msgstr "Åtampaj spisak zadataka"
+msgstr "Åtampajte spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1007
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
 msgid "Preview the list of tasks to be printed"
-msgstr "Pregled spiska zadataka pred Åtampu"
+msgstr "Pregledajte spisak zadataka pred Åtampu"
+
+#: ../modules/calendar/e-task-shell-view.c:362
+msgid "Delete Tasks"
+msgstr "ObriÅi zadatke"
+
+#: ../modules/calendar/e-task-shell-view.c:364
+msgid "Delete Task"
+msgstr "ObriÅi zadatak"
 
 #: ../modules/calendar/e-task-shell-view-private.c:472
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../modules/calendar/e-task-shell-view-private.c:569
+#: ../modules/calendar/e-task-shell-view-private.c:581
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -15895,31 +15727,19 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/calendar/e-task-shell-view.c:362
-msgid "Delete Tasks"
-msgstr "ObriÅi zadatke"
+#: ../modules/mail/em-account-prefs.c:219
+msgid "Evolution Account Assistant"
+msgstr "PomoÄnik naloga Evolucije"
 
-#: ../modules/calendar/e-task-shell-view.c:364
-msgid "Delete Task"
-msgstr "ObriÅi zadatak"
+#: ../modules/mail/em-account-prefs.c:268
+msgid "Account Editor"
+msgstr "UreÄivaÄ naloga"
 
 #. Translators: This is only for multiple messages.
 #: ../modules/mail/e-mail-attachment-handler.c:384
 #, c-format
 msgid "%d attached messages"
-msgstr "%d priloÅenih poruka"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for a junk hook name,
-#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:94
-msgctxt "mail-junk-hook"
-msgid "None"
-msgstr "NiÅta"
+msgstr "priloÅenih poruka â %d"
 
 #: ../modules/mail/e-mail-shell-backend.c:195
 msgctxt "New"
@@ -15928,7 +15748,7 @@ msgstr "_Poruka"
 
 #: ../modules/mail/e-mail-shell-backend.c:197
 msgid "Compose a new mail message"
-msgstr "Sastavi novu poruku"
+msgstr "Sastavite novu poruku"
 
 #: ../modules/mail/e-mail-shell-backend.c:205
 msgctxt "New"
@@ -15937,130 +15757,131 @@ msgstr "_Fascikla za poÅtu"
 
 #: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Create a new mail folder"
-msgstr "Napravi novu fasciklu za poÅtu"
+msgstr "Napravite novu fasciklu za poÅtu"
 
-#: ../modules/mail/e-mail-shell-backend.c:408
+#: ../modules/mail/e-mail-shell-backend.c:412
 msgid "Mail Accounts"
 msgstr "PoÅtanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:416
+#: ../modules/mail/e-mail-shell-backend.c:420
 msgid "Mail Preferences"
 msgstr "Postavke poÅte"
 
-#: ../modules/mail/e-mail-shell-backend.c:424
+#: ../modules/mail/e-mail-shell-backend.c:428
 msgid "Composer Preferences"
 msgstr "Postavke sastavljaÄa"
 
-#: ../modules/mail/e-mail-shell-backend.c:432
+#: ../modules/mail/e-mail-shell-backend.c:436
 msgid "Network Preferences"
 msgstr "Postavke mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
-#: ../modules/mail/e-mail-shell-view.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
+#: ../modules/mail/e-mail-shell-view.c:949
 msgid "_Disable Account"
 msgstr "_OnemoguÄi nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1119
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Disable this account"
-msgstr "OnemoguÄi ovaj nalog"
+msgstr "OnemoguÄite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1126
+#: ../modules/mail/e-mail-shell-view-actions.c:1129
 msgid "Permanently remove all the deleted messages from all folders"
-msgstr "Trajno ukloni sve obrisane poruke iz svih fascikli"
+msgstr "Trajno uklonite sve obrisane poruke iz svih fascikli"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1134
 msgid "_Download Messages for Offline Usage"
-msgstr "_Preuzima poruke za rad van mreÅe"
+msgstr "_Preuzmi poruke za rad van mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1136
 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"
+msgstr ""
+"Preuzmite poruke za naloge i fascikle koje su oznaÄene za rad van mreÅe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
 msgid "Fl_ush Outbox"
-msgstr "Is_prazni Za slanje"
+msgstr "Is_prazni âZa slanjeâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "_Copy Folder To..."
 msgstr "_UmnoÅi fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Copy the selected folder into another folder"
-msgstr "UmnoÅi izabranu fasciklu u drugu fasciklu"
+msgstr "UmnoÅite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1154
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Permanently remove this folder"
-msgstr "Trajno ukloni ovu fasciklu"
+msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1159
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1161
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "Trajno ukloni sve obrisane poruke iz ove fascikle"
+msgstr "Trajno uklonite sve obrisane poruke iz ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Mar_k All Messages as Read"
 msgstr "OznaÄi sve po_ruke kao proÄitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 msgid "Mark all messages in the folder as read"
-msgstr "OznaÄava sve poruke u fascikli kao proÄitane"
+msgstr "OznaÄite sve poruke u fascikli kao proÄitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 msgid "Move the selected folder into another folder"
-msgstr "Premesti izabranu fasciklu u drugu fasciklu"
+msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1183
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "Create a new folder for storing mail"
-msgstr "Napravi novu fasciklu za smeÅtaj poÅte"
+msgstr "Napravite novu fasciklu za smeÅtaj poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "Refresh the folder"
-msgstr "OsveÅava fasciklu"
+msgstr "OsveÅite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1206
 msgid "Change the name of this folder"
-msgstr "Promeni ime ove fascikle"
+msgstr "Promenite ime ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
 msgid "Select Message _Thread"
 msgstr "Izaberi raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1213
 msgid "Select all messages in the same thread as the selected message"
-msgstr "OznaÄi sve poruke iste rasprave kao izabranu poruku"
+msgstr "OznaÄite sve poruke iste rasprave kao izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
 msgid "Select Message S_ubthread"
-msgstr "Bira p_odniz poruke"
+msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1220
 msgid "Select all replies to the currently selected message"
-msgstr "OznaÄava sve odgovore na trenutno izabranu poruku"
+msgstr "Izaberite sve odgovore na trenutno izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "Empty _Trash"
 msgstr "Izbaci _smeÄe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1234
 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:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -16069,205 +15890,205 @@ 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:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1248
 msgid "N_one"
 msgstr "N_iÅta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
-#, fuzzy
-#| msgid "_Subscriptions..."
+#: ../modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Manage Subscriptions"
-msgstr "_Prijave..."
+msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
+#: ../modules/mail/e-mail-shell-view-actions.c:1341
 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:1266
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1269
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1268
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "Send queued items and retrieve new items"
 msgstr "Åalje pripremljene i dovlaÄi nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
-#, fuzzy
-#| msgid "Received"
+#: ../modules/mail/e-mail-shell-view-actions.c:1276
 msgid "R_eceive All"
-msgstr "Primljeno"
+msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
-#, fuzzy
-#| msgid "Permanently remove all the deleted messages from all accounts"
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "Receive new items from all accounts"
-msgstr "Trajno ukloni sve obrisane poruke sa svih naloga"
+msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
-#, fuzzy
-#| msgid "_Send"
+#: ../modules/mail/e-mail-shell-view-actions.c:1283
 msgid "_Send All"
-msgstr "_PoÅalji"
+msgstr "P_oÅalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
-#, fuzzy
-#| msgid "Send queued items and retrieve new items"
+#: ../modules/mail/e-mail-shell-view-actions.c:1285
 msgid "Send queued items in all accounts"
-msgstr "Åalje pripremljene i dovlaÄi nove stavke"
+msgstr "PoÅaljite stavke na Äekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1308
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
 #: ../widgets/misc/e-activity-proxy.c:310
 msgid "Cancel"
 msgstr "OtkaÅi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1310
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Cancel the current mail operation"
-msgstr "OtkaÅi trenutnu operaciju sa poÅtom"
+msgstr "OtkaÅite trenutnu operaciju sa poÅtom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "Collapse all message threads"
-msgstr "Skupi celokupno grananje rasprava"
+msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1322
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Expand all message threads"
-msgstr "Razgranaj sve poruke u raspravama"
+msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "_Message Filters"
-msgstr "F_ilteri za poruke"
+msgstr "F_ilteri poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "Create or edit rules for filtering new mail"
-msgstr "Napravi ili uredi pravila za filtriranje nove poÅte"
+msgstr "Napravite ili uredite pravila za filtriranje nove poÅte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1348
 msgid "F_older"
 msgstr "Fas_cikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1355
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1369
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi Fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1376
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1381
 msgid "Create or edit search folder definitions"
-msgstr "Napravi ili uredi definicije fascikle pretrage"
+msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1440
 msgid "Show Message _Preview"
 msgstr "Prika_Åi pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
 msgid "Show message preview pane"
-msgstr "PrikaÅi pregled poruke"
+msgstr "PrikaÅite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1448
 msgid "Show _Deleted Messages"
 msgstr "PrikaÅi o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
-#, fuzzy
-#| msgid "Show deleted messages (with a strike-through) in the message-list."
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "Show deleted messages with a line through them"
-msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
+msgstr "PrikaÅite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Group By Threads"
-msgstr "GrupiÅi po raspravama"
+msgstr "GrupiÅi po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1455
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1476
+#: ../modules/mail/e-mail-shell-view-actions.c:1479
 msgid "Show message preview below the message list"
-msgstr "PrikaÅi pregled poruke ispod liste poruka"
+msgstr "PrikaÅite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Show message preview alongside the message list"
-msgstr "PrikaÅi pregled poruke pored spiska poruka"
+msgstr "PrikaÅite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1491
+#: ../modules/mail/e-mail-shell-view-actions.c:1494
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1498
+#: ../modules/mail/e-mail-shell-view-actions.c:1501
 msgid "Important Messages"
 msgstr "VaÅne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1505
+#: ../modules/mail/e-mail-shell-view-actions.c:1508
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "Messages Not Junk"
 msgstr "Poruke nisu Äubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
 msgid "Read Messages"
 msgstr "ProÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "Recent Messages"
 msgstr "SkoraÅnje poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Unread Messages"
 msgstr "NeproÄitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1602
 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:1609
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1616
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Current Account"
 msgstr "tekuÄem nalogu"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1623
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Current Folder"
 msgstr "tekuÄoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view-private.c:996
+#: ../modules/mail/e-mail-shell-view.c:563
+msgid "All Account Search"
+msgstr "Pretraga svih naloga"
+
+#: ../modules/mail/e-mail-shell-view.c:736
+msgid "Account Search"
+msgstr "Pretraga naloga"
+
+#: ../modules/mail/e-mail-shell-view.c:947
+msgid "Proxy _Logout"
+msgstr "_Odjava sa mreÅnog posrednika"
+
+#: ../modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -16276,7 +16097,7 @@ msgstr[1] "%d izabrane,"
 msgstr[2] "%d izabranih,"
 msgstr[3] "%d izabrana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -16285,17 +16106,17 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1013
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1021
 #, 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"
+msgstr[0] "%d nepoÅeljna"
+msgstr[1] "%d nepoÅeljne"
+msgstr[2] "%d nepoÅeljnih"
+msgstr[3] "%d nepoÅeljna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -16304,7 +16125,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -16313,7 +16134,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -16322,7 +16143,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1050
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16331,7 +16152,7 @@ msgstr[1] "%d neproÄitane,"
 msgstr[2] "%d neproÄitanih,"
 msgstr[3] "%d neproÄitana,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -16340,145 +16161,117 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1073
-#, fuzzy
-#| msgid "Task"
+#: ../modules/mail/e-mail-shell-view-private.c:1074
 msgid "Trash"
-msgstr "Zadatak"
+msgstr "SmeÄe"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1541
-#, fuzzy
-#| msgid "Send / _Receive"
+#: ../modules/mail/e-mail-shell-view-private.c:1542
 msgid "Send / Receive"
-msgstr "Slanje / p_rimanje"
-
-#: ../modules/mail/e-mail-shell-view.c:559
-msgid "All Account Search"
-msgstr "Pretraga svih naloga"
-
-#: ../modules/mail/e-mail-shell-view.c:732
-msgid "Account Search"
-msgstr "Pretraga naloga"
-
-#: ../modules/mail/e-mail-shell-view.c:943
-msgid "Proxy _Logout"
-msgstr "_Odjava sa mreÅnog posrednika"
-
-#: ../modules/mail/em-account-prefs.c:218
-msgid "Evolution Account Assistant"
-msgstr "PomoÄnik naloga Evolucije"
-
-#: ../modules/mail/em-account-prefs.c:267
-msgid "Account Editor"
-msgstr "UreÄivaÄ naloga"
+msgstr "PoÅalji / Primi"
 
 # has "activatable" set.
-#: ../modules/mail/em-composer-prefs.c:490
+#: ../modules/mail/em-composer-prefs.c:493
 #: ../modules/plugin-manager/evolution-plugin-manager.c:359
 #: ../plugins/publish-calendar/publish-calendar.c:831
 #: ../widgets/misc/e-account-tree-view.c:224
 msgid "Enabled"
 msgstr "OmoguÄeno"
 
-#: ../modules/mail/em-composer-prefs.c:494
+#: ../modules/mail/em-composer-prefs.c:497
 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:89
+#: ../modules/mail/em-mailer-prefs.c:91
 msgid "Every time"
 msgstr "svaki put"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:90
+#: ../modules/mail/em-mailer-prefs.c:92
 msgid "Once per day"
 msgstr "jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:91
+#: ../modules/mail/em-mailer-prefs.c:93
 msgid "Once per week"
 msgstr "jednom nedeljno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:92
+#: ../modules/mail/em-mailer-prefs.c:94
 msgid "Once per month"
 msgstr "jednom meseÄno"
 
-#: ../modules/mail/em-mailer-prefs.c:288
+#: ../modules/mail/em-mailer-prefs.c:289
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:292
+#: ../modules/mail/em-mailer-prefs.c:293
 msgid "Contains Value"
 msgstr "SadrÅi vrednost"
 
-#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:698 ../modules/mail/em-mailer-prefs.c:771
-#, 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:706 ../modules/mail/em-mailer-prefs.c:780
-#, c-format
-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:744
-msgid "No junk plugin available"
-msgstr "Nema dostupnog prikljuÄka za Äubre"
-
 #. 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:1147
+#: ../modules/mail/em-mailer-prefs.c:1031
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1148
+#: ../modules/mail/em-mailer-prefs.c:1032
 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"
+msgstr "Proverava 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."
+"Svaki put kada se Evolucija pokrene, proveriÄe da li je podrazumevani "
+"program za poÅtu."
 
 #: ../modules/mailto-handler/evolution-mailto-handler.c:146
-#, 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?"
+msgstr "Da li Åelite da Evoluciju uÄinite podrazumevanim klijentom e-poÅte?"
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:1
 msgid "Click 'Work Online' to return to online mode."
-msgstr ""
+msgstr "Kliknite na âRad na mreÅiâââ da se vratite na reÅim na mreÅi."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#, fuzzy
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid "Evolution is currently offline due to a network outage."
-msgstr "Evolucija trenutno nije na mreÅi jer nije dostupna."
+msgstr "Evolucija je trenutno van mreÅe zbog ispada mreÅe."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:3
-#, fuzzy
-#| msgid "Put Evolution into offline mode"
 msgid "Evolution is currently offline."
-msgstr "Postavi Evoluciju u rad van mreÅe"
+msgstr "Evolucija je trenutno van mreÅe."
 
 #: ../modules/offline-alert/evolution-offline-alert.error.xml.h:4
-#, fuzzy
-#| msgid "Evolution is currently offline because the network is unavailable."
 msgid ""
 "Evolution will return to online mode once a network connection is "
 "established."
-msgstr "Evolucija trenutno nije na mreÅi jer nije dostupna."
+msgstr ""
+"Evolucija Äe se vratiti u reÅim na mreÅi kada mreÅna veza bude bila "
+"uspostavljena."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:374
+msgid ""
+"Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
+"from which to obtain an authentication token."
+msgstr ""
+"Ne mogu da pronaÄem odgovarajuÄi nalog na usluzi âorg.gnom.Nalozi na mreÅiâ "
+"sa koje bih dobio pristup potvrÄivanju identiteta."
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:461
+msgid "OAuth"
+msgstr "OAut"
+
+#: ../modules/online-accounts/camel-sasl-xoauth.c:463
+msgid ""
+"This option will connect to the server by way of the GNOME Online Accounts "
+"service"
+msgstr ""
+"Ova opcija Äe se povezati na server putem Gnomove usluge naloga na mreÅi"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:70
 msgid "Author(s)"
@@ -16509,78 +16302,128 @@ msgstr "_PrikljuÄci"
 msgid "Enable and disable plugins"
 msgstr "UkljuÄuje i iskljuÄuje dodatke"
 
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Probni prikljuÄak Piton"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Probni prikljuÄak za pokretaÄ EPrikljuÄka Pitona."
+
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
 msgid "Hello Python"
-msgstr "Zdravo Python"
+msgstr "Zdravo Piton"
 
 #: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
 msgid "Python Plugin Loader tests"
-msgstr "Testovi za pokretaÄ prikljuÄka Python"
+msgstr "Testovi za pokretaÄ prikljuÄka Pitona"
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr "Test prikljuÄak Python"
+#: ../modules/spamassassin/evolution-spamassassin.c:191
+#, c-format
+msgid "Failed to spawn SpamAssassin (%s): "
+msgstr "Nisam uspeo da izrodim Ubicu spama (%s): "
 
-#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr "PokretaÄ test prikljuÄka za Python EPlugin."
+#: ../modules/spamassassin/evolution-spamassassin.c:214
+msgid "Failed to stream mail message content to SpamAssassin: "
+msgstr "Nisam uspeo da poÅaljem sadrÅaj poruke poÅte do Ubice spama: "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:280
+# bug: plural-forms
+#: ../modules/spamassassin/evolution-spamassassin.c:233
+#, c-format
+msgid "Failed to write '%s' to SpamAssassin: "
+msgstr "Nisam uspeo da zapiÅem â%sâ u Ubici spama: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:261
+msgid "Failed to read output from SpamAssassin: "
+msgstr "Nisam uspeo da proÄitam izlaz iz Ubice spama: "
+
+#: ../modules/spamassassin/evolution-spamassassin.c:316
+msgid "SpamAssassin either crashed or failed to process a mail message"
+msgstr "Ili se Ubica spama uruÅio ili nije uspeo da analizira poruku poÅte"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:835
+msgid "SpamAssassin Options"
+msgstr "Opcije Ubice spama"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:850
+msgid "I_nclude remote tests"
+msgstr "U_kljuÄi mreÅne provere"
+
+#: ../modules/spamassassin/evolution-spamassassin.c:864
+msgid "This will make SpamAssassin more reliable, but slower."
+msgstr "Ovo Äe Ubicu spama uÄiniti pouzdanijim , ali sporijim."
+
+#: ../modules/spamassassin/evolution-spamassassin.c:1073
+msgid "SpamAssassin"
+msgstr "Ubica spama"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:1
+msgid "Use SpamAssassin daemon and client"
+msgstr "Koristi servis i klijenta Ubice spama"
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:2
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:3
+msgid "Use only local spam tests."
+msgstr "Koristi samo lokalne provere spama."
+
+#: ../modules/spamassassin/evolution-spamassassin.schemas.in.h:4
+msgid "Use only the local spam tests (no DNS)."
+msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:279
 #: ../widgets/misc/e-import-assistant.c:396
 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:312
+#: ../modules/startup-wizard/evolution-startup-wizard.c:311
 #: ../widgets/misc/e-import-assistant.c:552
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:323
+#: ../modules/startup-wizard/evolution-startup-wizard.c:322
 #: ../modules/startup-wizard/evolution-startup-wizard.c:420
-#, fuzzy
-#| msgid "Importing files"
 msgid "Importing Files"
-msgstr "UvoÅenje datoteka"
+msgstr "Uvozim datoteke"
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:398
 msgid "Import cancelled. Click \"Forward\" to continue."
-msgstr ""
+msgstr "UvoÅenje je otkazano. Kliknite âNapredâ da nastavite."
 
 #: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import complete. Click \"Forward\" to continue."
-msgstr ""
+msgstr "UvoÅenje je obavljeno. Kliknite âNapredâ da nastavite."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:490
+#: ../modules/startup-wizard/evolution-startup-wizard.c:496
 msgid "Evolution Setup Assistant"
 msgstr "PomoÄnik podeÅavanja Evolucije"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:496
+#: ../modules/startup-wizard/evolution-startup-wizard.c:502
 msgid "Welcome"
-msgstr "Dobro doÅli"
+msgstr "DobrodoÅli"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:501
+#: ../modules/startup-wizard/evolution-startup-wizard.c:507
 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"
+"DobrodoÅli u Evoluciju. Nekoliko narednih ekrana Äe omoguÄiti Evoluciji da "
+"se poveÅe na vaÅe naloge e-poÅte i da uveze datoteke iz drugih programa. \n"
 "\n"
 "Kliknite âNapredâ da nastavite. "
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:606
-#, fuzzy
-#| msgid "Loading..."
+#: ../modules/startup-wizard/evolution-startup-wizard.c:612
 msgid "Loading accounts..."
-msgstr "UÄitavanje..."
+msgstr "UÄitavam naloge..."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Add local address books to Evolution."
-msgstr "Dodaje lokalne adresare u Evoluciju."
+msgstr "Dodajte lokalne adresare u Evoluciju."
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
 msgid "Local Address Books"
@@ -16616,8 +16459,6 @@ msgid "Message has no attachments"
 msgstr "Poruka nema priloge"
 
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
-#, fuzzy
-#| msgid "_Add attachment..."
 msgid "_Add Attachment..."
 msgstr "_Dodaj prilog..."
 
@@ -16627,7 +16468,7 @@ msgstr "_Uredi poruku"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
-msgstr "Podsetnik na priloge"
+msgstr "Podsetnik priloga"
 
 #: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
 msgid "Reminds you when you forgot to add an attachment to a mail message."
@@ -16635,11 +16476,11 @@ msgstr "PodseÄa kada zaboravite da dodate prilog u poruku."
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid "Inline Audio"
-msgstr "Muzika u porukama"
+msgstr "UnutraÅnji audio"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Play audio attachments directly in mail messages."
-msgstr "PuÅta audio priloge neposredno u porukama."
+msgstr "PuÅta audio priloge direktno u porukama."
 
 #: ../plugins/backup-restore/backup-restore.c:186
 msgid "Select name of the Evolution backup file"
@@ -16663,9 +16504,9 @@ msgid ""
 "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."
+"Evoluciju moÅete povratiti iz rezervne kopije. MoÅete da povratite poÅtu, "
+"kalendare, zadatke, beleÅke, kontakte. TakoÄe moÅete da povratite sve liÄne "
+"postavke, filtere za poÅtu, itd."
 
 #: ../plugins/backup-restore/backup-restore.c:333
 msgid "_Restore Evolution from the backup file"
@@ -16684,31 +16525,23 @@ msgid "Restore from backup"
 msgstr "VraÄa iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup-restore.c:389
-#, fuzzy
-#| msgid "Backing up Evolution Data"
 msgid "_Back up Evolution Data..."
-msgstr "IzraÄuje rezervnu kopiju podataka Evolucije"
+msgstr "Napravi _rezervu podataka Evolucije..."
 
 #: ../plugins/backup-restore/backup-restore.c:391
-#, fuzzy
-#| msgid "Backup Evolution data and settings to an archive file"
 msgid "Back up Evolution data and settings to an archive file"
-msgstr "Pravi rezervu podataka i postavki Evolucije u arhivu"
+msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup-restore.c:396
-#, fuzzy
-#| msgid "Restoring Evolution Data"
 msgid "R_estore Evolution Data..."
-msgstr "PovraÄaj podataka Evolucije"
+msgstr "_Vrati podatke Evolucije..."
 
 #: ../plugins/backup-restore/backup-restore.c:398
 msgid "Restore Evolution data and settings from an archive file"
-msgstr "Oporavlja podatke i postavke Evolucije iz arhive"
+msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
 #: ../plugins/backup-restore/backup.c:77
-#, fuzzy
-#| msgid "Backup Evolution directory"
 msgid "Back up Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
@@ -16717,10 +16550,8 @@ msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraÄaj Evolucije"
 
 #: ../plugins/backup-restore/backup.c:81
-#, fuzzy
-#| msgid "Check Evolution Backup"
 msgid "Check Evolution Back up"
-msgstr "Proverava rezervnu kopiju Evolucije"
+msgstr "Proveri rezervu Evolucije"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:83
@@ -16729,7 +16560,7 @@ msgstr "Ponovo pokreÄe Evoluciju"
 
 #: ../plugins/backup-restore/backup.c:85
 msgid "With Graphical User Interface"
-msgstr "Sa grafiÄkom okruÅenjem"
+msgstr "Sa grafiÄkim okruÅenjem"
 
 #. FIXME Will the versioned setting always work?
 #: ../plugins/backup-restore/backup.c:295
@@ -16739,7 +16570,7 @@ msgstr "GaÅenje Evolucije"
 
 #: ../plugins/backup-restore/backup.c:304
 msgid "Backing Evolution accounts and settings"
-msgstr "IzraÄuje rezervnu kopiju naloga i postavke Evolucije"
+msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
 
 #: ../plugins/backup-restore/backup.c:314
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
@@ -16747,10 +16578,8 @@ msgstr ""
 "Izrada rezervne kopije podataka Evolucije (poÅta, kalendari, zadaci, beleÅke)"
 
 #: ../plugins/backup-restore/backup.c:327
-#, fuzzy
-#| msgid "Backup complete"
 msgid "Back up complete"
-msgstr "Izrada rezervne kopije zavrÅena"
+msgstr "Izrada rezervne kopije je zavrÅena"
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:334
@@ -16759,45 +16588,37 @@ msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
 #: ../plugins/backup-restore/backup.c:418
-#, fuzzy
-#| msgid "Backup current Evolution data"
 msgid "Back up current Evolution data"
-msgstr "IzraÄuje rezervnu kopiju trenutnih podataka Evolucije"
+msgstr "Napravite rezervu trenutnih podataka Evolucije"
 
 #: ../plugins/backup-restore/backup.c:426
-#, fuzzy
-#| msgid "Extracting files from backup"
 msgid "Extracting files from back up"
-msgstr "Otpakivanje datoteka iz rezervne kopije"
+msgstr "IzvlaÄim datoteke iz rezervne kopije"
 
 #: ../plugins/backup-restore/backup.c:485
 msgid "Loading Evolution settings"
-msgstr "UÄitava podeÅavanja Evolucije"
+msgstr "UÄitavam podeÅavanja Evolucije"
 
 #: ../plugins/backup-restore/backup.c:502
-#, fuzzy
-#| msgid "Removing temporary backup files"
 msgid "Removing temporary back up files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
 #: ../plugins/backup-restore/backup.c:514
 msgid "Ensuring local sources"
-msgstr "Osiguranje lokalnih izvora"
+msgstr "Nalazim lokalne izvore"
 
 #: ../plugins/backup-restore/backup.c:699
 #, c-format
 msgid "Backing up to the folder %s"
-msgstr "SmeÅta rezervnu kopiju u fasciklu %s"
+msgstr "SmeÅtam rezervnu kopiju u fasciklu â%sâ"
 
 #: ../plugins/backup-restore/backup.c:704
 #, c-format
 msgid "Restoring from the folder %s"
-msgstr "VrÅi povraÄaj iz fascikle %s"
+msgstr "VraÄam iz fascikle â%sâ"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
 #: ../plugins/backup-restore/backup.c:728
-#, fuzzy
-#| msgid "Evolution Backup"
 msgid "Evolution Back up"
 msgstr "Rezervna kopija Evolucije"
 
@@ -16811,7 +16632,7 @@ msgstr "IzraÄuje rezervnu kopiju podataka Evolucije"
 
 #: ../plugins/backup-restore/backup.c:767
 msgid "Please wait while Evolution is backing up your data."
-msgstr "SaÄekajte dok Evolucija pravi rezervnu kopiju podataka."
+msgstr "SaÄekajte dok Evolucija ne napravi rezervnu kopiju podataka."
 
 # shell:noshell-reason title
 #: ../plugins/backup-restore/backup.c:769
@@ -16820,7 +16641,7 @@ msgstr "PovraÄaj podataka Evolucije"
 
 #: ../plugins/backup-restore/backup.c:770
 msgid "Please wait while Evolution is restoring your data."
-msgstr "SaÄekajte dok Evolucija vraÄa podatke u prvobitno stanje."
+msgstr "SaÄekajte dok Evolucija ne vrati podatke u prvobitno stanje."
 
 #: ../plugins/backup-restore/backup.c:788
 msgid "This may take a while depending on the amount of data in your account."
@@ -16828,58 +16649,43 @@ msgstr "Ovo moÅe potrajati, u zavisnosti od koliÄine podataka na nalogu."
 
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
-#, fuzzy
-#| msgid "Backup and Restore"
 msgid "Back up and Restore"
 msgstr "Izrada rezerve i oporavak"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-#, fuzzy
-#| msgid "Backup and restore your Evolution data and settings."
 msgid "Back up and restore your Evolution data and settings."
-msgstr "Pravi rezervu i oporavlja podatke i postavke Evolucije."
+msgstr "Napravite rezervu i vratite podatke i postavke Evolucije."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 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
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to restore Evolution from the selected backup file?"
 msgid ""
 "Are you sure you want to restore Evolution from the selected back up file?"
 msgstr ""
 "Sigurno Åelite da povratite Evoluciju iz izabrane datoteke rezervne kopije?"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
-#, fuzzy
-#| msgid "Choose an action:"
 msgid "Close and Back up 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"
+msgstr "Zatvorite i vratite 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:6
-#, fuzzy
-#| msgid "Invalid Evolution backup file"
 msgid "Invalid Evolution back up file"
 msgstr "Neispravna datoteka rezervne kopije Evolucije"
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:7
-#, fuzzy
-#| msgid "Please select a valid backup file to restore."
 msgid "Please select a valid back up file to restore."
-msgstr "Izaberite ispravnu datoteku za povraÄaj"
+msgstr "Izaberite ispravnu datoteku za povraÄaj."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:8
 msgid "The selected folder is not writable."
@@ -16890,6 +16696,9 @@ msgid ""
 "To back up your data and settings, you must first close Evolution. Please "
 "make sure that you save any unsaved data before proceeding."
 msgstr ""
+"Da napravite rezervnu kopiju vaÅih podataka i podeÅavanja, prvo morate da "
+"zatvorite Evoluciju. Budite sigurni da ste saÄuvali nesaÄuvane podatke pre "
+"nego Åto nastavite."
 
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:10
 msgid ""
@@ -16898,6 +16707,10 @@ msgid ""
 "all your current Evolution data and settings and restore them from your back "
 "up."
 msgstr ""
+"Da vratite podatke i podeÅavanja, prvo morate da zatvorite Evoluciju. Budite "
+"sigurni da ste saÄuvali nesaÄuvane podatke pre nego Åto nastavite. Ovo Äe "
+"obrisati sve trenutne podatke Evolucije i podeÅavanja i vratiti one iz vaÅe "
+"rezervne kopije."
 
 #: ../plugins/bbdb/bbdb.c:675 ../plugins/bbdb/bbdb.c:684
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
@@ -16907,7 +16720,7 @@ msgstr "Automatski kontakti"
 #. Enable BBDB checkbox
 #: ../plugins/bbdb/bbdb.c:699
 msgid "Create _address book entries when sending mails"
-msgstr "Pravi unose u _adresar pri slanju poÅte"
+msgstr "Napravi unose u _adresar pri slanju poÅte"
 
 #: ../plugins/bbdb/bbdb.c:705
 msgid "Select Address book for Automatic Contacts"
@@ -16915,18 +16728,16 @@ msgstr "Izaberi adresar za Automatske kontakte"
 
 #: ../plugins/bbdb/bbdb.c:720
 msgid "Instant Messaging Contacts"
-msgstr "Brze poruke"
+msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
 #: ../plugins/bbdb/bbdb.c:735
-#, 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"
+msgstr "_UsklaÄuje slike i podatke kontakta sa listom drugara iz PidÅina"
 
 #: ../plugins/bbdb/bbdb.c:741
 msgid "Select Address book for Pidgin buddy list"
-msgstr "Bira adresar za Pidgin listu prijatelja"
+msgstr "Bira adresar za listu prijatelja PidÅina"
 
 #. Synchronize now button.
 #: ../plugins/bbdb/bbdb.c:752
@@ -16945,72 +16756,18 @@ msgid ""
 "reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
-"OslobaÄa Vas teÅkog rada u upravljanju adresarom.\n"
+"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."
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:161
-#, 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:165
-#, 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:194
-#, 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:196
-#, 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:219
-#, c-format
-msgid "Pipe to Bogofilter failed, error code: %d."
-msgstr "Cev ka Bogofilteru je pukla, oznaka greÅke: %d."
-
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:404
-msgid "Convert message text to _Unicode"
-msgstr "Prebaci tekst poruke u _Unikod"
-
-#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-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."
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Junk Filter"
-msgstr "Filter neÅeljene poÅte Bogofilter"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter Options"
-msgstr "Opcije Bogofiltera"
-
-#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filter junk messages using Bogofilter."
-msgstr "Filtrira neÅeljenu poÅtu koriÅÄenjem Bogofiltera."
-
 #: ../plugins/caldav/caldav-browse-server.c:203
 msgid "Authentication failed. Server requires correct login."
-msgstr "Autentifikacija nije uspela. Server zahteva ispravnu prijavu."
+msgstr "PotvrÄivanje identiteta nije uspelo. Server zahteva ispravnu prijavu."
 
 #: ../plugins/caldav/caldav-browse-server.c:205
 msgid "Given URL cannot be found."
-msgstr "Datu adresu nije moguÄe pronaÄi."
+msgstr "Ne mogu da pronaÄem datu adresu."
 
 #: ../plugins/caldav/caldav-browse-server.c:209
 #, c-format
@@ -17019,12 +16776,12 @@ msgid ""
 "%d - %s"
 msgstr ""
 "Server je dao neoÄekivan odgovor.\n"
-"%d - %s"
+"%d â %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:339
 #: ../plugins/caldav/caldav-browse-server.c:663
 msgid "Failed to parse server response."
-msgstr "Neuspelo Äitanje odgovora servera."
+msgstr "Nisam uspeo da raÅÄlanim odgovor servera."
 
 #: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Events"
@@ -17037,17 +16794,17 @@ msgstr "KorisniÄki kalendari"
 #: ../plugins/caldav/caldav-browse-server.c:564
 #: ../plugins/caldav/caldav-browse-server.c:732
 msgid "Failed to get server URL."
-msgstr "Neuspelo dobijanje adrese servera."
+msgstr "Nisam uspeo da dobijem adresu servera."
 
 #: ../plugins/caldav/caldav-browse-server.c:730
 #: ../plugins/caldav/caldav-browse-server.c:771
 #: ../plugins/caldav/caldav-browse-server.c:1430
 msgid "Searching for user's calendars..."
-msgstr "TraÅenje korisniÄkih kalendara..."
+msgstr "TraÅim korisniÄke kalendare..."
 
 #: ../plugins/caldav/caldav-browse-server.c:769
 msgid "Could not find any user calendar."
-msgstr "Nije moguÄe pronaÄi nijedan kalendar."
+msgstr "Ne mogu da pronaÄem nijedan kalendar."
 
 #: ../plugins/caldav/caldav-browse-server.c:901
 #, c-format
@@ -17060,25 +16817,24 @@ msgid "Previous attempt failed with code %d"
 msgstr "Prethodni pokuÅaj nije uspeo, kod %d"
 
 #: ../plugins/caldav/caldav-browse-server.c:908
-#, fuzzy, c-format
-#| msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+#, c-format
 msgid "Enter password for user %s on server %s"
-msgstr "Unesite lozinku za korisnika <b>%s</b> na serveru <b>%s</b>"
+msgstr "Unesite lozinku za korisnika %s na serveru %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:967
 #, c-format
 msgid "Cannot create soup message for URL '%s'"
-msgstr "Nije moguÄe pravljenje soup poruke za adresu â%sâ"
+msgstr "Ne mogu da napravim poruku baze za adresu â%sâ"
 
 #. fetch content
 #: ../plugins/caldav/caldav-browse-server.c:1213
 msgid "Searching folder content..."
-msgstr "TraÅenje sadrÅaja fascikle..."
+msgstr "PretraÅujem sadrÅaj fascikle..."
 
 #: ../plugins/caldav/caldav-browse-server.c:1262
-#: ../plugins/caldav/caldav-source.c:258
+#: ../plugins/caldav/caldav-source.c:257
 msgid "Server _handles meeting invitations"
-msgstr ""
+msgstr "Server _upravlja pozivima na sastanak"
 
 #: ../plugins/caldav/caldav-browse-server.c:1269
 msgid "List of available calendars:"
@@ -17089,16 +16845,14 @@ msgid "Supports"
 msgstr "PodrÅke"
 
 #: ../plugins/caldav/caldav-browse-server.c:1334
-#: ../plugins/caldav/caldav-source.c:256
-#, fuzzy
-#| msgid "New email"
-msgid "User e-_mail:"
-msgstr "Nova poruka"
+#: ../plugins/caldav/caldav-source.c:255
+msgid "User e_mail:"
+msgstr "_E-poÅta korisnika:"
 
 #: ../plugins/caldav/caldav-browse-server.c:1406
 #, c-format
 msgid "Failed to create thread: %s"
-msgstr "Nije uspelo pravljenje niza: %s"
+msgstr "Nisam uspeo da napravim nit: %s"
 
 #: ../plugins/caldav/caldav-browse-server.c:1515
 #, c-format
@@ -17107,45 +16861,46 @@ msgstr "Adresa servera â%sâ nije ispravna"
 
 #: ../plugins/caldav/caldav-browse-server.c:1521
 msgid "Browse for a CalDAV calendar"
-msgstr "Traga za CalDAV kalendarom"
+msgstr "TraÅi KolDAV kalendar"
 
-#: ../plugins/caldav/caldav-source.c:237
+#: ../plugins/caldav/caldav-source.c:236
 #: ../plugins/calendar-http/calendar-http.c:104
 msgid "_URL:"
 msgstr "_Adresa :"
 
-#: ../plugins/caldav/caldav-source.c:244
+#: ../plugins/caldav/caldav-source.c:243
+#: ../plugins/calendar-http/calendar-http.c:138
 #: ../plugins/google-account-setup/google-contacts-source.c:351
-msgid "Use _SSL"
-msgstr "Koristi Åifrovanu vezu"
+msgid "Use _secure connection"
+msgstr "_Koristi sigurnu vezu"
 
-#: ../plugins/caldav/caldav-source.c:246
+#: ../plugins/caldav/caldav-source.c:245
 #: ../plugins/google-account-setup/google-contacts-source.c:329
-#: ../plugins/google-account-setup/google-source.c:652
+#: ../plugins/google-account-setup/google-source.c:656
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:267
 msgid "User_name:"
 msgstr "KorisniÄko_ime:"
 
-#: ../plugins/caldav/caldav-source.c:261
+#: ../plugins/caldav/caldav-source.c:260
 msgid "Brows_e server for a calendar"
 msgstr "Po_traÅi kalendar na serveru"
 
-#: ../plugins/caldav/caldav-source.c:279
+#: ../plugins/caldav/caldav-source.c:278
 #: ../plugins/calendar-file/calendar-file.c:195
 #: ../plugins/calendar-http/calendar-http.c:123
 #: ../plugins/calendar-weather/calendar-weather.c:403
 #: ../plugins/google-account-setup/google-contacts-source.c:369
-#: ../plugins/google-account-setup/google-source.c:659
+#: ../plugins/google-account-setup/google-source.c:663
 msgid "Re_fresh:"
 msgstr "O_sveÅi:"
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
 msgid "Add CalDAV support to Evolution."
-msgstr "Dodaje podrÅku za CalDAV u Evoluciju."
+msgstr "Dodajte KolDAV podrÅku u Evoluciju."
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
 msgid "CalDAV Support"
-msgstr "PodrÅka za CalDAV"
+msgstr "PodrÅka za KolDAV"
 
 #: ../plugins/calendar-file/calendar-file.c:129
 msgid "_Customize options"
@@ -17165,7 +16920,7 @@ msgstr "Pri otvaranju"
 
 #: ../plugins/calendar-file/calendar-file.c:201
 msgid "On file change"
-msgstr "Kod izmene datoteke"
+msgstr "Pri izmeni datoteke"
 
 # Create the default Person calendar
 # Create the default Person task list
@@ -17176,27 +16931,23 @@ msgstr "PeriodiÄno"
 
 #: ../plugins/calendar-file/calendar-file.c:217
 msgid "Force read _only"
-msgstr "Forsira _samo za Äitanje"
+msgstr "Prisili _samo Äitanje"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Add local calendars to Evolution."
-msgstr "Dodaje lokalne kalendare u Evoluciju."
+msgstr "Dodajte lokalne kalendare u Evoluciju."
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
 msgid "Local Calendars"
 msgstr "Lokalni kalendari"
 
-#: ../plugins/calendar-http/calendar-http.c:138
-msgid "_Secure connection"
-msgstr "_Koristi sigurnu vezu"
-
 #: ../plugins/calendar-http/calendar-http.c:198
 msgid "Userna_me:"
 msgstr "KorisniÄko_ime:"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "Add web calendars to Evolution."
-msgstr "Dodaje veb kalendare u Evoluciju."
+msgstr "Dodajte veb kalendare u Evoluciju."
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
 msgid "Web Calendars"
@@ -17275,28 +17026,20 @@ msgid "Weather Calendars"
 msgstr "Kalendari vremena"
 
 #: ../plugins/dbx-import/dbx-importer.c:282
-#, fuzzy
-#| msgid "Importing Outlook data"
 msgid "Importing Outlook Express data"
-msgstr "UvoÅenje Outlook podataka"
+msgstr "Uvozim podatke Autluk Ekspresa"
 
 #: ../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"
+msgstr "Uvozi poruke Autluk Ekspresa iz DBH datoteke"
 
 #: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
-#, fuzzy
-#| msgid "Outlook PST import"
 msgid "Outlook DBX import"
-msgstr "Outlook PST uvoz"
+msgstr "Uvoz DBH Autluka"
 
 #: ../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)"
+msgstr "LiÄne fascikle Autluk Ekspresa 5/6 (.pst)"
 
 #: ../plugins/default-source/default-source.c:87
 msgid "Mark as _default address book"
@@ -17304,7 +17047,7 @@ msgstr "OznaÄava kao _podrazumevan adresar"
 
 #: ../plugins/default-source/default-source.c:100
 msgid "A_utocomplete with this address book"
-msgstr "Samo_dopuni ovim adresarom"
+msgstr "Sam _dopunjava ovim adresarom"
 
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default calendar"
@@ -17341,8 +17084,6 @@ msgstr ""
 "zaglavlja, zatim â=â i vrednosti odvojene sa â;â"
 
 #: ../plugins/email-custom-header/email-custom-header.c:316
-#, fuzzy
-#| msgid "Security:"
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sigurnost:"
@@ -17351,46 +17092,34 @@ msgstr "Sigurnost:"
 # Create the default Person task list
 # orange
 #: ../plugins/email-custom-header/email-custom-header.c:320
-#, fuzzy
-#| msgid "Personal"
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "LiÄno"
 
 #: ../plugins/email-custom-header/email-custom-header.c:321
-#, fuzzy
-#| msgid "Unclassified"
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nerazvrstano"
 
 #: ../plugins/email-custom-header/email-custom-header.c:322
-#, fuzzy
-#| msgid "Protected"
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "ZaÅtiÄeno"
 
 #: ../plugins/email-custom-header/email-custom-header.c:323
-#, fuzzy
-#| msgid "Confidential"
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #: ../plugins/email-custom-header/email-custom-header.c:324
-#, fuzzy
-#| msgid "Secret"
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Tajno"
 
 #: ../plugins/email-custom-header/email-custom-header.c:325
-#, fuzzy
-#| msgid "Top secret"
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
-msgstr "Strogo tajno"
+msgstr "Strogo poverljivo"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -17427,7 +17156,7 @@ msgstr "Vrednosti"
 #. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
 msgid "Add custom headers to outgoing mail messages."
-msgstr "Dodaje prilagoÄena zaglavlja odlaznim porukama."
+msgstr "Dodajte prilagoÄena zaglavlja odlaznim porukama."
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
 msgid "Custom Header"
@@ -17440,12 +17169,12 @@ 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"
+"Automatski pokreÄe 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:131
 msgid "Automatically launch when a new mail is edited"
-msgstr "Automatski pokreni pri ureÄivanju nove poruke"
+msgstr "Automatski pokreÄe pri ureÄivanju nove poruke"
 
 #: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
@@ -17482,7 +17211,7 @@ msgstr "Koristi spoljni ureÄivaÄ za sastavljanje poruka u obiÄnom tekstu."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
-msgstr "Nije moguÄe napraviti privremenu datoteku"
+msgstr "Ne mogu da napravim privremenu datoteku"
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
@@ -17506,7 +17235,7 @@ msgid ""
 "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Ä."
+"dok je aktivan ureÄivaÄ."
 
 #: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
@@ -17518,7 +17247,7 @@ msgstr ""
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
 msgid "Insert Face picture by default"
-msgstr "Podrazumevano umeÄe sliku kontakta"
+msgstr "Podrazumevano umetanje slike kontakta"
 
 #: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
@@ -17529,10 +17258,8 @@ msgstr ""
 "postaviti sliku, inaÄe se niÅta neÄe desiti."
 
 #: ../plugins/face/face.c:286
-#, fuzzy
-#| msgid "Select a File"
 msgid "Select a Face Picture"
-msgstr "Izaberite datoteku"
+msgstr "Izaberite sliku lica"
 
 #: ../plugins/face/face.c:296
 msgid "Image files"
@@ -17540,7 +17267,7 @@ msgstr "Datoteke slika"
 
 #: ../plugins/face/face.c:352
 msgid "_Insert Face picture by default"
-msgstr "_Umetni sliku kontakta podrazumevano"
+msgstr "_Unapred umetni sliku kontakta"
 
 #: ../plugins/face/face.c:363
 msgid "Load new _Face picture"
@@ -17576,68 +17303,65 @@ msgstr "Datoteku nije moguÄe proÄitati"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
 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}"
+msgstr ""
+"Izabrana datoteka izgleda da nije slika ispravnog â.pngâ formata. GreÅka: {0}"
 
 #: ../plugins/google-account-setup/google-contacts-source.c:317
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:243
-#, fuzzy
-#| msgid "_Server:"
 msgid "Server"
-msgstr "S_erver:"
+msgstr "Server"
 
-#: ../plugins/google-account-setup/google-source.c:443
+#: ../plugins/google-account-setup/google-source.c:447
 #, 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."
+"Unesite lozinku za korisnika â%sâ radi pristupa listi prijavljenih kalendara."
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
 "%s"
 msgstr ""
-"Nije moguÄe proÄitati podatke sa servera Google.\n"
+"Ne mogu da proÄitam podatke sa Gugl servera.\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:560
+#: ../plugins/google-account-setup/google-source.c:564
 #: ../plugins/mail-to-task/mail-to-task.c:796
 #: ../plugins/mail-to-task/mail-to-task.c:1045
 msgid "Unknown error."
 msgstr "Nepoznata greÅka."
 
-#: ../plugins/google-account-setup/google-source.c:663
+#: ../plugins/google-account-setup/google-source.c:667
 msgid "Cal_endar:"
 msgstr "Kal_endar:"
 
-#: ../plugins/google-account-setup/google-source.c:698
-#, fuzzy
-#| msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:702
 msgid "Retrieve _List"
 msgstr "Dovuci _listu"
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
 msgid "Add Google Calendars to Evolution."
-msgstr "Dodaje Google kalendare u Evoluciju."
+msgstr "Dodajte kalendare Gugla u Evoluciju."
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
 msgid "Google Calendars"
-msgstr "Google kalendari"
+msgstr "Kalendari Gugla"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
 msgid "Inline Image"
-msgstr "Slike u porukama"
+msgstr "UnutraÅnja slika"
 
 #: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
 msgid "View image attachments directly in mail messages."
-msgstr "Pregled priloga sa slikama neposredno u porukama."
+msgstr "Pregledajte priloge sa slikama direktno u porukama."
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:329
 #: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "PrilagoÄena zaglavlja"
 
-#: ../plugins/imap-features/imap-headers.c:346
+#: ../plugins/imap-features/imap-headers.c:341
 #: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP zaglavlja"
@@ -17666,10 +17390,10 @@ msgstr ""
 
 #: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
-"_Basic Headers - (Fastest) \n"
+"_Basic Headers (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
 msgstr ""
-"_Osnovna zaglavlja - (NajbrÅe) \n"
+"_Osnovna zaglavlja â (NajbrÅe) \n"
 "Koristite ovo ukoliko nemate filtere na dopisnim listama"
 
 #: ../plugins/imap-features/imap-headers.ui.h:10
@@ -17687,172 +17411,171 @@ msgstr "IMAP moguÄnosti"
 #. Translators: The first '%s' is replaced with a calendar name,
 #. the second '%s' with an error message
 #: ../plugins/itip-formatter/itip-formatter.c:490
-#, fuzzy, c-format
-#| msgid "Failed to load the calendar '%s'"
+#, c-format
 msgid "Failed to load the calendar '%s' (%s)"
-msgstr "Nije moguÄe otvaranje kalendara â%sâ"
+msgstr "Ne mogu da uÄitam kalendara â%sâ (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:630
+#: ../plugins/itip-formatter/itip-formatter.c:645
 #, 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:654
+#: ../plugins/itip-formatter/itip-formatter.c:669
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
-msgstr "Zakazivanje je pronaÄeno u kalendaru â%sâ"
+msgstr "PronaÅao sam zakazivanje u kalendaru â%sâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:760
+#: ../plugins/itip-formatter/itip-formatter.c:775
 msgid "Unable to find any calendars"
-msgstr "Nije moguÄe pronaÄi nijedan kalendar"
+msgstr "Ne mogu da pronaÄem nijedan kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:782
 msgid "Unable to find this meeting in any calendar"
-msgstr "Nije moguÄe pronaÄi ovaj sastanak ni u jednom kalendaru"
+msgstr "Ne mogu da pronaÄem ovaj sastanak ni u jednom kalendaru"
 
-#: ../plugins/itip-formatter/itip-formatter.c:771
+#: ../plugins/itip-formatter/itip-formatter.c:786
 msgid "Unable to find this task in any task list"
-msgstr "Nije moguÄe pronaÄi ovaj zadatak ni u jednom spisku zadataka"
+msgstr "Ne mogu da pronaÄem ovaj zadatak ni u jednom spisku zadataka"
 
-#: ../plugins/itip-formatter/itip-formatter.c:775
+#: ../plugins/itip-formatter/itip-formatter.c:790
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleÅki ne sadrÅi ovu beleÅku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
-#, fuzzy
-#| msgid "Opening the calendar. Please wait.."
+#: ../plugins/itip-formatter/itip-formatter.c:1067
 msgid "Opening the calendar. Please wait..."
-msgstr "Otvaranje kalendara. SaÄekajte..."
+msgstr "Otvaram kalendar. Molim saÄekajte..."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1070
 msgid "Searching for an existing version of this appointment"
-msgstr "Pretraga jedne postojeÄe verzije ovog zakazivanja je u toku"
+msgstr "Pretraga za jednom postojeÄom verzijom ovog zakazivanja je u toku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1293
+#: ../plugins/itip-formatter/itip-formatter.c:1343
 msgid "Unable to parse item"
-msgstr "Nije moguÄa obrada stavke"
+msgstr "Ne mogu da obradim stavku"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1382
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
-msgstr "Nije moguÄe slanje stavke kalendaru â%sâ.  %s"
+msgstr "Ne mogu da poÅaljem stavke kalendaru â%sâ.  %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1394
+#: ../plugins/itip-formatter/itip-formatter.c:1444
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru â%sâ kao prihvaÄeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1448
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
-msgstr "Poslato kalendaru â%sâ uz rezervu"
+msgstr "Poslato kalendaru â%sâ kao pokuÅaj"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1453
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru â%sâ kao odbijeno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1408
+#: ../plugins/itip-formatter/itip-formatter.c:1458
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru â%sâ kao otkazano"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1552
 #, c-format
 msgid "Organizer has removed the delegate %s "
-msgstr "Organizator je uklonio delegata %s "
+msgstr "Organizator je uklonio delegata â%sâ "
 
-#: ../plugins/itip-formatter/itip-formatter.c:1509
+#: ../plugins/itip-formatter/itip-formatter.c:1559
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveÅtenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1511
+#: ../plugins/itip-formatter/itip-formatter.c:1561
 msgid "Could not send the cancelation notice to the delegate"
-msgstr "Nije moguÄe poslati obaveÅtenje o otkazivanju delegatu"
+msgstr "Ne mogu delegatu da poÅaljem obaveÅtenje o otkazivanju"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1622
+#: ../plugins/itip-formatter/itip-formatter.c:1672
 msgid "Attendee status could not be updated because the status is invalid"
-msgstr "Status uÄesnika nije aÅurirano zbog neispravnog stanja"
+msgstr "Status uÄesnika nije aÅuriran zbog neispravnog stanja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/itip-formatter/itip-formatter.c:1701
 #, c-format
 msgid "Unable to update attendee. %s"
-msgstr "Nije moguÄe aÅurirati uÄesnika. %s"
+msgstr "Ne mogu da aÅuriram uÄesnika. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1705
 msgid "Attendee status updated"
 msgstr "Status uÄesnika je aÅuriran"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1659
+#: ../plugins/itip-formatter/itip-formatter.c:1709
 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"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1681
+#: ../plugins/itip-formatter/itip-formatter.c:1731
 msgid "Meeting information sent"
-msgstr "Podatak o sastanku poslat"
+msgstr "Podatak o sastanku je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1684
+#: ../plugins/itip-formatter/itip-formatter.c:1734
 msgid "Task information sent"
-msgstr "Podatak o zadatku poslat"
+msgstr "Podatak o zadatku je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1687
+#: ../plugins/itip-formatter/itip-formatter.c:1737
 msgid "Memo information sent"
-msgstr "Podatak o beleÅci poslat"
+msgstr "Podatak o beleÅci je poslat"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1696
+#: ../plugins/itip-formatter/itip-formatter.c:1746
 msgid "Unable to send meeting information, the meeting does not exist"
-msgstr "Nije moguÄe slanje podataka o sastanku, sastanak ne postoji"
+msgstr "Ne mogu da poÅaljem podatak o sastanku, sastanak ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1699
+#: ../plugins/itip-formatter/itip-formatter.c:1749
 msgid "Unable to send task information, the task does not exist"
-msgstr "Nije moguÄe slanje podatka o zadatku, zaduÅenje ne postoji"
+msgstr "Ne mogu da poÅaljem podatak o zadatku, zaduÅenje ne postoji"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1702
+#: ../plugins/itip-formatter/itip-formatter.c:1752
 msgid "Unable to send memo information, the memo does not exist"
-msgstr "Nije moguÄe slanje podataka o beleÅci, beleÅka ne postoji"
+msgstr "Ne mogu da poÅaljem podatak o beleÅci, beleÅka ne postoji"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:1767
+#: ../plugins/itip-formatter/itip-formatter.c:1817
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1772
+#: ../plugins/itip-formatter/itip-formatter.c:1822
 msgid "Save Calendar"
 msgstr "SaÄuvaj kalendar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1830
-#: ../plugins/itip-formatter/itip-formatter.c:1841
+#: ../plugins/itip-formatter/itip-formatter.c:1880
+#: ../plugins/itip-formatter/itip-formatter.c:1891
 msgid "The calendar attached is not valid"
 msgstr "PriloÅen kalendar nije ispravan"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1831
-#: ../plugins/itip-formatter/itip-formatter.c:1842
+#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1892
 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."
+msgstr ""
+"Poruka prijavljuje da sadrÅi kalendar, ali taj kalendar nije ispravan "
+"iKalendar."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1882
-#: ../plugins/itip-formatter/itip-formatter.c:1910
-#: ../plugins/itip-formatter/itip-formatter.c:2019
+#: ../plugins/itip-formatter/itip-formatter.c:1932
+#: ../plugins/itip-formatter/itip-formatter.c:1960
+#: ../plugins/itip-formatter/itip-formatter.c:2069
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1883
-#: ../plugins/itip-formatter/itip-formatter.c:1911
-#: ../plugins/itip-formatter/itip-formatter.c:2020
+#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../plugins/itip-formatter/itip-formatter.c:1961
+#: ../plugins/itip-formatter/itip-formatter.c:2070
 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."
+"Poruka sadrÅi kalendar, ali on ne sadrÅi dogaÄaje, zadatke ili podatke "
+"slobodno/zauzeto."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1924
+#: ../plugins/itip-formatter/itip-formatter.c:1974
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrÅi viÅe stavki"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1925
+#: ../plugins/itip-formatter/itip-formatter.c:1975
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17864,40 +17587,46 @@ 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.
-#: ../plugins/itip-formatter/itip-formatter.c:2583
+#: ../plugins/itip-formatter/itip-formatter.c:2633
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NiÅta"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2649
 msgid "Tentatively Accepted"
 msgstr "PrihvaÄeno s rezervom"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2717
+#: ../plugins/itip-formatter/itip-formatter.c:2767
 msgid "This meeting recurs"
-msgstr "Ovaj se sastanak ponavlja"
+msgstr "Ovaj sastanak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2720
+#: ../plugins/itip-formatter/itip-formatter.c:2770
 msgid "This task recurs"
-msgstr "Ovaj se zadatak se ponavlja"
+msgstr "Ovaj zadatak se ponavlja"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2723
+#: ../plugins/itip-formatter/itip-formatter.c:2773
 msgid "This memo recurs"
-msgstr "Ova se beleÅka ponavlja"
+msgstr "Ova beleÅka se ponavlja"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2992
+#, fuzzy
+#| msgid "Meeting Information"
+msgid "Meeting Invitations"
+msgstr "Podatak o sastanku"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2962
+#: ../plugins/itip-formatter/itip-formatter.c:3017
 msgid "_Delete message after acting"
 msgstr "_ObriÅi poruku nakon radnje"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2972
-#: ../plugins/itip-formatter/itip-formatter.c:3005
+#: ../plugins/itip-formatter/itip-formatter.c:3027
+#: ../plugins/itip-formatter/itip-formatter.c:3060
 msgid "Conflict Search"
-msgstr "Tabela pretrage za preklapanjima"
+msgstr "Pretraga preklapanja"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2987
+#: ../plugins/itip-formatter/itip-formatter.c:3042
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
@@ -17905,44 +17634,44 @@ msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:196
 msgid "Today %H:%M"
-msgstr "Danas %H:%M"
+msgstr "Danas u %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:200
 msgid "Today %H:%M:%S"
-msgstr "Danas %H:%M:%S"
+msgstr "Danas u %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:209
 msgid "Today %l:%M:%S %p"
-msgstr "Danas %l:%M:%S %p"
+msgstr "Danas u %l:%M:%S %p"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:224
 msgid "Tomorrow %H:%M"
-msgstr "Sutra %H:%M"
+msgstr "Sutra u %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:228
 msgid "Tomorrow %H:%M:%S"
-msgstr "Sutra %H:%M:%S"
+msgstr "Sutra u %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:233
 msgid "Tomorrow %l:%M %p"
-msgstr "Sutra %l:%M %p"
+msgstr "Sutra u %l:%M %p"
 
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:237
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "Sutra %l:%M %S %p"
+msgstr "Sutra u %l:%M %S %p"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:256
@@ -18054,279 +17783,222 @@ msgstr "Nepoznata osoba"
 #: ../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>"
+#, c-format
 msgid "Please respond on behalf of %s"
-msgstr "Odgovorite u ime <b>%s</b>"
+msgstr "Odgovorite u ime %s"
 
 #: ../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>"
+#, c-format
 msgid "Received on behalf of %s"
-msgstr "Primljeno u ime <b>%s</b>"
+msgstr "Primljeno u ime %s"
 
 #: ../plugins/itip-formatter/itip-view.c:374
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has published the following meeting information:"
+#, c-format
 msgid "%s through %s has published the following meeting information:"
-msgstr "<b>%s</b> preko %s objavljuje sledeÄi podatak o sastanku:"
+msgstr "%s preko %s objavljuje sledeÄi podatak o sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:376
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following meeting information:"
+#, c-format
 msgid "%s has published the following meeting information:"
-msgstr "<b>%s</b> objavljuje sledeÄi podatak o sastanku:"
+msgstr "%s objavljuje sledeÄi podatak o sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:381
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has delegated the following meeting to you:"
+#, c-format
 msgid "%s has delegated the following meeting to you:"
-msgstr "<b>%s</b> Vam delegira sledeÄi sastanak:"
+msgstr "%s vam delegira sledeÄi sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:384
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s requests your presence at the following meeting:"
+#, c-format
 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:"
+msgstr "%s preko %s zahteva vaÅe prisustvo na sledeÄem sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:386
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests your presence at the following meeting:"
+#, c-format
 msgid "%s requests your presence at the following meeting:"
-msgstr "<b>%s</b> zahteva VaÅe prisustvo na sledeÄem sastanku:"
+msgstr "%s zahteva vaÅe prisustvo na sledeÄem sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:392
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> preko %s Åeli da doda postojeÄem sastanku:"
+msgstr "%s preko %s Åeli da doda postojeÄem sastanku:"
 
 #: ../plugins/itip-formatter/itip-view.c:394
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing meeting:"
+#, c-format
 msgid "%s wishes to add to an existing meeting:"
-msgstr "<b>%s</b> Åeli da doda postojeÄem sastanku:"
+msgstr "%s Åeli da doda postojeÄem sastanku:"
 
 #: ../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:"
+#, c-format
 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:"
+msgstr "%s preko %s Åeli da primi najnovije informacije za sledeÄi sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:400
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> wishes to receive the latest information for the following "
-#| "meeting:"
+#, c-format
 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:"
+msgstr "%s Åeli da primi najnoviji podatak za sledeÄi sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:404
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#, c-format
 msgid "%s through %s has sent back the following meeting response:"
-msgstr "<b>%s</b> preko %s Åalje sledeÄi odgovor za sastanak:"
+msgstr "%s preko %s Åalje sledeÄi odgovor za sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:406
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following meeting response:"
+#, c-format
 msgid "%s has sent back the following meeting response:"
-msgstr "<b>%s</b> Åalje sledeÄi odgovor za sastanak:"
+msgstr "%s Åalje sledeÄi odgovor za sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:410
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following meeting:"
+#, c-format
 msgid "%s through %s has canceled the following meeting:"
-msgstr "<b>%s</b> preko %s otkazuje sledeÄi sastanak:"
+msgstr "%s preko %s otkazuje sledeÄi sastanak:"
 
 #: ../plugins/itip-formatter/itip-view.c:412
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following meeting."
+#, c-format
 msgid "%s has canceled the following meeting."
-msgstr "<b>%s</b> otkazuje sledeÄi sastanak."
+msgstr "%s otkazuje sledeÄi sastanak."
 
 #: ../plugins/itip-formatter/itip-view.c:416
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#, c-format
 msgid "%s through %s has proposed the following meeting changes."
-msgstr "<b>%s</b> preko %s predlaÅe sledeÄe promene sastanka."
+msgstr "%s preko %s predlaÅe sledeÄe promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:418
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following meeting changes."
+#, c-format
 msgid "%s has proposed the following meeting changes."
-msgstr "<b>%s</b> predlaÅe sledeÄe promene sastanka."
+msgstr "%s predlaÅe sledeÄe promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:422
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#, c-format
 msgid "%s through %s has declined the following meeting changes:"
-msgstr "<b>%s</b> preko %s odbija sledeÄe promene sastanka:"
+msgstr "%s preko %s odbija sledeÄe promene sastanka:"
 
 #: ../plugins/itip-formatter/itip-view.c:424
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following meeting changes."
+#, c-format
 msgid "%s has declined the following meeting changes."
-msgstr "<b>%s</b> odbija sledeÄe promene sastanka."
+msgstr "%s odbija sledeÄe promene sastanka."
 
 #: ../plugins/itip-formatter/itip-view.c:462
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following task:"
+#, c-format
 msgid "%s through %s has published the following task:"
-msgstr "<b>%s</b> preko %s objavljuje sledeÄi zadatak:"
+msgstr "%s preko %s objavljuje sledeÄi zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:464
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following task:"
+#, c-format
 msgid "%s has published the following task:"
-msgstr "<b>%s</b> objavi sledeÄe zaduÅenje:"
+msgstr "%s objavi sledeÄe zaduÅenje:"
 
 #: ../plugins/itip-formatter/itip-view.c:469
-#, fuzzy, c-format
-#| msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#, c-format
 msgid "%s requests the assignment of %s to the following task:"
-msgstr "<b>%s</b> zahteva da %s preuzme sledeÄi zadatak:"
+msgstr "%s zahteva da %s preuzme sledeÄi zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:472
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has assigned you a task:"
+#, c-format
 msgid "%s through %s has assigned you a task:"
-msgstr "<b>%s</b> preko %s Vam dodeljuje zadatak:"
+msgstr "%s preko %s vam dodeljuje zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:474
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has assigned you a task:"
+#, c-format
 msgid "%s has assigned you a task:"
-msgstr "<b>%s</b> Vam dodeljuje zadatak:"
+msgstr "%s Vam dodeljuje zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:480
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#, c-format
 msgid "%s through %s wishes to add to an existing task:"
-msgstr "<b>%s</b> preko %s Åeli da doda postojeÄem zadatku:"
+msgstr "%s preko %s Åeli da doda postojeÄem zadatku:"
 
 #: ../plugins/itip-formatter/itip-view.c:482
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing task:"
+#, c-format
 msgid "%s wishes to add to an existing task:"
-msgstr "<b>%s</b Åeli da doda postojeÄem zadatku:"
+msgstr "%s Åeli da doda postojeÄem zadatku:"
 
 #: ../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:"
+#, c-format
 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:"
+"%s preko %s Å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:"
+#, c-format
 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:"
+msgstr "%s Åeli da dobije najnovije informacije za sledeÄi dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:492
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has sent back the following assigned task response:"
+#, c-format
 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:"
+msgstr "%s preko %s vraÄa sledeÄi odgovor na dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:494
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has sent back the following assigned task response:"
+#, c-format
 msgid "%s has sent back the following assigned task response:"
-msgstr "<b>%s</b> Åalje nazad sledeÄi odgovor na dodeljeni zadatak:"
+msgstr "%s Åalje nazad sledeÄi odgovor na dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:498
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#, c-format
 msgid "%s through %s has canceled the following assigned task:"
-msgstr "<b>%s</b> preko %s otkazuje sledeÄi dodeljeni zadatak:"
+msgstr "%s preko %s otkazuje sledeÄi dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:500
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following assigned task:"
+#, c-format
 msgid "%s has canceled the following assigned task:"
-msgstr "<b>%s</b> otkazuje sledeÄi dodeljeni zadatak:"
+msgstr "%s otkazuje sledeÄi dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:504
-#, fuzzy, c-format
-#| msgid ""
-#| "<b>%s</b> through %s has proposed the following task assignment changes:"
+#, c-format
 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:"
+msgstr "%s preko %s predlaÅe sledeÄe promene u dodeli zadatka:"
 
 #: ../plugins/itip-formatter/itip-view.c:506
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has proposed the following task assignment changes:"
+#, c-format
 msgid "%s has proposed the following task assignment changes:"
-msgstr "<b>%s</b> predlaÅe sledeÄe promene u dodeli zadatka:"
+msgstr "%s predlaÅe sledeÄe promene u dodeli zadatka:"
 
 #: ../plugins/itip-formatter/itip-view.c:510
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has declined the following assigned task:"
+#, c-format
 msgid "%s through %s has declined the following assigned task:"
-msgstr "<b>%s</b> preko %s odbija sledeÄi dodeljeni zadatak:"
+msgstr "%s preko %s odbija sledeÄi dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:512
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has declined the following assigned task:"
+#, c-format
 msgid "%s has declined the following assigned task:"
-msgstr "<b>%s</b> odbija sledeÄi dodeljeni zadatak:"
+msgstr "%s odbija sledeÄi dodeljeni zadatak:"
 
 #: ../plugins/itip-formatter/itip-view.c:549
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has published the following memo:"
+#, c-format
 msgid "%s through %s has published the following memo:"
-msgstr "<b>%s</b> preko %s objavljuje sledeÄu beleÅku:"
+msgstr "%s preko %s objavljuje sledeÄu beleÅku:"
 
 #: ../plugins/itip-formatter/itip-view.c:551
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has published the following memo:"
+#, c-format
 msgid "%s has published the following memo:"
-msgstr "<b>%s</b> objavljuje sledeÄu beleÅku:"
+msgstr "%s objavljuje sledeÄu beleÅku:"
 
 #: ../plugins/itip-formatter/itip-view.c:556
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#, c-format
 msgid "%s through %s wishes to add to an existing memo:"
-msgstr "<b>%s</b> preko %s Åeli da doda postojeÄoj beleÅci:"
+msgstr "%s preko %s Åeli da doda postojeÄoj beleÅci:"
 
 #: ../plugins/itip-formatter/itip-view.c:558
-#, fuzzy, c-format
-#| msgid "<b>%s</b> wishes to add to an existing memo:"
+#, c-format
 msgid "%s wishes to add to an existing memo:"
-msgstr "<b>%s</b> Åeli da doda postojeÄoj beleÅci:"
+msgstr "%s Åeli da doda postojeÄoj beleÅci:"
 
 #: ../plugins/itip-formatter/itip-view.c:562
-#, fuzzy, c-format
-#| msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#, c-format
 msgid "%s through %s has canceled the following shared memo:"
-msgstr "<b>%s</b> preko %s otkazuje sledeÄu deljenu beleÅku:"
+msgstr "%s preko %s otkazuje sledeÄu deljenu beleÅku:"
 
 #: ../plugins/itip-formatter/itip-view.c:564
-#, fuzzy, c-format
-#| msgid "<b>%s</b> has canceled the following shared memo:"
+#, c-format
 msgid "%s has canceled the following shared memo:"
-msgstr "<b>%s</b> otkazuje sledeÄe deljenu beleÅku:"
+msgstr "%s otkazuje sledeÄe deljenu beleÅku:"
 
 #: ../plugins/itip-formatter/itip-view.c:688
 msgid "All day:"
@@ -18355,7 +18027,7 @@ msgstr "Vreme zavrÅetka:"
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Open Calendar"
-msgstr "_Otvori kalendar"
+msgstr "O_tvori kalendar"
 
 #: ../plugins/itip-formatter/itip-view.c:850
 #: ../plugins/itip-formatter/itip-view.c:854
@@ -18370,10 +18042,8 @@ msgstr "_Odbij"
 #: ../plugins/itip-formatter/itip-view.c:863
 #: ../plugins/itip-formatter/itip-view.c:879
 #: ../plugins/itip-formatter/itip-view.c:884
-#, fuzzy
-#| msgid "Accept"
 msgid "A_ccept"
-msgstr "Prihvati"
+msgstr "_Prihvati"
 
 #: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Decline all"
@@ -18391,8 +18061,6 @@ msgid "_Tentative"
 msgstr "Sa _rezervom"
 
 #: ../plugins/itip-formatter/itip-view.c:856
-#, fuzzy
-#| msgid "_Accept all"
 msgid "A_ccept all"
 msgstr "P_rihvati sve"
 
@@ -18458,14 +18126,8 @@ msgid "Itip Formatter"
 msgstr "Itip formatiranje"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-#, 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; ?"
+msgstr "â{0}â delegira sastanak. Åelite li da dodate delegata â{1}â?"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "This meeting has been delegated"
@@ -18478,78 +18140,62 @@ msgstr "Ovaj odgovor nije poslao prisutan uÄesnik. Dodati ga u prisutne?"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
-msgstr "Svira ili puÅta zvuÄnu datoteku."
+msgstr "PiÅti ili puÅta zvuÄnu datoteku."
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Enable D-Bus messages."
-msgstr "UkljuÄuje poruke D-Bus."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 msgid "Enable icon in notification area."
 msgstr "UkljuÄuje ikonu u obaveÅtajnu zonu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-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:5
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
 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."
+"Ako je postavljeno, zapiÅtaÄe a inaÄe puÅta zvuÄnu datoteku kada stigne nova "
+"poruka."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
 msgid "Notify new messages for Inbox only."
 msgstr "ObaveÅtava samo za nove poruke u SanduÄetu."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
 msgid "Play sound when new messages arrive."
 msgstr "PuÅta zvuk kada stigne nova poruka."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
 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."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
-msgid "Popup message together with the icon."
-msgstr "IskaÄuÄa poruka sa ikonom."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
 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."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
 msgid "Sound file name to be played."
 msgstr "Ime datoteke za puÅtanje."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
 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."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Use sound theme"
 msgstr "Koristi zvuk teme"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "Da li da pusti zvuk ili svirne kada stigne nova poruka."
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
-msgid "Whether show message over the icon when new messages arrive."
-msgstr "Da li da prikaÅe poruku preko ikone kada stigne nova poruka."
-
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 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:396
+#: ../plugins/mail-notification/mail-notification.c:391
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18572,12 +18218,12 @@ msgstr[3] ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:416
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:430
+#: ../plugins/mail-notification/mail-notification.c:427
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18586,47 +18232,46 @@ 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:443
-#: ../plugins/mail-notification/mail-notification.c:451
-#: ../plugins/mail-notification/mail-notification.c:454
+#: ../plugins/mail-notification/mail-notification.c:436
+#: ../plugins/mail-notification/mail-notification.c:444
+#: ../plugins/mail-notification/mail-notification.c:447
 msgid "New email"
 msgstr "Nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:509
-msgid "Show icon in _notification area"
-msgstr "Prikazuje ikonu u _obaveÅtajnoj zoni"
-
-#: ../plugins/mail-notification/mail-notification.c:539
-msgid "Popup _message together with the icon"
-msgstr "PrikaÅi _poruku zajedno sa ikonom"
+#. Translators: The '%s' is a mail
+#. * folder name.  (e.g. "Show Inbox")
+#: ../plugins/mail-notification/mail-notification.c:468
+#, c-format
+msgid "Show %s"
+msgstr "PrikaÅi %s"
 
-#: ../plugins/mail-notification/mail-notification.c:726
-msgid "_Play sound when new messages arrive"
-msgstr "_Pusti zvuk kada stigne nova poruka"
+#: ../plugins/mail-notification/mail-notification.c:670
+msgid "_Play sound when a new message arrives"
+msgstr "_ZvuÄno obavesti kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:756
+#: ../plugins/mail-notification/mail-notification.c:700
 msgid "_Beep"
-msgstr "_Svirni"
+msgstr "_ZapiÅti"
 
-#: ../plugins/mail-notification/mail-notification.c:769
+#: ../plugins/mail-notification/mail-notification.c:713
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:788
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Play _file:"
 msgstr "Pusti _zvuÄnu datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:799
+#: ../plugins/mail-notification/mail-notification.c:741
 msgid "Select sound file"
-msgstr "Bira zvuÄnu datoteku"
+msgstr "Izaberite zvuÄnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:857
+#: ../plugins/mail-notification/mail-notification.c:798
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _SanduÄe"
 
-#: ../plugins/mail-notification/mail-notification.c:866
-msgid "Generate a _D-Bus message"
-msgstr "Stvara _D-Bus poruku"
+#: ../plugins/mail-notification/mail-notification.c:808
+msgid "Show _notification when a new message arrives"
+msgstr "PrikaÅi _obaveÅtenje kada pristigne nova poruka"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
@@ -18634,7 +18279,7 @@ msgstr "ObaveÅtenje o poÅti"
 
 #: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
-msgstr "ObaveÅtava Vas kada stigne nova poruka."
+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:235
@@ -18673,6 +18318,8 @@ msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
 "add them all?"
 msgstr ""
+"Izabrali ste %d poÅta da prevedete u dogaÄaje. Da li zaista Åelite sve da ih "
+"dodate?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:612
 #, c-format
@@ -18680,6 +18327,8 @@ msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
 "add them all?"
 msgstr ""
+"Izabrali ste %d poÅta da prevedete u zadatke. Da li zaista Åelite sve da ih "
+"dodate?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:615
 #, c-format
@@ -18687,12 +18336,12 @@ msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
 "add them all?"
 msgstr ""
+"Izabrali ste %d poÅta da prevedete u beleÅke. Da li zaista Åelite sve da ih "
+"dodate?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:634
-#, fuzzy
-#| msgid "Do you wish to overwrite it?"
 msgid "Do you wish to continue converting remaining mails?"
-msgstr "Åelite li da je prepiÅete?"
+msgstr "Da li Åelite da nastavite sa prevoÄenjem preostalih poÅta?"
 
 #: ../plugins/mail-to-task/mail-to-task.c:709
 msgid "[No Summary]"
@@ -18700,24 +18349,24 @@ msgstr "[Bez saÅetka]"
 
 #: ../plugins/mail-to-task/mail-to-task.c:721
 msgid "Invalid object returned from a server"
-msgstr "Neispravan objekat vraÄen od servera"
+msgstr "Neispravan objekat vraÄen sa servera"
 
 #: ../plugins/mail-to-task/mail-to-task.c:771
 #, c-format
 msgid "An error occurred during processing: %s"
-msgstr "Javila se greÅka u obradi: %s"
+msgstr "DoÅlo je do greÅke u obradi: %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:796
 #, c-format
 msgid "Cannot open calendar. %s"
-msgstr "Nije moguÄe otvoriti kalendar. %s"
+msgstr "Ne mogu da otvorim kalendar. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:803
 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. "
+"Izabrani izvor je samo za Äitanje, stoga ne moÅete napraviti dogaÄaj. "
 "Izaberite drugi izvor."
 
 #: ../plugins/mail-to-task/mail-to-task.c:806
@@ -18725,7 +18374,7 @@ 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. "
+"Izabrani izvor je samo za Äitanje, stoga ne moÅete napraviti zadatak. "
 "Izaberite drugi izvor."
 
 #: ../plugins/mail-to-task/mail-to-task.c:809
@@ -18733,20 +18382,18 @@ 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. "
+"Izabrani izvor je samo za Äitanje, stoga ne moÅete napraviti beleÅku. "
 "Izaberite drugi izvor."
 
 # mail:no-copy-folder-nostore secondary
 #: ../plugins/mail-to-task/mail-to-task.c:1045
 #, c-format
 msgid "Cannot get source list. %s"
-msgstr "Nije moguÄe dobiti spisak izvora. %s"
+msgstr "Ne mogu da dobavim spisak izvora. %s"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1104
-#, fuzzy
-#| msgid "No description available."
 msgid "No writable calendar is available."
-msgstr "Nema dostupnog opisa."
+msgstr "Nema dostupnog kalendara za upisivanje"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1196
 msgid "Create an _Event"
@@ -18754,7 +18401,7 @@ msgstr "Napravi _dogaÄaj"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1198
 msgid "Create a new event from the selected message"
-msgstr "Napravi novi dogaÄaj od izabrane poruke"
+msgstr "Pravi novi dogaÄaj od izabrane poruke"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1203
 msgid "Create a Mem_o"
@@ -18762,7 +18409,7 @@ msgstr "Napravi beleÅk_u"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1205
 msgid "Create a new memo from the selected message"
-msgstr "Napravi novu beleÅku od izabrane poruke"
+msgstr "Pravi novu beleÅku od izabrane poruke"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1210
 msgid "Create a _Task"
@@ -18770,7 +18417,7 @@ msgstr "Napravi _zadatak"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1212
 msgid "Create a new task from the selected message"
-msgstr "Napravi novi zadatak od izabrane poruke"
+msgstr "Pravi novi zadatak od izabrane poruke"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1220
 msgid "Create a _Meeting"
@@ -18778,7 +18425,7 @@ msgstr "Napravi _sastanak"
 
 #: ../plugins/mail-to-task/mail-to-task.c:1222
 msgid "Create a new meeting from the selected message"
-msgstr "Napravi novi sastanak od izabrane poruke"
+msgstr "Pravi novi sastanak od izabrane poruke"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid "Convert a mail message to a task."
@@ -18790,7 +18437,7 @@ msgstr "Pribavi _arhivu liste"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:347
 msgid "Get an archive of the list this message belongs to"
-msgstr "Pribavi arhivu liste kojoj ova poruka pripada"
+msgstr "Pribavlja arhivu liste kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:352
 msgid "Get List _Usage Information"
@@ -18798,7 +18445,7 @@ msgstr "Pribavi podatke o _koriÅÄenju liste"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:354
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "Pribavi podatke o koriÅÄenju liste kojoj ova poruka pripada"
+msgstr "Pribavlja podatke o koriÅÄenju liste kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:359
 msgid "Contact List _Owner"
@@ -18814,7 +18461,7 @@ msgstr "_PoÅalji poruku na listu"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:368
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "Sastavi poruku za dopisnu listu kojoj ova poruka pripada"
+msgstr "Sastavite poruku za dopisnu listu kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "_Subscribe to List"
@@ -18822,15 +18469,15 @@ msgstr "Pri_javi se na listu"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:375
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "Prijavi se na dopisnu listu kojoj ova poruka pripada"
+msgstr "Prijavite se na dopisnu listu kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "_Unsubscribe from List"
-msgstr "O_djavi se liste"
+msgstr "O_djavi se sa liste"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Unsubscribe from the mailing list this message belongs to"
-msgstr "Odjavi se sa dopisne liste kojoj ova poruka pripada"
+msgstr "Odjavite se sa dopisne liste kojoj ova poruka pripada"
 
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:389
 msgid "Mailing _List"
@@ -18883,7 +18530,7 @@ msgstr ""
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "Poslati elektronsku poruku na dopisnu listu?"
+msgstr "Da poÅaljem elektronsku poruku na dopisnu listu?"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -18892,7 +18539,7 @@ msgid ""
 "\n"
 "Header: {0}"
 msgstr ""
-"Radnju nije moguÄe izvesti. Zaglavlje za ovu radnju nije sadrÅalo obradivu "
+"Radnja ne moÅe biti izvrÅena. Zaglavlje za ovu radnju nije sadrÅalo obradivu "
 "radnju.\n"
 "\n"
 "Zaglavlje: {0}"
@@ -18923,7 +18570,7 @@ msgstr "_PoÅalji poruku"
 
 #: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
-msgstr "OznaÄiti takoÄe i poruke u podfasciklama?"
+msgstr "Da oznaÄim takoÄe i poruke u podfasciklama?"
 
 #: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
@@ -18942,7 +18589,7 @@ msgstr "U trenutnoj fascikli i _podfasciklama"
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:565
+#: ../plugins/mark-all-read/mark-all-read.c:573
 msgid "Mark Me_ssages as Read"
 msgstr "OznaÄi po_ruke kao proÄitane"
 
@@ -18973,7 +18620,7 @@ msgstr "PrikaÅi HTML ako postoji"
 
 #: ../plugins/prefer-plain/prefer-plain.c:241
 msgid "Let Evolution choose the best part to show."
-msgstr "Neka Evolucija izabere najbolji deo za prikaz."
+msgstr "PuÅta da Evolucija izabere najbolji deo za prikaz."
 
 #: ../plugins/prefer-plain/prefer-plain.c:242
 msgid "Show plain text if present"
@@ -18984,8 +18631,8 @@ 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."
+"Prikazuje deo sa obiÄnim tekstom, ako postoji, inaÄe puÅta da Evolucija "
+"izabere najbolji deo za prikaz."
 
 #: ../plugins/prefer-plain/prefer-plain.c:243
 msgid "Only ever show plain text"
@@ -19009,47 +18656,43 @@ msgstr "HTML _reÅim"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
-msgstr "Uvozi Outlook poruke iz datoteke PST"
+msgstr "Uvozi Autluk poruke iz PST datoteke"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
 msgid "Outlook PST import"
-msgstr "Outlook PST uvoz"
+msgstr "Autluk PST uvoz"
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Outlook personal folders (.pst)"
-msgstr "LiÄne fascikle Outlook (.pst)"
+msgstr "LiÄne fascikle Autluka (.pst)"
 
-#: ../plugins/pst-import/pst-importer.c:308
+#: ../plugins/pst-import/pst-importer.c:436
 msgid "_Mail"
 msgstr "_PoÅta"
 
-#: ../plugins/pst-import/pst-importer.c:326
+#: ../plugins/pst-import/pst-importer.c:455
 msgid "Destination folder:"
 msgstr "OdrediÅna fascikla:"
 
-#. Address book
-#: ../plugins/pst-import/pst-importer.c:332
+#: ../plugins/pst-import/pst-importer.c:461
 msgid "_Address Book"
 msgstr "_Adresar"
 
-#. Appointments
-#: ../plugins/pst-import/pst-importer.c:339
+#: ../plugins/pst-import/pst-importer.c:462
 msgid "A_ppointments"
 msgstr "Za_kazano"
 
-#. Tasks
-#: ../plugins/pst-import/pst-importer.c:345 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:463 ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "_Zadaci"
 
-#. Journal
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:464
 msgid "_Journal entries"
-msgstr "Unosi u _dnevnik"
+msgstr "Unosi _dnevnika"
 
-#: ../plugins/pst-import/pst-importer.c:366
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Importing Outlook data"
-msgstr "UvoÅenje Outlook podataka"
+msgstr "Uvozim Autluk podatke"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 #: ../plugins/publish-calendar/publish-calendar.c:146
@@ -19064,33 +18707,33 @@ msgstr "Mesta"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Publish calendars to the web."
-msgstr "Objavljuje kalendare na veb."
+msgstr "Objavite kalendare na veb."
 
 #: ../plugins/publish-calendar/publish-calendar.c:212
 #: ../plugins/publish-calendar/publish-calendar.c:453
 #, c-format
 msgid "Could not open %s:"
-msgstr "Nije moguÄe otvaranje %s:"
+msgstr "Ne mogu da otvorim %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:214
 #, c-format
 msgid "Could not open %s: Unknown error"
-msgstr "Nije moguÄe otvoriti %s: nepoznata greÅka"
+msgstr "Ne mogu da otvorim %s: nepoznata greÅka"
 
 #: ../plugins/publish-calendar/publish-calendar.c:234
 #, c-format
 msgid "There was an error while publishing to %s:"
-msgstr "Javila se greÅka prilikom objave na %s:"
+msgstr "DoÅlo je do greÅke prilikom objavljivanja na %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "Publishing to %s finished successfully"
-msgstr "Objavljivanje na %s uspeÅno zavrÅeno"
+msgstr "Objavljivanje na %s je uspeÅno zavrÅeno"
 
 #: ../plugins/publish-calendar/publish-calendar.c:280
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "Neuspelo montiranje %s:"
+msgstr "Nisam uspeo da montiram %s:"
 
 #: ../plugins/publish-calendar/publish-calendar.c:600
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
@@ -19106,7 +18749,7 @@ msgstr "Sigurno Åelite da uklonite ovu lokaciju?"
 #. ever happen, and if so, then something is really wrong.
 #: ../plugins/publish-calendar/publish-calendar.c:1057
 msgid "Could not create publish thread."
-msgstr "Nije moguÄe objaviti raspravu."
+msgstr "Ne mogu da objavim raspravu."
 
 #: ../plugins/publish-calendar/publish-calendar.c:1065
 msgid "_Publish Calendar Information"
@@ -19150,7 +18793,7 @@ msgstr "Sigurni FTP (SSH)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "Secure WebDAV (HTTPS)"
-msgstr "Sigurni WebDAV (HTTPS)"
+msgstr "Sigurni VebDAV (HTTPS)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
@@ -19166,7 +18809,7 @@ msgstr "Vreme _trajanja:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
 msgid "WebDAV (HTTP)"
-msgstr "WebDAV (HTTP)"
+msgstr "VebDAV (HTTP)"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Weekly"
@@ -19198,13 +18841,13 @@ msgstr "_KorisniÄko ime:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "iCal"
-msgstr "iCal"
+msgstr "iKol"
 
 #: ../plugins/publish-calendar/publish-format-fb.c:88
 #: ../plugins/publish-calendar/publish-format-ical.c:86
 #, c-format
 msgid "Could not publish calendar: Calendar backend no longer exists"
-msgstr "Nije moguÄe objaviti kalendar: pozadinski proces viÅe ne postoji"
+msgstr "Ne mogu da objavim kalendar: pozadinski proces viÅe ne postoji"
 
 #: ../plugins/publish-calendar/url-editor-dialog.c:487
 msgid "New Location"
@@ -19214,62 +18857,6 @@ msgstr "Nova lokacija"
 msgid "Edit Location"
 msgstr "Uredi lokaciju"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:128
-#, c-format
-msgid "SpamAssassin not found, code: %d"
-msgstr "Ubica spama nije pronaÄen, kod: %d"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:136
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:144
-#, c-format
-msgid "Failed to create pipe: %s"
-msgstr "Nije uspelo pravljenje cevi: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:183
-#, c-format
-msgid "Error after fork: %s"
-msgstr "GreÅka po izdvajanju: %s"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:241
-#, 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:243
-#, 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:252
-#, 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:519
-#, 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:936
-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:944
-msgid "I_nclude remote tests"
-msgstr "U_kljuÄi mreÅne provere"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filter junk messages using SpamAssassin."
-msgstr "Filtrira neÅeljenu poÅtu koriÅÄenjem Ubice spama."
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Junk Filter"
-msgstr "Filter neÅeljene poÅte Ubica spama"
-
-#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin Options"
-msgstr "Opcije Ubice spama"
-
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
@@ -19277,81 +18864,81 @@ msgstr "Opcije Ubice spama"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:371
 msgid "UID"
 msgstr "JIB"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:373
 msgid "Description List"
 msgstr "Spisak opisa"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "Categories List"
 msgstr "Spisak kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:375
 msgid "Comment List"
 msgstr "Spisak komentara"
 
-#: ../plugins/save-calendar/csv-format.c:376
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Contact List"
 msgstr "Kontakt lista"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Start"
 msgstr "PoÄetak"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "End"
 msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Due"
 msgstr "Rok"
 
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "percent Done"
 msgstr "postotak zavrÅenog"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "URL"
 msgstr "Adresa"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Attendees List"
 msgstr "Spisak uÄesnika"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:560
+#: ../plugins/save-calendar/csv-format.c:562
 msgid "A_dvanced options for the CSV format"
-msgstr "Na_predne opcije za format CSV"
+msgstr "Na_predne opcije za CVS format"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:570
 msgid "Prepend a _header"
 msgstr "Prvo ukljuÄi _zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:577
+#: ../plugins/save-calendar/csv-format.c:579
 msgid "_Value delimiter:"
 msgstr "GraniÄnik _vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:588
+#: ../plugins/save-calendar/csv-format.c:590
 msgid "_Record delimiter:"
 msgstr "GraniÄnik _zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:599
+#: ../plugins/save-calendar/csv-format.c:601
 msgid "_Encapsulate values with:"
 msgstr "_Obavij vrednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:625
-msgid "Comma separated value format (.csv)"
-msgstr "Zarezom odvojen oblik vrednosti (.csv)"
+#: ../plugins/save-calendar/csv-format.c:627
+msgid "Comma separated values (.csv)"
+msgstr "Vrednosti razdvojene zarezom (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:166
-msgid "iCalendar format (.ics)"
-msgstr "iKalendar oblik (.ics)"
+#: ../plugins/save-calendar/ical-format.c:166 ../shell/e-shell-utils.c:225
+msgid "iCalendar (.ics)"
+msgstr "iKalendar (.ics)"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
@@ -19371,8 +18958,8 @@ msgid "%FT%T"
 msgstr "%FT%T"
 
 #: ../plugins/save-calendar/rdf-format.c:375
-msgid "RDF format (.rdf)"
-msgstr "RDF oblik (.rdf)"
+msgid "RDF (.rdf)"
+msgstr "RDF (.rdf)"
 
 #: ../plugins/save-calendar/save-calendar.c:122
 msgid "_Format:"
@@ -19408,6 +18995,9 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
+"PrikljuÄak za obrazac nacrta. MoÅete da koristite promenljive kao Åto su $ORIG"
+"[tema], $ORIG[Åalje], $ORIG[prima] or $ORIG[poruka], koje Äe biti zamenjene "
+"vrednostima iz e-poÅte na koju odgovarate."
 
 #: ../plugins/templates/templates.c:1066
 msgid "No Title"
@@ -19423,7 +19013,7 @@ msgstr "Äuva kao Åablon"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
 msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
-msgstr "Dekodira priloge TNEF (winmail.dat) iz programa Microsoft Outlook."
+msgstr "Dekodira priloge TNEF (winmail.dat) iz Majkrosoft Autluka."
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
 msgid "TNEF Decoder"
@@ -19431,49 +19021,49 @@ msgstr "Dekoder TNEF"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
 msgid "Inline vCards"
-msgstr "vKarte u porukama"
+msgstr "UgnjeÅdene vKarte"
 
 #: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
 msgid "Show vCards directly in mail messages."
 msgstr "Prikazuje vKarte neposredno u porukama."
 
-#: ../plugins/vcard-inline/vcard-inline.c:200
-#: ../plugins/vcard-inline/vcard-inline.c:285
+#: ../plugins/vcard-inline/vcard-inline.c:206
+#: ../plugins/vcard-inline/vcard-inline.c:291
 msgid "Show Full vCard"
 msgstr "PrikaÅi punu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:203
+#: ../plugins/vcard-inline/vcard-inline.c:209
 msgid "Show Compact vCard"
 msgstr "PrikaÅi saÅetu vKartu"
 
-#: ../plugins/vcard-inline/vcard-inline.c:264
+#: ../plugins/vcard-inline/vcard-inline.c:270
 msgid "There is one other contact."
 msgstr "Postoji joÅ jedan kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:273
+#: ../plugins/vcard-inline/vcard-inline.c:279
 #, 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[1] "Postoje joÅ %d kontakta."
 msgstr[2] "Postoji joÅ %d kontakta."
 msgstr[3] "Postoji joÅ %d kontakt."
 
-#: ../plugins/vcard-inline/vcard-inline.c:294
+#: ../plugins/vcard-inline/vcard-inline.c:300
 msgid "Save in Address Book"
 msgstr "SaÄuvaj u adresar"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "Add WebDAV contacts to Evolution."
-msgstr "Dodaje WebDAV kontakte u Evoluciju."
+msgstr "Dodajte VebDAV kontakte u Evoluciju."
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
-msgstr "WebDAV kontakti"
+msgstr "VebDAV kontakti"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:67
 msgid "WebDAV"
-msgstr "WebDAV"
+msgstr "VebDAV"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:255
 msgid "URL:"
@@ -19481,7 +19071,7 @@ msgstr "Adresa :"
 
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:281
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "_Izbegavaj IfMatch (potrebno na ApaÄu < 2.2.8)"
+msgstr "_Izbegavaj Ako poklapa (potrebno na ApaÄu < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
@@ -19497,7 +19087,7 @@ msgstr "Verzija podeÅavanja"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
-msgstr "Podrazumevana Åirina boÄne trake"
+msgstr "Podrazumevana Åirina boÄne povrÅi"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window X coordinate"
@@ -19527,7 +19117,7 @@ msgstr "UkljuÄi ekspresni reÅim"
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
 msgstr ""
-"OmoguÄuje postavke posrednika kada pristupa HTTP/siguran HTTP preko "
+"OmoguÄuje postavke posrednika kada pristupa HTTP/bezbedan HTTP preko "
 "Interneta."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:12
@@ -19536,19 +19126,19 @@ msgstr "Oznaka koja omoguÄava jednostavnije okruÅenje."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy host name"
-msgstr "DomaÄin posrednika za HTTP"
+msgstr "Ime domaÄin HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy password"
-msgstr "Lozinka posrednika za HTTP"
+msgstr "Lozinka HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "HTTP proxy port"
-msgstr "Port za HTTP"
+msgstr "Port HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid "HTTP proxy username"
-msgstr "KorisniÄko ime za HTTP"
+msgstr "KorisniÄko ime HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "ID or alias of the component to be shown by default at start-up."
@@ -19561,10 +19151,10 @@ msgid ""
 "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."
+"Ako je izabrano, povezivanje na posrednika zahteva autentifikaciju. "
+"KorisniÄko ime se Äita iz Gkonf kljuÄa â/apps/evolution/shell/network_config/"
+"authentication_userâ, a lozinka ili iz gnomovog priveska ili iz datoteke "
+"lozinki â~/.gnome2_private/Evolutionâ."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "Initial attachment view"
@@ -19576,15 +19166,15 @@ msgstr "Polazna fascikla izbiraÄa datoteka"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Initial folder for GtkFileChooser dialogs."
-msgstr "Polazna fascikla za prozorÄad GtkFileChooser."
+msgstr "Polazna fascikla za prozorÄiÄe izbiraÄa datoteka."
 
 #: ../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."
+"Polazni pregled za alatke trake priloga: 0 â pregled ikonama, 1 â pregled "
+"spiskom."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Last upgraded configuration version"
@@ -19601,27 +19191,27 @@ msgstr "DomaÄini bez posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr "Lozinka za autentifikaciju prilikom koriÅÄenja posrednika za HTTP."
+msgstr "Lozinka za autentifikaciju prilikom koriÅÄenja HTTP posredovanja."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Proxy configuration mode"
-msgstr "Model podeÅavanja posrednika"
+msgstr "ReÅim podeÅavanja posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "SOCKS proxy host name"
-msgstr "DomaÄin posrednika za SOCKS"
+msgstr "Ime domaÄina SOCKS posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "SOCKS proxy port"
-msgstr "Port posrednika za SOCKS"
+msgstr "Port SOCKS posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid "Secure HTTP proxy host name"
-msgstr "DomaÄin posrednika za HTTP"
+msgstr "Ime domaÄina bezbednog HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Secure HTTP proxy port"
-msgstr "Port sigurnog posrednika za HTTP"
+msgstr "Port bezbednog HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid ""
@@ -19630,21 +19220,21 @@ msgid ""
 "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â."
+"Izaberite naÄin podeÅavanja posrednika. PodrÅane vrednosti su: 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"
-msgstr "BoÄna traka je vidljiva"
+msgstr "BoÄna povrÅ je vidljiva"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Skip development warning dialog"
-msgstr "PreskoÄi prozorÄe sa upozorenjem o razvoju"
+msgstr "Preskakanje prozorÄeta sa upozorenjem o razvoju"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:35 ../shell/main.c:314
 msgid "Start in offline mode"
-msgstr "PoÄni rad van mreÅe"
+msgstr "ZapoÄinje rad van mreÅe"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:36
 msgid "Statusbar is visible"
@@ -19668,15 +19258,15 @@ msgstr "Podrazumevana Y koordinata glavnog prozora."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default height for the main window, in pixels."
-msgstr "Podrazumevana visina prozora za poruku, u pikselima."
+msgstr "Podrazumevana visina prozora za poruku, u taÄkama."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid "The default width for the main window, in pixels."
-msgstr "Podrazumevana Åirina glavnog prozora, u pikselima."
+msgstr "Podrazumevana Åirina glavnog prozora, u taÄkama."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The default width for the sidebar, in pixels."
-msgstr "Podrazumevana Åirina boÄne trake, u pikselima."
+msgstr "Podrazumevana Åirina boÄne trake, u taÄkama."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid ""
@@ -19688,15 +19278,15 @@ msgstr ""
 
 #: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy HTTP through."
-msgstr "Naziv maÅine za puÅtanje kroz HTTP posrednika."
+msgstr "Naziv maÅine za HTTP posredovanje."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid "The machine name to proxy secure HTTP through."
-msgstr "Naziv maÅine za puÅtanje kroz bezbednog HTTP posrednika."
+msgstr "Naziv maÅine za bezbedno HTTP posredovanje."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid "The machine name to proxy socks through."
-msgstr "Naziv maÅine za puÅtanje socks posrednika."
+msgstr "Naziv maÅine za socks posredovanje."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
@@ -19704,7 +19294,7 @@ msgid ""
 "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."
+"kroz koji posredujete."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
@@ -19712,7 +19302,7 @@ msgid ""
 "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."
+"kroz koji posredujete."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
@@ -19720,7 +19310,7 @@ msgid ""
 "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."
+"kroz koji posredujete."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid ""
@@ -19739,7 +19329,7 @@ msgid ""
 "(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 neposredno povezani, bez koriÅÄenja "
+"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)."
@@ -19754,11 +19344,11 @@ msgstr "Adresa sa vrednostima za podeÅavanje posrednika."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Use HTTP proxy"
-msgstr "Koristi posrednika za HTTP"
+msgstr "Koristi HTTP posrednika"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:55
-msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr "KorisniÄko ime za autentifikaciju kada se koristi posrednik za HTTP."
+msgid "Username to pass as authentication when doing HTTP proxying."
+msgstr "KorisniÄko ime za autentifikaciju prilikom koriÅÄenja HTTP posredovanja."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether Evolution will start up in offline mode instead of online mode."
@@ -19766,30 +19356,30 @@ msgstr "Da li Äe se Evolucija pokrenuti u reÅimu za rad van mreÅe."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether or not the window should be maximized."
-msgstr "Da li da prozor bude uveÄan do kraja."
+msgstr "Da li Äe prozor biti uveÄan do kraja."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the sidebar should be visible."
-msgstr "Da li da boÄna traka bude vidljiva."
+msgstr "Da li Äe boÄna povrÅ biti vidljiva."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid "Whether the status bar should be visible."
-msgstr "Da li da traka statusa bude vidljiva."
+msgstr "Da li Äe traka stanja biti vidljiva."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the toolbar should be visible."
-msgstr "Da li da traka alata bude vidljiva."
+msgstr "Da li Äe traka alata biti 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."
+"Da li Äe biti prikazano prozorÄe sa upozorenjem u razvojnim verzijama "
+"Evolucije."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Whether the window buttons should be visible."
-msgstr "Da li da dugmad prozora budu vidljiva."
+msgstr "Da li Äe dugmad prozora biti vidljiva."
 
 #: ../shell/apps_evolution_shell.schemas.in.h:63
 msgid "Window button style"
@@ -19799,11 +19389,11 @@ msgstr "Stil dugmadi prozora"
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
-#: ../shell/e-shell-content.c:699 ../shell/e-shell-content.c:700
+#: ../shell/e-shell-content.c:729 ../shell/e-shell-content.c:730
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../shell/e-shell-content.c:742
+#: ../shell/e-shell-content.c:773
 msgid "Save Search"
 msgstr "SaÄuvaj pretragu"
 
@@ -19831,22 +19421,18 @@ msgstr " _u "
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../shell/e-shell-utils.c:225
-msgid "iCalendar (.ics)"
-msgstr "iKalendar (.ics)"
-
 #: ../shell/e-shell-utils.c:246
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
 #: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
-msgstr ""
+msgstr "Äuvam stanje korisniÄkog suÄelja"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:648
+#: ../shell/e-shell-window-actions.c:645
 msgid "translator-credits"
 msgstr ""
 "Igor NestoroviÄ <igor prevod org>\n"
@@ -19854,291 +19440,278 @@ msgstr ""
 "\n"
 "http://prevod.org â prevod na srpski jezik."
 
-#: ../shell/e-shell-window-actions.c:659
+#: ../shell/e-shell-window-actions.c:656
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:921
-#, fuzzy
-#| msgid "Categories List"
+#: ../shell/e-shell-window-actions.c:902
 msgid "Categories Editor"
-msgstr "Spisak kategorija"
+msgstr "UreÄivaÄ kategorija"
 
-#: ../shell/e-shell-window-actions.c:1256
+#: ../shell/e-shell-window-actions.c:1237
 msgid "Bug Buddy is not installed."
 msgstr "BubaÅdajin pomoÄnik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:1258
+#: ../shell/e-shell-window-actions.c:1239
 msgid "Bug Buddy could not be run."
 msgstr "BubaÅdajin pomoÄnik ne moÅe biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1420
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:1444
-#: ../shell/e-shell-window-actions.c:1458
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1439
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1446
 msgid "_Contents"
 msgstr "_SadrÅaj"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1448
 msgid "Open the Evolution User Guide"
-msgstr "Otvori Evolucijino korisniÄko uputstvo"
-
-#: ../shell/e-shell-window-actions.c:1493
-msgid "Evolution _FAQ"
-msgstr "PomoÄ za Evoluciju"
-
-#: ../shell/e-shell-window-actions.c:1495
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "Otvara veb stranicu sa Äesto postavljanim pitanjima"
+msgstr "Otvorite korisniÄko uputstvo Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1474
 msgid "_Forget Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1476
 msgid "Forget all remembered passwords"
-msgstr "Zaboravi sve zapamÄene lozinke"
+msgstr "Zaboravite sve zapamÄene lozinke"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1481
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Import data from other programs"
-msgstr "Uvezi podatke iz drugih programa"
+msgstr "Uvezite podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1488
 msgid "New _Window"
 msgstr "Nov p_rozor"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1490
 msgid "Create a new window displaying this view"
-msgstr "Otvara nov prozor za prikaz ovog pregleda"
+msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:1528
-#, fuzzy
-#| msgid "Available Fields"
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Available Cate_gories"
-msgstr "Dostupna polja"
+msgstr "Dostupne _kategorije"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1504
 msgid "Manage available categories"
-msgstr ""
+msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1516
 msgid "_Quick Reference"
-msgstr "_Kratki podsetnik"
+msgstr "_Kratak podsetnik"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1518
 msgid "Show Evolution's shortcut keys"
-msgstr "PrikaÅi preÄice tastature Evolucije"
+msgstr "PrikaÅite preÄice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1525
 msgid "Exit the program"
-msgstr "Izlazak iz programa"
+msgstr "IzaÄite iz programa"
 
-#: ../shell/e-shell-window-actions.c:1556
+#: ../shell/e-shell-window-actions.c:1530
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1532
 msgid "Construct a more advanced search"
-msgstr "Obrazuj napredniju pretragu"
+msgstr "Obrazujte napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1539
 msgid "Clear the current search parameters"
-msgstr "OÄisti trenutne parametre pretrage"
+msgstr "OÄistite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1544
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi saÄuvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1546
 msgid "Manage your saved searches"
-msgstr "Upravlja VaÅim saÄuvanim pretragama"
+msgstr "Upravljajte vaÅim saÄuvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1553
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1558
 msgid "_Find Now"
 msgstr "Pro_naÄi sada"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Execute the current search parameters"
-msgstr "IzvrÅi trenutne parametre pretrage"
+msgstr "IzvrÅite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1565
 msgid "_Save Search..."
 msgstr "_SaÄuvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1567
 msgid "Save the current search parameters"
-msgstr "SaÄuvaj trenutne parametre pretrage"
+msgstr "SaÄuvajte parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1579
 msgid "Submit _Bug Report..."
 msgstr "PoÅalji izveÅtaj o _greÅci..."
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1581
 msgid "Submit a bug report using Bug Buddy"
-msgstr "PoÅalji izveÅtaj o greÅci BubaÅdajinim pomoÄnikom"
+msgstr "PoÅaljite izveÅtaj o greÅci BubaÅdajinim pomoÄnikom"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1586
 msgid "_Work Offline"
 msgstr "Ra_d van mreÅe"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1588
 msgid "Put Evolution into offline mode"
-msgstr "Postavi Evoluciju u rad van mreÅe"
+msgstr "Postavite Evoluciju u rad van mreÅe"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1593
 msgid "_Work Online"
 msgstr "_Rad na mreÅi"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1595
 msgid "Put Evolution into online mode"
-msgstr "Postavi Evoluciju u rad na mreÅi"
+msgstr "Postavite Evoluciju u rad na mreÅi"
 
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1623
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1630
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1637
 msgid "_Search"
 msgstr "_PretraÅi"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1644
 msgid "_Switcher Appearance"
 msgstr "Izgled _prebacivaÄa"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1658
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1687
 msgid "Show Side _Bar"
-msgstr "PrikaÅi boÄnu _traku"
+msgstr "PrikaÅi _boÄnu povrÅ"
 
-#: ../shell/e-shell-window-actions.c:1715
+#: ../shell/e-shell-window-actions.c:1689
 msgid "Show the side bar"
-msgstr "PrikaÅi boÄnu traku"
+msgstr "PrikaÅite boÄnu povrÅ"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1695
 msgid "Show _Buttons"
 msgstr "PrikaÅi _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1723
+#: ../shell/e-shell-window-actions.c:1697
 msgid "Show the switcher buttons"
-msgstr "PrikaÅi dugmad prebacivaÄa"
+msgstr "PrikaÅite dugmad prebacivaÄa"
 
-#: ../shell/e-shell-window-actions.c:1729
+#: ../shell/e-shell-window-actions.c:1703
 msgid "Show _Status Bar"
-msgstr "PrikaÅi traku _statusa"
+msgstr "PrikaÅi traku _stanja"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Show the status bar"
-msgstr "PrikaÅi traku statusa"
+msgstr "PrikaÅite traku stanja"
 
-#: ../shell/e-shell-window-actions.c:1737
+#: ../shell/e-shell-window-actions.c:1711
 msgid "Show _Tool Bar"
 msgstr "PrikaÅi traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1739
+#: ../shell/e-shell-window-actions.c:1713
 msgid "Show the tool bar"
-msgstr "PrikaÅi traku alata"
+msgstr "PrikaÅite traku alata"
 
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1735
 msgid "_Icons Only"
-msgstr "Samo _ikone"
+msgstr "Samo _ikonice"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Display window buttons with icons only"
-msgstr "Prikazuje dugmad prozora samo sa ikonama"
+msgstr "PrikaÅite dugmad prozora samo sa ikonicama"
 
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1742
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1744
 msgid "Display window buttons with text only"
-msgstr "Prikazuje dugmad prozora samo sa tekstom"
+msgstr "PrikaÅite dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Icons _and Text"
-msgstr "Ikone _i tekst"
+msgstr "Ikonice _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1751
 msgid "Display window buttons with icons and text"
-msgstr "Prikazuje dugmad prozora sa ikonama i tekstom"
+msgstr "PrikaÅite dugmad prozora sa ikonicama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1782
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1784
+#: ../shell/e-shell-window-actions.c:1758
 msgid "Display window buttons using the desktop toolbar setting"
-msgstr ""
-"Prikazuje dugmad prozora koriÅÄenjem postavke treake alata radne povrÅine"
+msgstr "PrikaÅite dugmad prozora koristeÄi podeÅavanja trake alata radne povrÅi"
 
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1766
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1768
 msgid "Create or edit views"
-msgstr "Pravi ili menja preglede"
+msgstr "Napravite ili izmenite preglede"
 
-#: ../shell/e-shell-window-actions.c:1799
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Save Custom View..."
 msgstr "SaÄuvaj prilagoÄen pregled..."
 
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Save current custom view"
-msgstr "Äuva trenutni korisniÄki pregled"
+msgstr "SaÄuvajte trenutni korisniÄki pregled"
 
-#: ../shell/e-shell-window-actions.c:1808
+#: ../shell/e-shell-window-actions.c:1782
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1818
+#: ../shell/e-shell-window-actions.c:1792
 msgid "Custom View"
 msgstr "PrilagoÄen pregled"
 
-#: ../shell/e-shell-window-actions.c:1820
+#: ../shell/e-shell-window-actions.c:1794
 msgid "Current view is a customized view"
-msgstr "Trenutan pregled je korisnik podesio"
+msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../shell/e-shell-window-actions.c:1830
+#: ../shell/e-shell-window-actions.c:1804
 msgid "Change the page settings for your current printer"
-msgstr "Izmeni postavke stranice za trenutni ÅtampaÄ"
+msgstr "Izmenite postavke stranice za trenutni ÅtampaÄ"
 
-#: ../shell/e-shell-window-actions.c:2215
+#: ../shell/e-shell-window-actions.c:2189
 #, c-format
 msgid "Switch to %s"
 msgstr "PreÄi na %s"
 
-#: ../shell/e-shell-window-actions.c:2430
+#: ../shell/e-shell-window-actions.c:2404
 msgid "Execute these search parameters"
-msgstr "IzvrÅi ove parametre pretrage"
+msgstr "IzvrÅite ove parametre pretrage"
 
 #. Translators: This is used for the main window title.
 #: ../shell/e-shell-window-private.c:584
 #, c-format
 msgid "%s - Evolution"
-msgstr "%s - Evolucija"
+msgstr "%s â Evolucija"
 
 #: ../shell/e-shell-window.c:442
 msgid "New"
@@ -20146,15 +19719,15 @@ msgstr "Novo"
 
 #: ../shell/e-shell.c:361
 msgid "Preparing to go offline..."
-msgstr "Priprema za rad van mreÅe..."
+msgstr "Pripremam se za rad van mreÅe..."
 
 #: ../shell/e-shell.c:414
 msgid "Preparing to go online..."
-msgstr "Priprema za rad na mreÅi..."
+msgstr "Pripremam se za rad na mreÅi..."
 
 #: ../shell/e-shell.c:476
 msgid "Preparing to quit..."
-msgstr "Priprema za kraj..."
+msgstr "Pripremam se da izaÄem..."
 
 #. Preview/Alpha/Beta version warning message
 #: ../shell/main.c:195
@@ -20190,7 +19763,7 @@ msgstr ""
 "su skloni nasilnom ponaÅanju ili besu.\n"
 "\n"
 "Nadamo se da Äete uÅivati u plodovima naÅeg napornog rada, i \n"
-"Åeljno iÅÄekujemo VaÅ doprinos!\n"
+"Åeljno iÅÄekujemo vaÅ doprinos!\n"
 
 #: ../shell/main.c:219
 msgid ""
@@ -20211,6 +19784,8 @@ msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgstr ""
+"PokreÄe Evoluciju prikazujuÄi odreÄene komponente. Dostupne opcije su: "
+"âmailâ, âcalendarâ, âcontactsâ, âtasksâ i âmemosâ"
 
 #: ../shell/main.c:312
 msgid "Apply the given geometry to the main window"
@@ -20222,7 +19797,7 @@ msgstr "PoÄni rad na mreÅi"
 
 #: ../shell/main.c:318
 msgid "Ignore network availability"
-msgstr ""
+msgstr "Zanemari dostupnost mreÅe"
 
 #: ../shell/main.c:320
 msgid "Start in \"express\" mode"
@@ -20238,11 +19813,11 @@ msgstr "PoÅalji izlaz o greÅkama iz svih delova u datoteku."
 
 #: ../shell/main.c:328
 msgid "Disable loading of any plugins."
-msgstr "OnemoguÄava uÄitavanje svih dodataka."
+msgstr "IskljuÄi uÄitavanje svih dodataka."
 
 #: ../shell/main.c:330
 msgid "Disable preview pane of Mail, Contacts and Tasks."
-msgstr "OnemoguÄava okno za pregled poÅte, kontakata i zadataka."
+msgstr "IskljuÄi okno za pregled poÅte, kontakta i zadataka."
 
 #: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
@@ -20251,11 +19826,11 @@ msgstr "Uvezi adrese datoteka datih kao ostatak argumenata."
 # shell:noshell-reason title
 #: ../shell/main.c:336
 msgid "Request a running Evolution process to quit"
-msgstr "Zahtevaj kraj pokrenutog procesa Evolucije"
+msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
 #: ../shell/main.c:511 ../shell/main.c:519
 msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolucija rukovodilac liÄnim podatacima i klijent e-poÅte"
+msgstr "â Evolucija rukovodilac liÄnim podatacima i klijent e-poÅte"
 
 #: ../shell/main.c:582
 #, c-format
@@ -20263,7 +19838,7 @@ msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: --online i --offline se ne mogu koristiti zajedno.\n"
+"%s: â--onlineâ i â--offlineâ se ne mogu koristiti zajedno.\n"
 "  Pokrenite â%s --helpâ za viÅe podataka.\n"
 
 #: ../shell/main.c:588
@@ -20272,7 +19847,7 @@ msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
-"%s: --force-online i --force-offline se ne mogu koristiti zajedno.\n"
+"%s: â--force-onlineâ i â--offlineâ se ne mogu koristiti zajedno.\n"
 "  Pokrenite â%s --helpâ za viÅe podataka.\n"
 
 #: ../shell/shell.error.xml.h:1
@@ -20282,7 +19857,7 @@ msgstr "Sigurno Åelite da sve zapamÄene lozinke budu zaboravljene?"
 # shell:upgrade-remove-1-4 primary
 #: ../shell/shell.error.xml.h:2
 msgid "Cannot upgrade directly from version {0}"
-msgstr "Ne mogu da izvrÅim nadogradnju iz verzije {0}"
+msgstr "Ne mogu direktno da nadogradim sa izdanja {0}"
 
 #: ../shell/shell.error.xml.h:3
 msgid "Continue Anyway"
@@ -20294,8 +19869,9 @@ msgid ""
 "a workaround you might try first upgrading to Evolution 2, and then "
 "upgrading to Evolution 3."
 msgstr ""
-"Evolucija viÅe ne podrÅava nadogradnju iz verzije {0}. Kao reÅenje moÅete da "
-"pokuÅate nadogradnju u Evoluciju 2, i tek onda u Evoluciju 3."
+"Evolucija viÅe ne podrÅava direktnu nadogradnju sa izdanja {0}. MeÄutim, kao "
+"reÅenje moÅete prvo da pokuÅate da nadogradite na Evoluciju 2, a zatim na "
+"Evoluciju 3."
 
 #: ../shell/shell.error.xml.h:5
 msgid ""
@@ -20307,11 +19883,11 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:7
 msgid "Quit Now"
-msgstr "Napusti odmah"
+msgstr "IzaÄi"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Upgrade from previous version failed:"
-msgstr "Neuspela nadogradnja sa prethodne verzije:"
+msgstr "Neuspela nadogradnja sa prethodnog izdanja:"
 
 #: ../shell/shell.error.xml.h:9
 msgid "_Forget"
@@ -20336,7 +19912,7 @@ msgstr "_Probna stavka"
 
 #: ../shell/test/e-test-shell-backend.c:58
 msgid "Create a new test item"
-msgstr "Napravi novu probnu stavku"
+msgstr "Napravite novu probnu stavku"
 
 #: ../shell/test/e-test-shell-backend.c:66
 msgctxt "New"
@@ -20345,7 +19921,7 @@ msgstr "Probni _izvor"
 
 #: ../shell/test/e-test-shell-backend.c:68
 msgid "Create a new test source"
-msgstr "Napravi novi probni izvor"
+msgstr "Napravite novi probni izvor"
 
 #: ../smclient/eggdesktopfile.c:165
 #, c-format
@@ -20360,7 +19936,7 @@ msgstr "Neprepoznatljiva verzija datoteke desktop â%sâ"
 #: ../smclient/eggdesktopfile.c:957
 #, c-format
 msgid "Starting %s"
-msgstr "Pokretanje %s"
+msgstr "PokreÄem %s"
 
 #: ../smclient/eggdesktopfile.c:1098
 #, c-format
@@ -20375,7 +19951,7 @@ msgstr "Neprepoznatljiva opcija uÄitavanja: %d"
 #: ../smclient/eggdesktopfile.c:1365
 #, c-format
 msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Nije moguÄe proslediti adrese dokumenata na desktop unos âType=Linkâ"
+msgstr "Ne mogu da prosledim adrese dokumenata na âType=Linkâ unos"
 
 #: ../smclient/eggdesktopfile.c:1386
 #, c-format
@@ -20417,7 +19993,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"Sertifikat â%sâ je CA sertifikat.\n"
+"Uverenje â%sâ je CA uverenje.\n"
 "\n"
 "Uredite postavke poverenja:"
 
@@ -20427,8 +20003,8 @@ msgid ""
 "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"
+"PoÅto verujete izdavaocu ovog uverenja, onda verujete i u autentiÄnost ovog "
+"uverenja osim ako ovde ne naznaÄite drugaÄije"
 
 #: ../smime/gui/cert-trust-dialog.c:148
 msgid ""
@@ -20436,25 +20012,21 @@ msgid ""
 "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"
+"PoÅto ne verujete izdavaocu ovog uverenja, onda ne verujete ni u autentiÄnost "
+"ovog uverenja osim ako ovde ne naznaÄite drugaÄije"
 
 #: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
 #: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
-msgstr "Ime sertifikata"
+msgstr "Naziv uverenja"
 
 #: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
-#, fuzzy
-#| msgid "Or_ganization:"
 msgid "Issued To Organization"
-msgstr "Or_ganizacija:"
+msgstr "Izdato je organizaciji"
 
 #: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
-#, fuzzy
-#| msgid "Organizational Unit (OU)"
 msgid "Issued To Organizational Unit"
-msgstr "Organizaciona jedinica (OU)"
+msgstr "Izdato je organizacionoj jedinici"
 
 #: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
 #: ../smime/gui/certificate-manager.c:114 ../smime/gui/smime-ui.ui.h:32
@@ -20474,26 +20046,20 @@ msgstr "Izdato od"
 
 #: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
 #: ../smime/gui/certificate-manager.c:117
-#, fuzzy
-#| msgid "Or_ganization:"
 msgid "Issued By Organization"
-msgstr "Or_ganizacija:"
+msgstr "Izdala je organizacija"
 
 #: ../smime/gui/certificate-manager.c:80
 #: ../smime/gui/certificate-manager.c:100
 #: ../smime/gui/certificate-manager.c:118
-#, fuzzy
-#| msgid "Organizational Unit (OU)"
 msgid "Issued By Organizational Unit"
-msgstr "Organizaciona jedinica (OU)"
+msgstr "Izdala je organizaciona jedinica"
 
 #: ../smime/gui/certificate-manager.c:81
 #: ../smime/gui/certificate-manager.c:101
 #: ../smime/gui/certificate-manager.c:119
-#, fuzzy
-#| msgid "Issuer"
 msgid "Issued"
-msgstr "Izdavalac"
+msgstr "Izdato"
 
 #: ../smime/gui/certificate-manager.c:82
 #: ../smime/gui/certificate-manager.c:102
@@ -20511,54 +20077,51 @@ msgstr "SHA1 otisak"
 #: ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:122 ../smime/gui/smime-ui.ui.h:26
 msgid "MD5 Fingerprint"
-msgstr "MD5 otisak"
+msgstr "MD5 Otisak"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
-msgid "E-Mail Address"
-msgstr "Elektronska adresa"
+msgid "Email Address"
+msgstr "Adresa eâpoÅte"
 
-#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:570
 msgid "Select a certificate to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:587
+#: ../smime/gui/certificate-manager.c:583
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../smime/gui/certificate-manager.c:622
-#, fuzzy
-#| msgid "Failed to import user's certificate"
+#: ../smime/gui/certificate-manager.c:618
 msgid "Failed to import certificate"
-msgstr "Neuspeo uvoz korisniÄkog sertifikata"
+msgstr "Nisam uspeo da uvezem uverenje"
 
-#: ../smime/gui/certificate-manager.c:990
+#: ../smime/gui/certificate-manager.c:985
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1008
+#: ../smime/gui/certificate-manager.c:1003
 msgid "All email certificate files"
-msgstr "Sve datoteke sertifikata poÅte"
+msgstr "Sve datoteke uverenja poÅte"
 
-#: ../smime/gui/certificate-manager.c:1026
+#: ../smime/gui/certificate-manager.c:1021
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA sertifikata"
 
 #: ../smime/gui/certificate-viewer.c:338
 #, c-format
 msgid "Certificate Viewer: %s"
-msgstr "PregledaÄ sertifikata: %s"
+msgstr "PregledaÄ uverenja: %s"
 
 #: ../smime/gui/component.c:46
-#, fuzzy, c-format
-#| msgid "Enter the password for `%s'"
+#, c-format
 msgid "Enter the password for '%s'"
 msgstr "Unesite lozinku za â%sâ"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:69
 msgid "Enter new password for certificate database"
-msgstr "Unesite novu lozinku za bazu sertifikata"
+msgstr "Unesite novu lozinku za bazu uverenja"
 
 #: ../smime/gui/component.c:71
 msgid "Enter new password"
@@ -20571,7 +20134,7 @@ msgid ""
 "Issued to:\n"
 "  Subject: %s\n"
 msgstr ""
-"Izdato:\n"
+"Kome je izdato:\n"
 "  Naslov: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:117
@@ -20580,58 +20143,56 @@ msgid ""
 "Issued by:\n"
 "  Subject: %s\n"
 msgstr ""
-"Izdao:\n"
+"Izdao je:\n"
 "  Naslov: %s\n"
 
 #: ../smime/gui/e-cert-selector.c:169
 msgid "Select certificate"
-msgstr "Izaberite sertifikat"
+msgstr "Izaberite uverenje"
 
 #: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
-msgstr "<nije deo sertifikata>"
+msgstr "<nije deo uverenja>"
 
 #: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "Izdavaoci"
 
 #: ../smime/gui/smime-ui.ui.h:3
-#, fuzzy
-#| msgid "Backup All"
 msgid "Backup _All"
-msgstr "Rezerva svega"
+msgstr "Napravi rezervu _svega"
 
 #: ../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, "
+"Pre verovanja ovom izdavaocu uverenja, prvo pregledajte njegovo uverenje, "
 "politiku i procedure (ako su dostupni)."
 
 #: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1088
 msgid "Certificate"
-msgstr "Sertifikat"
+msgstr "Uverenje"
 
 #: ../smime/gui/smime-ui.ui.h:6
 msgid "Certificate Authority Trust"
-msgstr "Poverenje izdavaocu sertifikata"
+msgstr "Poverenje izdavaocu uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Fields"
-msgstr "Polja sertifikata"
+msgstr "Polja uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:8
 msgid "Certificate Hierarchy"
-msgstr "Hijerarhija sertifikata"
+msgstr "Hijerarhija uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "Certificate details"
-msgstr "Detalji sertifikata"
+msgstr "Detalji uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificates Table"
-msgstr "Tabela sertifikata"
+msgstr "Tabela uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:11
 msgid "Common Name (CN)"
@@ -20639,23 +20200,23 @@ msgstr "ZajedniÄko ime (CN)"
 
 #: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
-msgstr "Sertifikati kontakta"
+msgstr "Uverenja kontakta"
 
 #: ../smime/gui/smime-ui.ui.h:14
 msgid "Do not trust the authenticity of this certificate"
-msgstr "Ne veruj u autentiÄnost ovog sertifikata"
+msgstr "Ne veruj u verodostojnost ovog uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:15
 msgid "Email Certificate Trust Settings"
-msgstr "PodeÅavanja poverenja u sertifikate e-poÅte"
+msgstr "PodeÅavanja poverenja u uverenja e-poÅte"
 
 #: ../smime/gui/smime-ui.ui.h:16
 msgid "Email Recipient Certificate"
-msgstr "Sertifikat primaoca e-poruke"
+msgstr "Uverenje primaoca e-poruke"
 
 #: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Signer Certificate"
-msgstr "Sertifikat potpisnika e-poruke"
+msgstr "Uverenje potpisnika e-poruke"
 
 #: ../smime/gui/smime-ui.ui.h:18
 msgid "Expires On"
@@ -20671,11 +20232,11 @@ msgstr "Otisci"
 
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "Issued On"
-msgstr "Izdat"
+msgstr "Izdato je"
 
 #: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued To"
-msgstr "Izdato za"
+msgstr "Kome je izdato"
 
 #: ../smime/gui/smime-ui.ui.h:27
 msgid "Organization (O)"
@@ -20687,33 +20248,31 @@ msgstr "Organizaciona jedinica (OU)"
 
 #: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
 msgid "SSL Client Certificate"
-msgstr "Sertifikat SSL klijenta"
+msgstr "Uverenje SSL klijenta"
 
 #: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
 msgid "SSL Server Certificate"
-msgstr "Sertifikat SSL servera"
+msgstr "Uverenje SSL servera"
 
 #: ../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:"
+msgstr "Ovo uverenje je provereno za sledeÄe potrebe:"
 
 #: ../smime/gui/smime-ui.ui.h:34
 msgid "Trust the authenticity of this certificate"
-msgstr "Veruj u autentiÄnost ovog sertifikata"
+msgstr "Veruj u verodostojnost ovog uverenja"
 
 #: ../smime/gui/smime-ui.ui.h:35
 msgid "Trust this CA to identify email users."
-msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje e-adresa."
+msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje e-adresa."
 
 #: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust this CA to identify software developers."
-msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje programera."
+msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje programera."
 
 #: ../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."
+msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje veb stranica."
 
 #: ../smime/gui/smime-ui.ui.h:38
 msgid "Validity"
@@ -20721,35 +20280,33 @@ msgstr "Ispravnost"
 
 #: ../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:"
+msgstr "Posedujete uverenja ovih organizacija koja vas odreÄuju:"
 
 #: ../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:"
+msgstr "Posedujete uverenja koja odreÄuju ove izdavaoce uverenja:"
 
 #: ../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:"
+msgstr "Posedujete uverenja koja odreÄuju ove osobe:"
 
 #: ../smime/gui/smime-ui.ui.h:42
 msgid "Your Certificates"
-msgstr "VaÅi sertifikati"
+msgstr "VaÅa uverenja"
 
 #. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:44
-#, fuzzy
-#| msgid "Backup"
 msgid "_Backup"
-msgstr "Rezerva"
+msgstr "Napravi _rezervu"
 
 #: ../smime/gui/smime-ui.ui.h:45
 msgid "_Edit CA Trust"
-msgstr "_Uredi poverenje u CA"
+msgstr "_Uredi CA poverenje"
 
 #: ../smime/lib/e-cert-db.c:906
 msgid "Certificate already exists"
-msgstr "Sertifikat veÄ postoji"
+msgstr "Uverenje veÄ postoji"
 
 #: ../smime/lib/e-cert.c:228 ../smime/lib/e-cert.c:238
 msgid "%d/%m/%Y"
@@ -20766,19 +20323,19 @@ msgstr "Åifruj"
 
 #: ../smime/lib/e-cert.c:527
 msgid "Version"
-msgstr "Verzija"
+msgstr "Izdanje"
 
 #: ../smime/lib/e-cert.c:542
 msgid "Version 1"
-msgstr "Verzija 1"
+msgstr "Izdanje 1"
 
 #: ../smime/lib/e-cert.c:545
 msgid "Version 2"
-msgstr "Verzija 2"
+msgstr "Izdanje 2"
 
 #: ../smime/lib/e-cert.c:548
 msgid "Version 3"
-msgstr "Verzija 3"
+msgstr "Izdanje 3"
 
 #: ../smime/lib/e-cert.c:630
 msgid "PKCS #1 MD2 With RSA Encryption"
@@ -20793,22 +20350,16 @@ msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA Åifrovanjem"
 
 #: ../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"
+msgstr "PKCS #1 SHA-256 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"
+msgstr "PKCS #1 SHA-384 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"
+msgstr "PKCS #1 SHA-512 sa RSA Åifrovanjem"
 
 #: ../smime/lib/e-cert.c:672
 msgid "PKCS #1 RSA Encryption"
@@ -20816,15 +20367,15 @@ msgstr "PKCS #1 RSA Åifrovanje"
 
 #: ../smime/lib/e-cert.c:675
 msgid "Certificate Key Usage"
-msgstr "Upotreba kljuÄa sertifikata"
+msgstr "Upotreba kljuÄa uverenja"
 
 #: ../smime/lib/e-cert.c:678
 msgid "Netscape Certificate Type"
-msgstr "Netscape tip sertifikata"
+msgstr "Tip Netskejp uverenja"
 
 #: ../smime/lib/e-cert.c:681
 msgid "Certificate Authority Key Identifier"
-msgstr "OdreÄivaÄ kljuÄa izdavaoca sertifikata"
+msgstr "OdreÄivaÄ kljuÄa izdavaoca uverenja"
 
 #: ../smime/lib/e-cert.c:693
 #, c-format
@@ -20853,7 +20404,7 @@ msgstr "Javni kljuÄ subjekta"
 
 #: ../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"
+msgstr "GreÅka: ne mogu da obradim proÅirenje"
 
 #: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
 msgid "Object Signer"
@@ -20861,11 +20412,11 @@ msgstr "Potpisnik predmeta"
 
 #: ../smime/lib/e-cert.c:840
 msgid "SSL Certificate Authority"
-msgstr "SSL izdavaÄ sertifikata"
+msgstr "IzdavaÄ SSL uverenja"
 
 #: ../smime/lib/e-cert.c:844
 msgid "Email Certificate Authority"
-msgstr "IzdavaÄ sertifikata e-poÅte"
+msgstr "IzdavaÄ uverenja e-poÅte"
 
 #: ../smime/lib/e-cert.c:872
 msgid "Signing"
@@ -20889,7 +20440,7 @@ msgstr "Saglasnost kljuÄa"
 
 #: ../smime/lib/e-cert.c:892
 msgid "Certificate Signer"
-msgstr "Potpisnik sertifikata"
+msgstr "Potpisnik uverenja"
 
 #: ../smime/lib/e-cert.c:896
 msgid "CRL Signer"
@@ -20922,11 +20473,11 @@ msgstr "%s = %s"
 
 #: ../smime/lib/e-cert.c:1102 ../smime/lib/e-cert.c:1225
 msgid "Certificate Signature Algorithm"
-msgstr "Algoritam potpisa sertifikata"
+msgstr "Algoritam potpisa uverenja"
 
 #: ../smime/lib/e-cert.c:1111
 msgid "Issuer"
-msgstr "Izdavalac"
+msgstr "IzdavaÄ"
 
 #: ../smime/lib/e-cert.c:1166
 msgid "Issuer Unique ID"
@@ -20938,7 +20489,7 @@ msgstr "Jedinstveni IB subjekta"
 
 #: ../smime/lib/e-cert.c:1231
 msgid "Certificate Signature Value"
-msgstr "Vrednost potpisa sertifikata"
+msgstr "Vrednost potpisa uverenja"
 
 #: ../smime/lib/e-pkcs12.c:249
 msgid "PKCS12 File Password"
@@ -20950,7 +20501,7 @@ msgstr "Unesite lozinku za PKCS12 datoteku:"
 
 #: ../smime/lib/e-pkcs12.c:352
 msgid "Imported Certificate"
-msgstr "UveÅen sertifikat"
+msgstr "UveÅeno uverenje"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -20962,7 +20513,7 @@ msgstr "_Karte adresara"
 
 #: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
 msgid "_List View"
-msgstr "Pregled _spiska"
+msgstr "Pregled _spiskom"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20982,19 +20533,19 @@ msgstr "Pregled _radne nedelje"
 
 #: ../views/mail/galview.xml.h:1
 msgid "As Sent Folder for Wi_de View"
-msgstr "Kao fascikla Poslato za _Åiroki prikaz"
+msgstr "Kao fascikla slanja za _Åiroki prikaz"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
-msgstr "Kao fascikla _Poslato"
+msgstr "Kao fascikla _slanja"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "Prema s_tatusu"
+msgstr "Prema s_tanju"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
-msgstr "Prema po_Åiljaocu"
+msgstr "Prema poÅiljaoc_u"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
@@ -21002,11 +20553,11 @@ msgstr "Prema _naslovu"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "Prema oznaci _sleÄenja"
+msgstr "Prema oznaci _praÄenja"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
-msgstr "Za _Åiroki prikaz"
+msgstr "Za Å_iroki prikaz"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
@@ -21022,7 +20573,7 @@ msgstr "Sa _rokom"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Status"
-msgstr "Sa _statusom"
+msgstr "Sa _stanjem"
 
 # Univerzalno vreme, ili UT
 # Valjda UV?
@@ -21033,7 +20584,7 @@ msgstr "Sa _statusom"
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:780
 msgid "UTC"
-msgstr "UTC"
+msgstr "KUV (UTC)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
@@ -21045,7 +20596,7 @@ msgstr "Vremenske zone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
-msgstr "Meni za podeÅavanje vremenske zone"
+msgstr "ProzorÄe za podeÅavanje vremenske zone"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
@@ -21058,7 +20609,7 @@ msgstr ""
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
 msgid "_Selection"
-msgstr "_Izabor"
+msgstr "_Izbor"
 
 #: ../widgets/menus/gal-define-views-dialog.c:348
 #: ../widgets/menus/gal-define-views.ui.h:4
@@ -21139,7 +20690,7 @@ msgstr "_PredloÅi automatski prikaz priloga"
 
 #: ../widgets/misc/e-attachment-handler-image.c:95
 msgid "Could not set as background"
-msgstr "Nije moguÄe postaviti kao pozadinu"
+msgstr "Ne mogu da postavim kao pozadinu"
 
 #: ../widgets/misc/e-attachment-handler-image.c:145
 msgid "Set as _Background"
@@ -21159,7 +20710,7 @@ msgstr "_PoÅalji za..."
 
 #: ../widgets/misc/e-attachment-handler-sendto.c:137
 msgid "Send the selected attachments somewhere"
-msgstr "Åalje izabrane priloge negde"
+msgstr "PoÅaljite izabrane priloge negde"
 
 #: ../widgets/misc/e-attachment-icon-view.c:162
 #: ../widgets/misc/e-attachment-tree-view.c:547
@@ -21204,7 +20755,7 @@ msgstr "attachment.dat"
 
 #: ../widgets/misc/e-attachment-view.c:404
 msgid "Open With Other Application..."
-msgstr ""
+msgstr "Otvori drugim programom..."
 
 #: ../widgets/misc/e-attachment-view.c:411
 msgid "S_ave All"
@@ -21220,26 +20771,25 @@ msgstr "_Sakrij"
 
 #: ../widgets/misc/e-attachment-view.c:468
 msgid "Hid_e All"
-msgstr "S_akrij sve"
+msgstr "Sak_rij sve"
 
 #: ../widgets/misc/e-attachment-view.c:475
 msgid "_View Inline"
-msgstr "PrikaÅi _ispod"
+msgstr "Pre_gledaj unutar"
 
 #: ../widgets/misc/e-attachment-view.c:482
 msgid "Vie_w All Inline"
-msgstr "PrikaÅi _sve ispod"
+msgstr "Pre_gledaj sve unutar"
 
 #: ../widgets/misc/e-attachment-view.c:803
-#, fuzzy, c-format
-#| msgid "Open with \"%s\""
+#, c-format
 msgid "Open With \"%s\""
-msgstr "Programom â%sâ"
+msgstr "Otvori programom â%sâ"
 
 #: ../widgets/misc/e-attachment-view.c:806
 #, c-format
 msgid "Open this attachment in %s"
-msgstr "Otvori prilog programom â%sâ"
+msgstr "Otvori ovaj prilog u â%sâ"
 
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
@@ -21251,31 +20801,31 @@ msgstr "PriloÅena poruka"
 
 #: ../widgets/misc/e-attachment.c:1852 ../widgets/misc/e-attachment.c:2653
 msgid "A load operation is already in progress"
-msgstr "Operacija uÄitavanja veÄ je u toku"
+msgstr "Operacija uÄitavanja je veÄ u toku"
 
 #: ../widgets/misc/e-attachment.c:1860 ../widgets/misc/e-attachment.c:2661
 msgid "A save operation is already in progress"
-msgstr "Operacija Äuvanja veÄ je u toku"
+msgstr "Operacija Äuvanja je veÄ u toku"
 
 #: ../widgets/misc/e-attachment.c:1952
 #, c-format
 msgid "Could not load '%s'"
-msgstr "Nije moguÄe uÄitati â%sâ"
+msgstr "Ne mogu da uÄitam â%sâ"
 
 #: ../widgets/misc/e-attachment.c:1955
 #, c-format
 msgid "Could not load the attachment"
-msgstr "Nije moguÄe uÄitati prilog"
+msgstr "Ne mogu da uÄitam prilog"
 
 #: ../widgets/misc/e-attachment.c:2231
 #, c-format
 msgid "Could not open '%s'"
-msgstr "Nije moguÄe otvoriti â%sâ"
+msgstr "Ne mogu da otvorim â%sâ"
 
 #: ../widgets/misc/e-attachment.c:2234
 #, c-format
 msgid "Could not open the attachment"
-msgstr "Nije moguÄe otvoriti prilog"
+msgstr "Ne mogu da otvorim prilog"
 
 #: ../widgets/misc/e-attachment.c:2669
 msgid "Attachment contents not loaded"
@@ -21285,17 +20835,17 @@ msgstr "SadrÅaj priloga nije uÄitan"
 #: ../widgets/misc/e-attachment.c:2745
 #, c-format
 msgid "Could not save '%s'"
-msgstr "Nije moguÄe saÄuvati â%sâ"
+msgstr "Ne mogu da saÄuvam â%sâ"
 
 #: ../widgets/misc/e-attachment.c:2748
 #, c-format
 msgid "Could not save the attachment"
-msgstr "Nije moguÄe saÄuvati prilog"
+msgstr "Ne mogu da saÄuvam 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
 msgid "Ctrl-click to open a link"
-msgstr "DrÅite levi klik i Ctrl da otvorite vezu"
+msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1247
@@ -21318,9 +20868,7 @@ msgstr "Izaberite kodnu stranu za koriÅÄenje"
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../widgets/misc/e-contact-map-window.c:347
-#, fuzzy
-#| msgid "Contacts map"
+#: ../widgets/misc/e-contact-map-window.c:355
 msgid "Contacts Map"
 msgstr "Karta kontakata"
 
@@ -21334,11 +20882,11 @@ msgstr "Deo teksta za unos datuma"
 
 #: ../widgets/misc/e-dateedit.c:544
 msgid "Click this button to show a calendar"
-msgstr "Pritisnite na ovo dugme za prikaz kalendara"
+msgstr "Pritisnite na ovo dugme da prikaÅete kalendar"
 
 #: ../widgets/misc/e-dateedit.c:591
 msgid "Drop-down combination box to select time"
-msgstr "Okvir za izbor vremena"
+msgstr "ProzorÄe za izbor vremena"
 
 #: ../widgets/misc/e-dateedit.c:663
 msgid "No_w"
@@ -21384,8 +20932,8 @@ 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."
+"Izaberite datoteku koju Åelite da uvezete u Evoluciju i iz liste izaberite "
+"kojeg je tipa ta datoteka."
 
 #: ../widgets/misc/e-import-assistant.c:266
 msgid "F_ilename:"
@@ -21423,22 +20971,18 @@ msgid ""
 "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â."
+"Evolucija je proverila podeÅavanja za uvoz sledeÄih programa: Pine, Netskejp, "
+"Elm, iKalendar. Nema podeÅavanja za uvoÅenje. Ukoliko Åelite da pokuÅate "
+"ponovo, kliknite na dugme âNazadâ."
 
 #. Install a custom "Cancel Import" button.
 #: ../widgets/misc/e-import-assistant.c:767
-#, fuzzy
-#| msgid "Cancel"
 msgid "_Cancel Import"
-msgstr "OtkaÅi"
+msgstr "_OtkaÅi uvoÅenje"
 
 #: ../widgets/misc/e-import-assistant.c:909
-#, fuzzy
-#| msgid "Preview the message to be printed"
 msgid "Preview data to be imported"
-msgstr "Pregledaj poruku pred Åtampu"
+msgstr "Pregledaj podatke koji se uvoze"
 
 #: ../widgets/misc/e-import-assistant.c:915
 #: ../widgets/misc/e-import-assistant.c:928
@@ -21512,57 +21056,57 @@ msgstr ""
 
 #: ../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."
+msgstr "Evolucija trenutno nije na mreÅi jer mreÅa nije dostupna."
 
 #: ../widgets/misc/e-preferences-window.c:279
 msgid "Evolution Preferences"
 msgstr "PodeÅavanja Evolucije"
 
 # bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:79
+#: ../widgets/misc/e-search-bar.c:81
 #, c-format
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: ../widgets/misc/e-search-bar.c:561
+#: ../widgets/misc/e-search-bar.c:563
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../widgets/misc/e-search-bar.c:569
+#: ../widgets/misc/e-search-bar.c:571
 msgid "Fin_d:"
 msgstr "Pro_naÄi:"
 
-#: ../widgets/misc/e-search-bar.c:581
+#: ../widgets/misc/e-search-bar.c:583
 msgid "Clear the search"
 msgstr "OÄisti pretragu"
 
-#: ../widgets/misc/e-search-bar.c:605
+#: ../widgets/misc/e-search-bar.c:607
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../widgets/misc/e-search-bar.c:611
+#: ../widgets/misc/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
-msgstr "NaÄi prethodno pojavljivanje fraze"
+msgstr "NaÄi prethodno pojavljivanje izraza"
 
-#: ../widgets/misc/e-search-bar.c:624
+#: ../widgets/misc/e-search-bar.c:626
 msgid "_Next"
 msgstr "_SledeÄe"
 
-#: ../widgets/misc/e-search-bar.c:630
+#: ../widgets/misc/e-search-bar.c:632
 msgid "Find the next occurrence of the phrase"
-msgstr "NaÄi sledeÄe pojavljivanje fraze"
+msgstr "NaÄi sledeÄe pojavljivanje izraza"
 
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:645
 msgid "Mat_ch case"
-msgstr "Pa_zi na veliÄinu slova"
+msgstr "Po_klopi veliÄinu slova"
 
-#: ../widgets/misc/e-search-bar.c:671
+#: ../widgets/misc/e-search-bar.c:673
 msgid "Reached bottom of page, continued from top"
-msgstr "Stranica pregledana do dna, nastavljeno od vrha"
+msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../widgets/misc/e-search-bar.c:693
+#: ../widgets/misc/e-search-bar.c:695
 msgid "Reached top of page, continued from bottom"
-msgstr "Stranica pregledana do vrha, nastavljeno od dna"
+msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
 
 #: ../widgets/misc/e-send-options.c:543
 msgid "When de_leted:"
@@ -21570,7 +21114,7 @@ msgstr "Kada je obri_sano:"
 
 #: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
-msgstr "A_utomatski briÅi poslatu stavku"
+msgstr "A_utomatski obriÅi poslatu stavku"
 
 #: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
@@ -21585,43 +21129,33 @@ msgid "Delivery Options"
 msgstr "Opcije isporuke"
 
 #: ../widgets/misc/e-send-options.ui.h:6
-#, fuzzy
-#| msgid "_Until"
 msgctxt "ESendOptions"
 msgid "_Until"
 msgstr "_Do"
 
 #: ../widgets/misc/e-send-options.ui.h:7
-#, fuzzy
-#| msgid "_After"
 msgctxt "ESendOptionsAfter"
 msgid "_After"
 msgstr "_Posle"
 
 #: ../widgets/misc/e-send-options.ui.h:8
-#, fuzzy
-#| msgid "days"
 msgctxt "ESendOptionsAfter"
 msgid "days"
 msgstr "dana"
 
 #: ../widgets/misc/e-send-options.ui.h:9
-#, fuzzy
-#| msgid "Wi_thin"
 msgctxt "ESendOptionsWithin"
 msgid "Wi_thin"
 msgstr "Un_utar"
 
 #: ../widgets/misc/e-send-options.ui.h:10
-#, fuzzy
-#| msgid "days"
 msgctxt "ESendOptionsWithin"
 msgid "days"
 msgstr "dana"
 
 #: ../widgets/misc/e-send-options.ui.h:11
 msgid "For Your Eyes Only"
-msgstr "Samo za VaÅe oÄi"
+msgstr "Samo za vaÅe oÄi"
 
 #: ../widgets/misc/e-send-options.ui.h:12
 msgid "Gene_ral Options"
@@ -21637,7 +21171,7 @@ msgstr "VlasniÄko"
 
 #: ../widgets/misc/e-send-options.ui.h:18
 msgid "R_eply requested"
-msgstr "Zahtevan o_dgovor"
+msgstr "Zahtevan je o_dgovor"
 
 #: ../widgets/misc/e-send-options.ui.h:20
 msgid "Return Notification"
@@ -21665,15 +21199,15 @@ msgstr "Strogo poverljivo"
 
 #: ../widgets/misc/e-send-options.ui.h:28
 msgid "When acce_pted:"
-msgstr "Kada je pri_hvaÄeno: "
+msgstr "Kada je _prihvaÄeno:"
 
 #: ../widgets/misc/e-send-options.ui.h:29
 msgid "When co_mpleted:"
-msgstr "Po zavrÅ_etku:"
+msgstr "Kad je _zavrÅeno:"
 
 #: ../widgets/misc/e-send-options.ui.h:30
 msgid "When decli_ned:"
-msgstr "Kada je odbi_jeno:"
+msgstr "Kada je _odbijeno:"
 
 #: ../widgets/misc/e-send-options.ui.h:31
 msgid "_All information"
@@ -21693,15 +21227,15 @@ msgstr "_IsporuÄeno"
 
 #: ../widgets/misc/e-send-options.ui.h:36
 msgid "_Set expiration date"
-msgstr "_Postavi rok"
+msgstr "Postavi _rok"
 
 #: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When convenient"
-msgstr "_Kada je zgodno"
+msgstr "Kada je z_godno"
 
 #: ../widgets/misc/e-send-options.ui.h:38
 msgid "_When opened:"
-msgstr "_Kada je otvoreno:"
+msgstr "Kada je o_tvoreno:"
 
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
@@ -21710,8 +21244,6 @@ msgstr "_Kada je otvoreno:"
 # is not permitted.
 #. Translators: Used in send options dialog
 #: ../widgets/misc/e-send-options.ui.h:40
-#, fuzzy
-#| msgid "None"
 msgctxt "send-options"
 msgid "None"
 msgstr "NiÅta"
@@ -21769,56 +21301,52 @@ 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:408
+#: ../widgets/misc/e-web-view.c:410
 msgid "_Copy Link Location"
 msgstr "_UmnoÅi mesto veze"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:412
 msgid "Copy the link to the clipboard"
 msgstr "UmnoÅava vezu u spisak iseÄaka"
 
-#: ../widgets/misc/e-web-view.c:418
+#: ../widgets/misc/e-web-view.c:420
 msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u ÄitaÄu"
+msgstr "_Otvori vezu u pregledaÄu"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:422
 msgid "Open the link in a web browser"
-msgstr "Otvori vezu u pregledaÄu veba"
+msgstr "Otvori vezu u veb pretraÅivaÄu"
 
-#: ../widgets/misc/e-web-view.c:428
+#: ../widgets/misc/e-web-view.c:430
 msgid "_Copy Email Address"
-msgstr "_UmnoÅi elektronsku adresu"
+msgstr "_UmnoÅi adresu e-poÅte"
 
-#: ../widgets/misc/e-web-view.c:445
-#, fuzzy
-#| msgid "_No image"
+#: ../widgets/misc/e-web-view.c:447
 msgid "_Copy Image"
-msgstr "_Bez slike"
+msgstr "_UmnoÅi sliku"
 
-#: ../widgets/misc/e-web-view.c:447
-#, fuzzy
-#| msgid "Copy the link to the clipboard"
+#: ../widgets/misc/e-web-view.c:449
 msgid "Copy the image to the clipboard"
-msgstr "UmnoÅava vezu u spisak iseÄaka"
+msgstr "UmnoÅite sliku u ostavu"
 
-#: ../widgets/misc/e-web-view.c:467 ../widgets/misc/e-web-view.c:1292
+#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../widgets/misc/e-web-view.c:956 ../widgets/misc/e-web-view.c:958
-#: ../widgets/misc/e-web-view.c:960
+#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
+#: ../widgets/misc/e-web-view.c:986
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../widgets/misc/e-web-view.c:962
+#: ../widgets/misc/e-web-view.c:988
 msgid "Click to hide/unhide addresses"
-msgstr "Pritisnite da sakrijete/otkrijete adrese"
+msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../widgets/misc/e-web-view.c:964
+#: ../widgets/misc/e-web-view.c:990
 #, c-format
 msgid "Click to open %s"
-msgstr "Pritisnite da otvorite %s"
+msgstr "Kliknite da otvorite %s"
 
 #: ../widgets/misc/ea-calendar-item.c:302
 #: ../widgets/misc/ea-calendar-item.c:311
@@ -21864,7 +21392,7 @@ msgstr "Vreme mora biti u formatu: %s"
 
 #: ../widgets/table/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost postotka mora biti izmeÄu 0 i 100"
+msgstr "Vrednost procenta mora biti izmeÄu 0 i 100"
 
 #: ../widgets/table/e-table-click-to-add.c:594
 #: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
@@ -21999,14 +21527,13 @@ msgstr ""
 #. Example: "Family name: Smith (13 items)"
 #.
 #: ../widgets/table/e-table-group-container.c:353
-#, fuzzy, c-format
-#| msgid "%s : %s (%d item)"
-#| msgid_plural "%s : %s (%d items)"
+#, c-format
 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)"
+msgstr[0] "%s: %s (%d stavka)"
+msgstr[1] "%s: %s (%d stavke)"
+msgstr[2] "%s: %s (%d stavki)"
+msgstr[3] "%s: %s (jedna stavka)"
 
 #. 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.
@@ -22021,7 +21548,7 @@ 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)"
+msgstr[3] "%s (jedna stavka)"
 
 #: ../widgets/table/e-table-header-item.c:1523
 msgid "Customize Current View"
@@ -22093,12 +21620,12 @@ msgstr "biranje Äelije"
 #. Translators: description of an "expand" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:214
 msgid "expands the row in the ETree containing this cell"
-msgstr "razgranava red u ETree gde se Äelija nalazi"
+msgstr "razgranava red u Establo koje sdrÅi ovu Äeliju"
 
 #. Translators: description of a "collapse" action
 #: ../widgets/table/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
-msgstr "skuplja red u ETree gde se Äelija nalazi"
+msgstr "skuplja red u Establo koje sadrÅi ovu Äeliju"
 
 #: ../widgets/table/gal-a11y-e-cell.c:121
 msgid "Table Cell"
@@ -22120,6 +21647,170 @@ msgstr "Izaberi sve"
 msgid "Input Methods"
 msgstr "Metodi unosa"
 
+#~ msgid "Edit Alarm"
+#~ msgstr "Navij sat"
+
+#~ msgid "Add Alarm"
+#~ msgstr "Dodaj alarm"
+
+#~ msgid "Alarm"
+#~ msgstr "Alarm"
+
+#~ msgid "_Alarms"
+#~ msgstr "Ala_rmi"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#~ msgctxt "cal-alarms"
+#~ msgid "None"
+#~ msgstr "NiÅta"
+
+#~ msgid "Custom Alarm:"
+#~ msgstr "Proizvoljan alarm:"
+
+#~ msgid "_Alarm"
+#~ msgstr "_Alarm"
+
+#~ msgid "_Group:"
+#~ msgstr "_Grupa:"
+
+#~ msgid "It has alarms."
+#~ msgstr "Ima alarme."
+
+#~ msgctxt "iCalImp"
+#~ msgid "has alarms"
+#~ msgstr "ima alarme"
+
+#~ msgid "Please select a folder from the current account."
+#~ msgstr "Izaberite fasciklu iz tekuÄeg naloga."
+
+#~ msgid "Alarm programs"
+#~ msgstr "Programi za alarm"
+
+#~ msgid "Evolution _FAQ"
+#~ msgstr "Pomo_Ä za Evoluciju"
+
+#~ msgid "Open the Frequently Asked Questions webpage"
+#~ msgstr "Otvorite veb stranicu sa Äesto postavljanim pitanjima"
+
+#~ msgid "Click here to close the current window"
+#~ msgstr "Pritisnite ovde da zatvorite tekuÄi prozor"
+
+#~ msgid "Click here to view help available"
+#~ msgstr "Pritisnite ovde za dostupnu pomoÄ"
+
+#~ msgid "Click here to save the current window"
+#~ msgstr "Pritisnite ovde da saÄuvate tekuÄi prozor"
+
+#~ msgid "Click here to attach a file"
+#~ msgstr "Pritisnite ovde da priloÅite dokument"
+
+#~ msgid "_Default junk plugin:"
+#~ msgstr "_Podrazumevani prikljuÄak za Äubre:"
+
+#~ msgid "_Use Secure Connection:"
+#~ msgstr "_Koristi sigurnu vezu:"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#~ msgctxt "mail-junk-hook"
+#~ msgid "None"
+#~ msgstr "NiÅta"
+
+#~ msgid "%s plugin is available and the binary is installed."
+#~ msgstr "Dostupan je %s dodatak i binarni oblik je instaliran."
+
+#~ msgid ""
+#~ "%s plugin is not available. Please check whether the package is installed."
+#~ msgstr "Dodatak %s nije dostupan. Proverite da li je paket instaliran."
+
+#~ msgid "No junk plugin available"
+#~ msgstr "Nema dostupnog prikljuÄka za Äubre"
+
+#~ msgid "Bogofilter is not available. Please install it first."
+#~ msgstr "Bogofilter nije dostupan. Prvo ga instalirajte."
+
+#~ msgid "Error occurred while spawning %s: %s."
+#~ msgstr "DoÅlo je do greÅke u pripremi %s: %s."
+
+#~ msgid "Bogofilter child process does not respond, killing..."
+#~ msgstr "Zavisan proces Bogofiltera ne reaguje, gasim..."
+
+#~ msgid "Wait for Bogofilter child process interrupted, terminating..."
+#~ msgstr "Äekanje na zavisan proces Bogofiltera ometeno, prekidam..."
+
+#~ msgid "Pipe to Bogofilter failed, error code: %d."
+#~ msgstr "Cev ka Bogofilteru je pukla, oznaka greÅke: %d."
+
+#~ msgid "Bogofilter Junk Filter"
+#~ msgstr "Filter neÅeljene poÅte Bogofilter"
+
+#~ msgid "Filter junk messages using Bogofilter."
+#~ msgstr "Filtrira neÅeljenu poÅtu koriÅÄenjem Bogofiltera."
+
+#~ msgid "Use _SSL"
+#~ msgstr "Koristi Åifrovanu vezu"
+
+#~ msgid "_Secure connection"
+#~ msgstr "_Koristi sigurnu vezu"
+
+#~ msgid "Enable D-Bus messages."
+#~ msgstr "UkljuÄuje poruke D-Bus."
+
+#~ msgid "Generates a D-Bus message when new mail messages arrive."
+#~ msgstr "Stvara D-BUS poruku kada stigne nova poÅta."
+
+#~ msgid "Popup message together with the icon."
+#~ msgstr "IskaÄuÄa poruka sa ikonom."
+
+#~ msgid "Whether show message over the icon when new messages arrive."
+#~ msgstr "Da li da prikaÅe poruku preko ikone kada stigne nova poruka."
+
+#~ msgid "Show icon in _notification area"
+#~ msgstr "Prikazuje ikonu u _obaveÅtajnoj zoni"
+
+#~ msgid "Popup _message together with the icon"
+#~ msgstr "PrikaÅi _poruku zajedno sa ikonom"
+
+#~ msgid "Generate a _D-Bus message"
+#~ msgstr "Stvara _D-Bus poruku"
+
+#~ msgid "SpamAssassin not found, code: %d"
+#~ msgstr "Ubica spama nije pronaÄen, kod: %d"
+
+#~ msgid "Failed to create pipe: %s"
+#~ msgstr "Nije uspelo pravljenje cevi: %s"
+
+#~ msgid "Error after fork: %s"
+#~ msgstr "GreÅka po izdvajanju: %s"
+
+#~ msgid "SpamAssassin child process does not respond, killing..."
+#~ msgstr "Zavisan proces Ubici spama nije odgovorio, ubijam..."
+
+#~ msgid "Wait for SpamAssassin child process interrupted, terminating..."
+#~ msgstr "Äekanje na zavisan proces Ubice spama ometeno, prekidam..."
+
+#~ msgid "Pipe to SpamAssassin failed, error code: %d"
+#~ msgstr "Cev ka Ubici spama je pukla, oznaka greÅke: %d"
+
+#~ msgid "SpamAssassin is not available. Please install it first."
+#~ msgstr "Ubica spama nije dostupan. Prvo ga instalirajte."
+
+#~ msgid "SpamAssassin Junk Filter"
+#~ msgstr "Filter neÅeljene poÅte Ubica spama"
+
+#~ msgid "iCalendar format (.ics)"
+#~ msgstr "iKalendar oblik (.ics)"
+
+#~ msgid "E-Mail Address"
+#~ msgstr "Elektronska adresa"
+
 #~ msgid "failed to open book"
 #~ msgstr "neuspelo otvaranje knjige"
 
@@ -22392,9 +22083,6 @@ msgstr "Metodi unosa"
 #~ msgid "Read items marked _private"
 #~ msgstr "Äitaj stavke oznaÄene kao _liÄno"
 
-#~ msgid "Reminder Notes"
-#~ msgstr "Podsetnici"
-
 #~ msgid "Subscribe to my _alarms"
 #~ msgstr "Prijavi se na moja _upozorenja"
 
@@ -22721,9 +22409,6 @@ msgstr "Metodi unosa"
 #~ msgid "%s has published meeting information."
 #~ msgstr "<b>%s</b> objavljuje podatak o sastanku."
 
-#~ msgid "Meeting Information"
-#~ msgstr "Podatak o sastanku"
-
 #, fuzzy
 #~| msgid "<b>%s</b> requests the presence of %s at a meeting."
 #~ msgid "%s requests the presence of %s at a meeting."



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